[Libreoffice-commits] .: 2 commits - configure.in jvmaccess/Library_jvmaccess.mk jvmfwk/Library_jvmfwk.mk jvmfwk/Library_sunjavaplugin.mk README.cross unotest/Library_unoexceptionprotector.mk unotest/Library_unotest.mk

[Tor Lillqvist]

 README.cross                             |    4 ++--
 configure.in                             |    2 +-
 jvmaccess/Library_jvmaccess.mk           |    7 +------
 jvmfwk/Library_jvmfwk.mk                 |    1 +
 jvmfwk/Library_sunjavaplugin.mk          |    1 +
 unotest/Library_unoexceptionprotector.mk |    1 +
 unotest/Library_unotest.mk               |    1 +
 7 files changed, 8 insertions(+), 9 deletions(-)

New commits:
commit 33b6af02195144875e9fa1a0663d55441aa3f5f4
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Fri Feb 17 17:41:33 2012 +0200

    We want gb_STDLIBS here surely?

diff --git a/jvmaccess/Library_jvmaccess.mk b/jvmaccess/Library_jvmaccess.mk
index 98bfb46..c7bddf2 100644
--- a/jvmaccess/Library_jvmaccess.mk
+++ b/jvmaccess/Library_jvmaccess.mk
@@ -45,14 +45,9 @@ $(eval $(call gb_Library_add_linked_libs,jvmaccess,\
     cppu \
     sal \
     salhelper \
+	$(gb_STDLIBS) \
 ))
 
-ifeq ($(OS),WNT)
-$(eval $(call gb_Library_add_linked_libs,jvmaccess,\
-    advapi32 \
-))
-endif
-
 $(eval $(call gb_Library_add_exception_objects,jvmaccess,\
     jvmaccess/source/classpath \
     jvmaccess/source/unovirtualmachine \
diff --git a/jvmfwk/Library_jvmfwk.mk b/jvmfwk/Library_jvmfwk.mk
index e58dade..5b424d0 100644
--- a/jvmfwk/Library_jvmfwk.mk
+++ b/jvmfwk/Library_jvmfwk.mk
@@ -44,6 +44,7 @@ $(eval $(call gb_Library_add_api,jvmfwk,\
 $(eval $(call gb_Library_add_linked_libs,jvmfwk,\
     cppuhelper \
     sal \
+	$(gb_STDLIBS) \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/jvmfwk/Library_sunjavaplugin.mk b/jvmfwk/Library_sunjavaplugin.mk
index 734e564..d1d2af4 100644
--- a/jvmfwk/Library_sunjavaplugin.mk
+++ b/jvmfwk/Library_sunjavaplugin.mk
@@ -46,6 +46,7 @@ $(eval $(call gb_Library_add_linked_libs,sunjavaplugin,\
     cppuhelper \
     sal \
     salhelper \
+	$(gb_STDLIBS) \
 ))
 
 ifeq ($(OS),ANDROID)
diff --git a/unotest/Library_unoexceptionprotector.mk b/unotest/Library_unoexceptionprotector.mk
index 079574b..3324f3e 100644
--- a/unotest/Library_unoexceptionprotector.mk
+++ b/unotest/Library_unoexceptionprotector.mk
@@ -38,6 +38,7 @@ $(eval $(call gb_Library_add_linked_libs,unoexceptionprotector,\
 	cppu \
 	cppuhelper \
 	sal \
+	$(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Library_use_externals,unoexceptionprotector,\
diff --git a/unotest/Library_unotest.mk b/unotest/Library_unotest.mk
index 9cfd371..aad6abd 100644
--- a/unotest/Library_unotest.mk
+++ b/unotest/Library_unotest.mk
@@ -43,6 +43,7 @@ $(eval $(call gb_Library_add_linked_libs,unotest,\
 	cppu \
 	cppuhelper \
 	sal \
+	$(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Library_use_externals,unotest,\
commit 18f4ff23179620e834aa3ebd83a2e15c2f77cbe1
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Fri Feb 17 13:54:25 2012 +0200

    Recommend to use NDK r7b
    
    Drop compiler options -fexceptions -frtti for Android, I hope they are
    taken care of by the makefilery where needed. At least either
    -fexceptions or -fno-exceptions is used for each C++ compilation as
    far as I know. Not so sure about RTTI, let's see.

diff --git a/README.cross b/README.cross
index 2acd497..d2a8b14 100644
--- a/README.cross
+++ b/README.cross
@@ -322,7 +322,7 @@ Here is an autogen.lastrun for Android, when cross-compiling from Mac OS X:
 
 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
+--with-android-ndk=/Users/tml/android-ndk-r7b
 --with-android-sdk=/Users/tml/android-sdk-macosx
 --build=x86_64-apple-darwin11
 --disable-zenity
@@ -338,7 +338,7 @@ And here is an autogen.lastrun for Android when cross-compiling from Linux:
 
 CC_FOR_BUILD=ccache gcc
 CXX_FOR_BUILD=ccache g++
---with-android-ndk=/home/tml/android-ndk-r7
+--with-android-ndk=/home/tml/android-ndk-r7b
 --with-android-sdk=/home/tml/android-sdk-linux_x86
 --with-ant-home=/opt/apache-ant-1.8.2
 --build=x86_64-unknown-linux-gnu
diff --git a/configure.in b/configure.in
index 2459b76..486d061 100644
--- a/configure.in
+++ b/configure.in
@@ -111,7 +111,7 @@ if test -n "$with_android_ndk"; then
    ANDROIDCFLAGS="-march=armv7-a -mfloat-abi=softfp -mthumb -mfpu=neon -Wl,--fix-cortex-a8 --sysroot $ANDROID_NDK_HOME/platforms/android-9/arch-arm -L$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a"
 
    test -z "$CC" && CC="$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-gcc $ANDROIDCFLAGS"
-   test -z "$CXX" && CXX="$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-g++ $ANDROIDCFLAGS -I $ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/include -I$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include -fexceptions -frtti"
+   test -z "$CXX" && CXX="$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-g++ $ANDROIDCFLAGS -I $ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/include -I$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include"
 fi
 AC_SUBST(ANDROID_NDK_HOME)