[Libreoffice-commits] .: 4 commits - configure.in README.cross set_soenv.in
Tor Lillqvist
tml at kemper.freedesktop.org
Thu Dec 15 13:57:06 PST 2011
README.cross | 23 ++++++++++++++++++++++-
configure.in | 2 +-
set_soenv.in | 11 +++++++++--
3 files changed, 32 insertions(+), 4 deletions(-)
New commits:
commit 9a6beed05243189bf6106a70def7e3817b6363f3
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Thu Dec 15 23:54:31 2011 +0200
Add autogen.lastrun sample for cross-compiling to Android from Mac OS X
diff --git a/README.cross b/README.cross
index cdcb37c..eb3bed7 100644
--- a/README.cross
+++ b/README.cross
@@ -323,7 +323,28 @@ particular) and Mac OS X. The Android cross-buld tool-chain (the
Windows. (Trying to cross-compile from Windows will probably drive you
insane.)
-Here is my autogen.lastrun for Android:
+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
+--build=x86_64-apple-darwin11
+--disable-zenity
+--enable-werror
+--with-distro=LibreOfficeAndroid
+--with-external-tar=/Volumes/ooo/git/master/src
+--disable-python
+--without-helppack-integration
+--without-myspell-dicts
+--with-java
+
+And here is the 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
commit a20a2fda1f7c39dafcc0ea56d8cf713f8502853d
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Thu Dec 15 23:52:39 2011 +0200
Save the config.log for the build platform as config.Build.log
diff --git a/configure.in b/configure.in
index 7f366cf..44a5af3 100644
--- a/configure.in
+++ b/configure.in
@@ -2280,6 +2280,7 @@ if test "$cross_compiling" = "yes"; then
2>&1 | sed -e 's/^/ /'
test -f ./Env.Host.sh 2>/dev/null || exit
cp Env.Host.sh ../Env.Build.sh
+ cp config.log ../config.Build.log
. ./Env.Host.sh
for V in COM GUI GUIBASE OS CPU CPUNAME CC CXX GXX_INCLUDE_PATH MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH \
SYSTEM_LIBXSLT; do
commit ad87a4747c1ba7bdb73e9e748fa20d275b85d670
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Thu Dec 15 23:50:00 2011 +0200
No Makefile.in any more
diff --git a/configure.in b/configure.in
index 3dbbc4b..7f366cf 100644
--- a/configure.in
+++ b/configure.in
@@ -2245,7 +2245,6 @@ if test "$cross_compiling" = "yes"; then
rm -rf CONF-FOR-BUILD Env.Build.sh
mkdir CONF-FOR-BUILD
tar cf - \
- Makefile.in \
bin/repo-list.in \
build_env.in \
config.guess \
commit e38c7440223281fc66e8726fcc7ef79a7a879e1e
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Thu Dec 15 23:42:54 2011 +0200
Unset SYSBASE explicitly if not supposed to be set
This fixes cross-compiling from Linux to Android. My guess is that the
build system nowadays, when building the cross_toolset (for the build
platform), sources Env.Build.sh in an environment where Env.Host.sh
has already been sourced. So, if Env.Host.sh exports SYSBASE, that
stayed in force also after sourcing Env.Build.sh, with predictably
horrible results.
For some reason it didn't hurt cross-compiling from Mac OS X, which is
why I hadn't noticed.
diff --git a/set_soenv.in b/set_soenv.in
index 3ea4a79..d1728e7 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -79,7 +79,8 @@ my ( $oldPATH, $SRC_ROOT, $JAVA_HOME, $JDK, $JAVAFLAGS, $OOO_SHELL,
$WIN_GNUCOPY, $WIN_TOUCH, $MOZILLA_VERSION, $MOZILLA_TOOLKIT, $PREBUILD_MOZAB, $MOZILLABUILD,
$PROEXT, $TARFILE_LOCATION, $GNUMAKE,
$PYTHON, $SYSTEM_PYTHON, $SYSTEM_MOZILLA, $EPM_FLAGS,
- $MACOSX_SDK_PATH);
+ $MACOSX_SDK_PATH,
+ $SYSBASE);
#
#-------------------------------------------
# IId. Declaring the aliases.
@@ -1628,7 +1629,13 @@ ToFile( "SOLARINC", $SOLARINC, "e" );
ToFile( "COMP_ENV", $COMP_ENV, "e" );
ToFile( "JAVAHOME", $JAVAHOME, "e" );
ToFile( "CC", $CC, "e" );
-ToFile( "SYSBASE", "$ENV{SYSBASE}", "e" ) if defined $ENV{SYSBASE};
+if ( defined $ENV{SYSBASE} )
+{ $SYSBASE = $ENV{SYSBASE};
+}
+else
+{ $SYSBASE = '';
+}
+ToFile( "SYSBASE", "$SYSBASE", "e" );
ToFile( "CROSS_COMPILING", "@CROSS_COMPILING@","e" );
ToFile( "AR", "@AR@", "e" );
ToFile( "DLLTOOL", "@DLLTOOL@", "e" );
More information about the Libreoffice-commits
mailing list