[Libreoffice-commits] .: 3 commits - configure.in README.cross solenv/gbuild solenv/inc
Tor Lillqvist
tml at kemper.freedesktop.org
Tue Nov 8 05:04:54 PST 2011
README.cross | 4 ++--
configure.in | 9 +++++++++
solenv/gbuild/platform/android.mk | 7 ++-----
solenv/inc/unxandr.mk | 15 +++++----------
4 files changed, 18 insertions(+), 17 deletions(-)
New commits:
commit bc3fa000a43e490266c27209d9ba62eb35241824
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Tue Nov 8 15:02:17 2011 +0200
Add -Wl,--fix-cortex-a8 to the Android CC and CXX
diff --git a/README.cross b/README.cross
index 7e8c184..cd15bca 100644
--- a/README.cross
+++ b/README.cross
@@ -318,8 +318,8 @@ Windows will probably drive you insane.)
Here is my autogen.lastrun for Android:
SYSBASE=/home/tml/android-ndk-r6b/platforms/android-9/arch-arm
-CC=ccache /home/tml/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc -march=armv7-a -mfloat-abi=softfp -mthumb -mfpu=neon --sysroot /home/tml/android-ndk-r6b/platforms/android-9/arch-arm
-CXX=ccache /home/tml/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-g++ -march=armv7-a -mfloat-abi=softfp -mthumb -mfpu=neon --sysroot /home/tml/android-ndk-r6b/platforms/android-9/arch-arm -I /home/tml/android-ndk-r6b/sources/cxx-stl/gnu-libstdc++/include -I/home/tml/android-ndk-r6b/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include -L/home/tml/android-ndk-r6b/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a -fexceptions -frtti
+CC=ccache /home/tml/android-ndk-r6b/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-r6b/platforms/android-9/arch-arm
+CXX=ccache /home/tml/android-ndk-r6b/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-r6b/platforms/android-9/arch-arm -I /home/tml/android-ndk-r6b/sources/cxx-stl/gnu-libstdc++/include -I/home/tml/android-ndk-r6b/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include -L/home/tml/android-ndk-r6b/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a -fexceptions -frtti
AR=/home/tml/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-ar
NM=/home/tml/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-nm
OBJDUMP=/home/tml/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-objdump
commit 793d4d05b580cbac56fb1537580eb2474cb8c0c5
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Tue Nov 8 14:19:20 2011 +0200
Make sure we have env vars for the cross-build tools for Android
diff --git a/configure.in b/configure.in
index a6b135a..a6192a8 100644
--- a/configure.in
+++ b/configure.in
@@ -244,6 +244,15 @@ linux-androideabi*)
test_randr=no
test_unix_quickstarter=no
_os=Android
+
+ # Make sure env vars pointing to where to find the cross-build
+ # toolchain are set. There aren't really any sensible
+ # guesstimates.
+ for var in CC CXX AR NM OBJDUMP RANLIB STRIP; do
+ if test -z `eval echo '$'$var`; then
+ AC_MSG_ERROR([You need to set the $var environment variable in a cross-compilation for Android. See README.cross for an example.])
+ fi
+ done
;;
*)
commit 3265a628adc82d2b44df833f59ad700a8dfa4292
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Tue Nov 8 13:27:38 2011 +0200
Revert "Just put the Android ARM compiler options in the mk files"
Nah. Sure, doing it like that is sane if you consider only our own
code. But it won't help in making sure these options are used when
compiling the 3rd-party external libraries. For that having the
options already in the CC and CXX environment variables works nicely,
I think. People just need to look at the samples in README.cross.
Perhaps we could add the options to CC and CXX in configure.in,
though? Is that elegant or not, don't know...
This reverts commit 3c4f7242a967d6a3cb9e5e3f88bfb2cc348cc3eb.
diff --git a/README.cross b/README.cross
index 6327ea8..7e8c184 100644
--- a/README.cross
+++ b/README.cross
@@ -318,8 +318,8 @@ Windows will probably drive you insane.)
Here is my autogen.lastrun for Android:
SYSBASE=/home/tml/android-ndk-r6b/platforms/android-9/arch-arm
-CC=ccache /home/tml/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot /home/tml/android-ndk-r6b/platforms/android-9/arch-arm
-CXX=ccache /home/tml/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-g++ --sysroot /home/tml/android-ndk-r6b/platforms/android-9/arch-arm -I /home/tml/android-ndk-r6b/sources/cxx-stl/gnu-libstdc++/include -I/home/tml/android-ndk-r6b/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include -L/home/tml/android-ndk-r6b/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a -fexceptions -frtti
+CC=ccache /home/tml/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc -march=armv7-a -mfloat-abi=softfp -mthumb -mfpu=neon --sysroot /home/tml/android-ndk-r6b/platforms/android-9/arch-arm
+CXX=ccache /home/tml/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-g++ -march=armv7-a -mfloat-abi=softfp -mthumb -mfpu=neon --sysroot /home/tml/android-ndk-r6b/platforms/android-9/arch-arm -I /home/tml/android-ndk-r6b/sources/cxx-stl/gnu-libstdc++/include -I/home/tml/android-ndk-r6b/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include -L/home/tml/android-ndk-r6b/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a -fexceptions -frtti
AR=/home/tml/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-ar
NM=/home/tml/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-nm
OBJDUMP=/home/tml/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-objdump
diff --git a/solenv/gbuild/platform/android.mk b/solenv/gbuild/platform/android.mk
index ba51109..03f85ec 100644
--- a/solenv/gbuild/platform/android.mk
+++ b/solenv/gbuild/platform/android.mk
@@ -31,14 +31,11 @@
#please make generic modifications to unxgcc.mk or linux.mk
gb_CPUDEFS += -DARM32
gb_COMPILERDEFAULTOPTFLAGS := -Os
+gb_CXXFLAGS += -fno-omit-frame-pointer
+gb_CFLAGS += -fno-omit-frame-pointer
include $(GBUILDDIR)/platform/unxgcc.mk
-# See <ndk>/docs/STANDALONE-TOOLCHAIN.html
-gb_LinkTarget_CFLAGS += -march=armv7-a -mfloat-abi=softfp -mthumb -mfpu=neon -fno-omit-frame-pointer
-gb_LinkTarget_CXXFLAGS += -march=armv7-a -mfloat-abi=softfp -mthumb -mfpu=neon -fno-omit-frame-pointer
-gb_LinkTarget_LDFLAGS += -Wl,--fix-cortex-a8
-
# No unit testing can be run
gb_CppunitTest_CPPTESTPRECOMMAND := :
diff --git a/solenv/inc/unxandr.mk b/solenv/inc/unxandr.mk
index fdf9b6d..56ed49d 100644
--- a/solenv/inc/unxandr.mk
+++ b/solenv/inc/unxandr.mk
@@ -29,18 +29,10 @@
CDEFAULTOPT=-Os
.INCLUDE : unxgcc.mk
-
-# Amend some macros set by unxgcc.mk
-
CDEFS+=-DARM32
-CFLAGS+=-march=armv7-a -mfloat-abi=softfp -mthumb -mfpu=neon -fno-omit-frame-pointer
-
-LINKFLAGS+=-Wl,--fix-cortex-a8
+CFLAGS+=-fno-omit-frame-pointer
-STDLIBGUIMT+=-llog -landroid
-STDLIBCUIMT+=-llog -landroid
-
-# Completely override some others
+# Override some macros set by unxgcc.mk
# We don't build any "tool" style programs for non-desktop OSes like
# Android. Just unit tests and GUI programs. (Well, that is in
@@ -53,3 +45,6 @@ STDLIBCUIMT+=-llog -landroid
LINKFLAGSAPPGUI=-shared
LINKFLAGSAPPCUI=-shared
+STDLIBGUIMT+=-llog -landroid
+STDLIBCUIMT+=-llog -landroid
+
More information about the Libreoffice-commits
mailing list