diff options
author | Michael Meeks <michael.meeks@suse.com> | 2012-01-18 17:07:07 +0000 |
---|---|---|
committer | Michael Meeks <michael.meeks@suse.com> | 2012-01-18 17:07:55 +0000 |
commit | 453339cc22da7b350804bd1911faa99b89815c5b (patch) | |
tree | c73b7c6f1722db993bdfa71e4fbf05d8477cca65 | |
parent | 347bb132e0a3efc82211d4e53bf0aa25ad817cf4 (diff) |
android: add --with-android-ndk= option to simplify configure.
-rw-r--r-- | README.cross | 18 | ||||
-rw-r--r-- | config_host.mk.in | 1 | ||||
-rw-r--r-- | configure.in | 23 |
3 files changed, 26 insertions, 16 deletions
diff --git a/README.cross b/README.cross index d5ad353531a9..4a747993c261 100644 --- a/README.cross +++ b/README.cross @@ -324,16 +324,9 @@ insane.) Here is my autogen.lastrun for Android, when cross-compiling from Mac OS X: -SYSBASE=/Users/tml/android-ndk-r7/platforms/android-9/arch-arm -CC=ccache /Users/tml/android-ndk-r7/toolchains/arm-linux-androideabi-4.4.3/prebuilt/darwin-x86/bin/arm-linux-androideabi-gcc -march=armv7-a -mfloat-abi=softfp -mthumb -mfpu=neon -Wl,--fix-cortex-a8 --sysroot /Users/tml/android-ndk-r7/platforms/android-9/arch-arm -L/Users/tml/android-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a -CXX=ccache /Users/tml/android-ndk-r7/toolchains/arm-linux-androideabi-4.4.3/prebuilt/darwin-x86/bin/arm-linux-androideabi-g++ -march=armv7-a -mfloat-abi=softfp -mthumb -mfpu=neon -Wl,--fix-cortex-a8 --sysroot /Users/tml/android-ndk-r7/platforms/android-9/arch-arm -I /Users/tml/android-ndk-r7/sources/cxx-stl/gnu-libstdc++/include -I/Users/tml/android-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include -L/Users/tml/android-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a -fexceptions -frtti -AR=/Users/tml/android-ndk-r7/toolchains/arm-linux-androideabi-4.4.3/prebuilt/darwin-x86/bin/arm-linux-androideabi-ar -NM=/Users/tml/android-ndk-r7/toolchains/arm-linux-androideabi-4.4.3/prebuilt/darwin-x86/bin/arm-linux-androideabi-nm -OBJDUMP=/Users/tml/android-ndk-r7/toolchains/arm-linux-androideabi-4.4.3/prebuilt/darwin-x86/bin/arm-linux-androideabi-objdump -RANLIB=/Users/tml/android-ndk-r7/toolchains/arm-linux-androideabi-4.4.3/prebuilt/darwin-x86/bin/arm-linux-androideabi-ranlib -STRIP=/Users/tml/android-ndk-r7/toolchains/arm-linux-androideabi-4.4.3/prebuilt/darwin-x86/bin/arm-linux-androideabi-strip CC_FOR_BUILD=ccache /Xcode3/usr/bin/gcc-4.0 -mmacosx-version-min=10.4 CXX_FOR_BUILD=ccache /Xcode3/usr/bin/g++-4.0 -mmacosx-version-min=10.4 +--with-android-ndk=/Users/tml/android-ndk-r7 --build=x86_64-apple-darwin11 --disable-zenity --enable-werror @@ -346,16 +339,9 @@ CXX_FOR_BUILD=ccache /Xcode3/usr/bin/g++-4.0 -mmacosx-version-min=10.4 And here is my autogen.lastrun for Android when cross-compiling from Linux: -SYSBASE=/home/tml/android-ndk-r7/platforms/android-9/arch-arm -CC=ccache /home/tml/android-ndk-r7/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc -march=armv7-a -mfloat-abi=softfp -mthumb -mfpu=neon -Wl,--fix-cortex-a8 --sysroot /home/tml/android-ndk-r7/platforms/android-9/arch-arm -L/home/tml/android-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a -CXX=ccache /home/tml/android-ndk-r7/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-g++ -march=armv7-a -mfloat-abi=softfp -mthumb -mfpu=neon -Wl,--fix-cortex-a8 --sysroot /home/tml/android-ndk-r7/platforms/android-9/arch-arm -I /home/tml/android-ndk-r7/sources/cxx-stl/gnu-libstdc++/include -I/home/tml/android-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include -L/home/tml/android-ndk-r7/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a -fexceptions -frtti -AR=/home/tml/android-ndk-r7/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-ar -NM=/home/tml/android-ndk-r7/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-nm -OBJDUMP=/home/tml/android-ndk-r7/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-objdump -RANLIB=/home/tml/android-ndk-r7/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-ranlib -STRIP=/home/tml/android-ndk-r7/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-strip CC_FOR_BUILD=ccache gcc CXX_FOR_BUILD=ccache g++ +--with-android-ndk=/home/tml/android-ndk-r7 --build=x86_64-unknown-linux-gnu --disable-zenity --with-distro=LibreOfficeAndroid diff --git a/config_host.mk.in b/config_host.mk.in index f8b0d8110f55..9bd874dd1647 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -11,6 +11,7 @@ export ALIGNOF_LONG="@ALIGNOF_LONG@" export ALIGNOF_SHORT="@ALIGNOF_SHORT@" export ALLOC="@ALLOC@" export ANCIENT_BISON="@ANCIENT_BISON@" +export ANDROID_NDK_HOME="@ANDROID_NDK_HOME@" export AR="@AR@" export AWTLIB='@AWTLIB@' export BARCODE_EXTENSION_PACK="@BARCODE_EXTENSION_PACK@" diff --git a/configure.in b/configure.in index bb8abe685956..638a0fdfb60e 100644 --- a/configure.in +++ b/configure.in @@ -90,6 +90,24 @@ if test -z "$SED"; then fi dnl =================================================================== +dnl Building with an android-ndk implies a lot of pre-canned defaults +dnl =================================================================== +ANDROID_NDK_HOME= +if test "z$with_android_ndk" != "z"; then + ANDROID_NDK_HOME=$with_android_ndk + ANDROID_ABI_PREBUILT_BIN=`echo $ANDROID_NDK_HOME/toolchains/arm-linux*/prebuilt/*/bin` + test -z "$SYSBASE" && SYSBASE=$ANDROID_NDK_HOME/platforms/android-9/arch-arm + test -z "$AR" && AR=$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-ar + test -z "$NM" && NM=$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-nm + test -z "$OBJDUMP" && OBJDUMP=$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-objdump + test -z "$RANLIB" && RANLIB=$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-ranlib + test -z "$STRIP" && STRIP=$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-strip + test -z "$CC" && CC="$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-gcc --sysroot $ANDROID_NDK_HOME/platforms/android-9/arch-arm -L$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a" + test -z "$CXX" && CXX="$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-g++ --sysroot $ANDROID_NDK_HOME/platforms/android-9/arch-arm -I $ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/include -I$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include -L$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a -fexceptions -frtti" +fi +AC_SUBST(ANDROID_NDK_HOME) + +dnl =================================================================== dnl The following is a list of supported systems. dnl Sequential to keep the logic very simple dnl These values may be checked and reset later. @@ -833,6 +851,11 @@ AC_ARG_ENABLE(silent-msi, dnl =================================================================== dnl Optional Packages (--with/without-) dnl =================================================================== +AC_ARG_WITH(android-ndk, + AS_HELP_STRING([--with-android-ndk], + [Specify location of the Android Native Development Kit to use for buildin.]), +,) + AC_ARG_WITH(gnu-patch, AS_HELP_STRING([--with-gnu-patch], [Specify location of GNU patch on Solaris or FreeBSD.]), |