- Timestamp:
- Aug 5, 2015 4:26:06 AM (9 years ago)
- Location:
- pjproject/trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/trunk/aconfigure
r5144 r5145 4325 4325 $as_echo_n "checking memory alignment... " >&6; } 4326 4326 case $target in 4327 sparc64-* | ia64-* | x86_64-* | arm64-* )4327 sparc64-* | ia64-* | x86_64-* | arm64-* | aarch64-* | mips64* ) 4328 4328 $as_echo "#define PJ_POOL_ALIGNMENT 8" >>confdefs.h 4329 4329 -
pjproject/trunk/aconfigure.ac
r5144 r5145 127 127 AC_MSG_CHECKING([memory alignment]) 128 128 case $target in 129 sparc64-* | ia64-* | x86_64-* | arm64-* )129 sparc64-* | ia64-* | x86_64-* | arm64-* | aarch64-* | mips64* ) 130 130 AC_DEFINE(PJ_POOL_ALIGNMENT, 8) 131 131 AC_MSG_RESULT([8 bytes]) -
pjproject/trunk/configure-android
r5126 r5145 33 33 fi 34 34 35 if test "x${ANDROID_NDK_ROOT}" = "x" ; then36 echo "$F error: ANDROID_NDK_ROOT must be specified"35 if test "x${ANDROID_NDK_ROOT}" = "x" || test ! -e ${ANDROID_NDK_ROOT}; then 36 echo "$F error: ANDROID_NDK_ROOT env var is not specified or invalid" 37 37 exit 0 38 fi39 40 #if test "$1" = "--simulator"; then41 if test "1" = "0"; then42 shift43 TARGET_HOST="i686-android-linux"44 TC_DIR="x86"45 else46 TARGET_HOST="arm-linux-androideabi"47 TC_DIR=${TARGET_HOST}48 38 fi 49 39 … … 63 53 else 64 54 USR_LIB="/usr/lib" 65 fi 55 fi 56 66 57 67 58 if test "$1" = "--use-ndk-cflags"; then … … 71 62 IGNORE_CFLAGS="\-M\|\-f*stack\|\-f*alias" 72 63 fi 73 for i in `${ANDROID_NDK_ROOT}/ndk-build -n -C ${ANDROID_NDK_ROOT}/samples/hello-jni NDK_TOOLCHAIN_VERSION=4.8 NDK_LOG=1 APP_PLATFORM=${APP_PLATFORM} APP_ABI=${TARGET_ABI}`; do 64 65 NDK_OUT=`${ANDROID_NDK_ROOT}/ndk-build -n -C ${ANDROID_NDK_ROOT}/samples/hello-jni NDK_TOOLCHAIN_VERSION=4.8 APP_PLATFORM=${APP_PLATFORM} APP_ABI=${TARGET_ABI}` 66 if test ! "${NDK_OUT}"; then 67 echo "$F error: failed to run ndk-build, check ANDROID_NDK_ROOT env var" 68 exit 1 69 fi 70 71 for i in $NDK_OUT; do 74 72 if test "x${NDK_CXX}" != "x" -a "$i" = "-o"; then break; fi 75 73 … … 101 99 done 102 100 101 # Get target host from NDK toolchain dir name 102 TARGET_HOST=`echo ${NDK_CC} | sed -e 's/.*\/toolchains\/\([^\/]*\).*/\1/'` 103 104 # Remove version number suffix (otherwise config.sub will return error, perhaps it just doesn't like the format) 105 TARGET_HOST=`echo ${TARGET_HOST} | sed -e 's/\-[0-9\.]*$//'` 106 107 # Make sure target host string has 'linux-android' in it 108 if test "x`echo ${TARGET_HOST} | grep 'linux-android'`" = "x"; then 109 #TARGET_HOST=`echo ${TARGET_HOST} | sed -e 's/\(.*\)\-\([0-9\.]*\)/\1-linux-android-\2/'` 110 TARGET_HOST+=-linux-android 111 fi 112 103 113 export CC="${NDK_CC}" 104 114 export CXX="${NDK_CXX}" … … 114 124 else 115 125 116 ANDROID_TC_VER=`ls -d ${ANDROID_NDK_ROOT}/toolchains/${TC_DIR}-* | sed 's/clang/0/' | sort -gr | head -1` 126 if test "$TARGET_ABI" != "armeabi"; then 127 echo "$F error: For targets other than 'armeabi', specify --use-ndk-cflags" 128 exit 1 129 fi 130 131 TARGET_HOST="arm-linux-androideabi" 132 133 ANDROID_TC_VER=`ls -d ${ANDROID_NDK_ROOT}/toolchains/${TARGET_HOST}-* | sed 's/clang/0/' | sort -gr | head -1` 117 134 ANDROID_TC=`ls -d ${ANDROID_TC_VER}/prebuilt/* | grep -v gdbserver | head -1` 118 135 if test ! -d ${ANDROID_TC}; then … … 140 157 fi 141 158 159 if test "x${CC}" = "x" || test ! -e ${CC}; then 160 echo "$F error: compiler not found, please check environment settings (TARGET_ABI, etc)" 161 exit 1 162 fi 163 142 164 # C++ STL 143 165 # Note: STL for pjsua2 sample app is specified in pjsip-apps/src/swig/java/android/jni/Application.mk … … 151 173 # stlport 152 174 #STDCPP_CFLAGS="-I${ANDROID_NDK_ROOT}/sources/cxx-stl/stlport/stlport" 153 #STDCPP_LIBS="${ANDROID_SYSROOT} /usr/lib/crtbegin_so.o -lstlport_static -ldl"175 #STDCPP_LIBS="${ANDROID_SYSROOT}${USR_LIB}/crtbegin_so.o -lstlport_static -ldl" 154 176 #STDCPP_LDFLAGS="-L${ANDROID_NDK_ROOT}/sources/cxx-stl/stlport/libs/${TARGET_ABI}" 155 177 … … 169 191 echo " AR = ${AR}" 170 192 echo " RANLIB = ${RANLIB}" 193 echo " TARGET_HOST = ${TARGET_HOST}" 171 194 fi 172 195
Note: See TracChangeset
for help on using the changeset viewer.