[Libreoffice-commits] .: 2 commits - configure.in README.cross set_soenv.in

[Tor Lillqvist]

 README.cross |    3 ++-
 configure.in |    2 +-
 set_soenv.in |    1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 3f13a9fdbedc14b0c0bfecc73f19114fa443c3e1
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu Jun 9 23:17:14 2011 +0300

    Add SYSBASE setting and -L flag for the GNU libstdc++ for Android

diff --git a/README.cross b/README.cross
index 80bd20c..0926be0 100644
--- a/README.cross
+++ b/README.cross
@@ -193,8 +193,9 @@ available for Linux, MacOSX and Windows. (Trying to cross-compile from
 Windows will probably drive you insane.)
 
 Here is my autogen.lastrun for Android:
+SYSBASE=/home/tml/android-ndk-r5b/platforms/android-9/arch-arm
 CC=ccache /home/tml/android-ndk-r5b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot /home/tml/android-ndk-r5b/platforms/android-9/arch-arm
-CXX=ccache /home/tml/android-ndk-r5b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-g++ --sysroot /home/tml/android-ndk-r5b/platforms/android-9/arch-arm -I /home/tml/android-ndk-r5b/sources/cxx-stl/gnu-libstdc++/include -I/home/tml/android-ndk-r5b/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include  -fexceptions -frtti
+CXX=ccache /home/tml/android-ndk-r5b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-g++ --sysroot /home/tml/android-ndk-r5b/platforms/android-9/arch-arm -I /home/tml/android-ndk-r5b/sources/cxx-stl/gnu-libstdc++/include -I/home/tml/android-ndk-r5b/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include -L/home/tml/android-ndk-r5b/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a -fexceptions -frtti
 AR=/home/tml/android-ndk-r5b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-ar
 NM=/home/tml/android-ndk-r5b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-nm
 OBJDUMP=/home/tml/android-ndk-r5b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-objdump
commit ffcb890103b01daed9db974f2b8ed19ec3980ca5
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu Jun 9 23:16:37 2011 +0300

    Propagate also SYSBASE to the build environment

diff --git a/configure.in b/configure.in
index 48d989a..4d9aeef 100755
--- a/configure.in
+++ b/configure.in
@@ -1669,7 +1669,7 @@ if test "$cross_compiling" = "yes"; then
 	bin/repo-list.in | (cd CONF-FOR-BUILD && tar xf -)
   (
     unset COM GUI GUIBASE OS CPU CPUNAME
-    unset CC CXX CFLAGS
+    unset CC CXX SYSBASE CFLAGS
     unset AR NM OBJDUMP PKG_CONFIG RANLIB STRIP
     test -n "$CC_FOR_BUILD" && export CC="$CC_FOR_BUILD"
     test -n "$CXX_FOR_BUILD" && export CXX="$CXX_FOR_BUILD"
diff --git a/set_soenv.in b/set_soenv.in
index b40a34d..8900201 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1741,6 +1741,7 @@ ToFile( "SOLARINC",          $SOLARINC,          "e" );
 ToFile( "COMP_ENV",          $COMP_ENV,          "e" );
 ToFile( "JAVAHOME",          $JAVAHOME,          "e" );
 ToFile( "CC",                $CC,                "e" );
+ToFile( "SYSBASE",           "$ENV{SYSBASE}",    "e" );
 ToFile( "CROSS_COMPILING",   "@CROSS_COMPILING@","e" );
 ToFile( "AR",                "@AR@",             "e" );
 ToFile( "DLLTOOL",           "@DLLTOOL@",        "e" );