[Libreoffice-commits] core.git: 2 commits - configure.ac external/cppunit RepositoryModule_build.mk

[Tor Lillqvist]

 RepositoryModule_build.mk                   |    3 --
 configure.ac                                |    4 ++-
 external/cppunit/UnpackedTarball_cppunit.mk |    9 -------
 external/cppunit/android.patch              |   33 ----------------------------
 external/cppunit/ios.patch                  |   18 ---------------
 5 files changed, 3 insertions(+), 64 deletions(-)

New commits:
commit 2b8b417401577156c39d5cdd86985ae55c6e03a9
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Oct 17 22:42:42 2013 +0300

    We don't use cppunit when cross-compiling
    
    Change-Id: I8ff723233546d9becd001ab54a7df5ad98223f90

diff --git a/configure.ac b/configure.ac
index d8a26e9..efbebc2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7772,7 +7772,9 @@ fi
 dnl ===================================================================
 dnl Check for system cppunit
 dnl ===================================================================
-libo_CHECK_SYSTEM_MODULE([cppunit],[CPPUNIT],[cppunit >= 1.12.0])
+if test "$cross_compiling" != "yes"; then
+    libo_CHECK_SYSTEM_MODULE([cppunit],[CPPUNIT],[cppunit >= 1.12.0])
+fi
 
 dnl ===================================================================
 dnl Check whether freetype is available
diff --git a/external/cppunit/UnpackedTarball_cppunit.mk b/external/cppunit/UnpackedTarball_cppunit.mk
index e1a77a5..5898a88 100644
--- a/external/cppunit/UnpackedTarball_cppunit.mk
+++ b/external/cppunit/UnpackedTarball_cppunit.mk
@@ -16,15 +16,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,cppunit,\
 	external/cppunit/unix.patch \
 	external/cppunit/wundef.patch \
 ))
-ifeq ($(OS),ANDROID)
-$(eval $(call gb_UnpackedTarball_add_patches,cppunit,\
-	external/cppunit/android.patch \
-))
-else ifeq ($(OS),IOS)
-$(eval $(call gb_UnpackedTarball_add_patches,cppunit,\
-	external/cppunit/ios.patch \
-))
-endif
 ifeq ($(DISABLE_DYNLOADING),TRUE)
 $(eval $(call gb_UnpackedTarball_add_patches,cppunit,\
 	external/cppunit/disable-dynloading.patch \
diff --git a/external/cppunit/android.patch b/external/cppunit/android.patch
deleted file mode 100644
index 59ae451..0000000
--- a/external/cppunit/android.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- misc/cppunit-1.13.1/config/ltmain.sh
-+++ misc/build/cppunit-1.13.1/config/ltmain.sh
-@@ -3228,6 +3228,12 @@
- 	fi
-       else
- 
-+	# Force no versioning suffix for Android thanks to silly
-+	# apkbuilder which doesn't add extra native libs unless their
-+	# name ends with .so
-+
-+	version_type=none
-+
- 	# Parse the version information argument.
- 	save_ifs="$IFS"; IFS=':'
- 	set dummy $vinfo 0 0 0
---- misc/cppunit-1.13.1/src/cppunit/UnixDynamicLibraryManager.cpp
-+++ misc/build/cppunit-1.13.1/src/cppunit/UnixDynamicLibraryManager.cpp
-@@ -13,7 +13,15 @@
- DynamicLibraryManager::LibraryHandle 
- DynamicLibraryManager::doLoadLibrary( const std::string &libraryName )
- {
-+#ifdef __ANDROID__
-+  // Use our enhanced dlopen() wrapper, see sal/osl/android/jni/lo-wrapper.c
-+  void *(*lo_dlopen)(const char *) = (void *(*)(const char *)) dlsym( RTLD_DEFAULT, "lo_dlopen" );
-+  if (lo_dlopen == NULL)
-+    return NULL;
-+  return (*lo_dlopen)( libraryName.c_str() );
-+#else
-   return ::dlopen( libraryName.c_str(), RTLD_NOW | RTLD_GLOBAL );
-+#endif
- }
- 
- 
diff --git a/external/cppunit/ios.patch b/external/cppunit/ios.patch
deleted file mode 100644
index d7e355c..0000000
--- a/external/cppunit/ios.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- misc/cppunit-1.13.1/configure
-+++ misc/cppunit-1.13.1/configure
-@@ -23273,7 +23273,7 @@
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: creating $ac_prefix_conf_OUT - prefix $ac_prefix_conf_UPP for $ac_prefix_conf_INP defines" >&5
- $as_echo "creating $ac_prefix_conf_OUT - prefix $ac_prefix_conf_UPP for $ac_prefix_conf_INP defines" >&6; }
-   if test -f $ac_prefix_conf_INP ; then
--    $as_dirname -- /* automatically generated */ ||
-+    $as_dirname -- '/* automatically generated */' ||
- $as_expr X/* automatically generated */ : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- 	 X/* automatically generated */ : 'X\(//\)[^/]' \| \
- 	 X/* automatically generated */ : 'X\(//\)$' \| \
-@@ -23318,5 +23318,5 @@
-   else
-     as_fn_error $? "input file $ac_prefix_conf_IN does not exist,     skip generating $ac_prefix_conf_OUT" "$LINENO" 5
-   fi
--  rm -f conftest.*
-+  rm -f -r conftest.*
- fi
commit 04aaf0a52ff692e340d4acd47c4ddf5857b12df2
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Oct 17 22:38:23 2013 +0300

    These are handled in external/Module_external.mk
    
    Change-Id: I1d1fbef457a34f730c9a83c5580fd56a0bed455c

diff --git a/RepositoryModule_build.mk b/RepositoryModule_build.mk
index 92ab57e..22bc481 100644
--- a/RepositoryModule_build.mk
+++ b/RepositoryModule_build.mk
@@ -55,9 +55,6 @@ $(eval $(call gb_Module_add_moduledirs,cross_toolset,\
 	unotools \
 	ure \
 	xmlreader \
-	$(call gb_Helper_optional,BOOST,boost) \
-	$(call gb_Helper_optional,CLUCENE,clucene) \
-	$(call gb_Helper_optional,CPPUNIT,cppunit) \
 	$(call gb_Helper_optional_for_host,DESKTOP, \
 		$(if $(filter YES,$(WITH_GALLERY_BUILD)), \
 			avmedia \