cppunit/disable-dynloading.patch | 25 +
cppunit/ios.patch| 25 -
cppunit/makefile.mk |8 ++--
3 files changed, 31 insertions(+), 27 deletions(-)
New commits:
commit 24c66413176cdb64eccb21e204bc61c933f2732d
Author: Tor Lillqvist t...@iki.fi
Date: Fri Sep 14 14:31:40 2012 +0300
Adapt for DISABLE_DYNLOADING possibility also for Android
Change-Id: Iecc8c35b5b2235bc3408f2ecf3969317ac8bf679
diff --git a/cppunit/disable-dynloading.patch b/cppunit/disable-dynloading.patch
new file mode 100644
index 000..ffe01d3
--- /dev/null
+++ b/cppunit/disable-dynloading.patch
@@ -0,0 +1,25 @@
+--- misc/build/cppunit-1.13.0/include/cppunit/plugin/TestPlugIn.h
misc/build/cppunit-1.13.0/include/cppunit/plugin/TestPlugIn.h
+@@ -106,7 +106,9 @@
+ * CppUnitTestPlugIn *CPPUNIT_PLUGIN_EXPORTED_NAME(void);
+ * \endcode
+ */
++#ifndef CPPUNIT_PLUGIN_EXPORTED_NAME
+ #define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTestPlugIn
++#endif
+
+ /*! \brief Type of the function exported by a plug-in.
+ * \ingroup WritingTestPlugIn
+@@ -143,6 +143,12 @@
+ #define CPPUNIT_PLUGIN_IMPLEMENT_MAIN() \
+ typedef char __CppUnitPlugInImplementMainDummyTypeDef
+
++// Actually this is for iOS and Android where we build the cppunit tests
libraries
++// as plain archives and just link them statically into test fixture programs,
++// and don't want any stinking duplicate main(), but shouldn't hurt for
MacOSX either.
++#elif defined(__APPLE__) || defined(__ANDROID__)
++#define CPPUNIT_PLUGIN_IMPLEMENT_MAIN() \
++ typedef char __CppUnitPlugInImplementMainDummyTypeDef
+ // Unix
+ #elif defined(CPPUNIT_HAVE_UNIX_DLL_LOADER) ||
defined(CPPUNIT_HAVE_UNIX_SHL_LOADER)
+ #define CPPUNIT_PLUGIN_IMPLEMENT_MAIN() \
diff --git a/cppunit/ios.patch b/cppunit/ios.patch
index 2a0cba1..55ee65c 100644
--- a/cppunit/ios.patch
+++ b/cppunit/ios.patch
@@ -16,28 +16,3 @@
- rm -f conftest.*
+ rm -f -r conftest.*
fi
misc/build/cppunit-1.13.0/include/cppunit/plugin/TestPlugIn.h
-+++ misc/build/cppunit-1.13.0/include/cppunit/plugin/TestPlugIn.h
-@@ -106,7 +106,9 @@
- * CppUnitTestPlugIn *CPPUNIT_PLUGIN_EXPORTED_NAME(void);
- * \endcode
- */
-+#ifndef CPPUNIT_PLUGIN_EXPORTED_NAME
- #define CPPUNIT_PLUGIN_EXPORTED_NAME cppunitTestPlugIn
-+#endif
-
- /*! \brief Type of the function exported by a plug-in.
- * \ingroup WritingTestPlugIn
-@@ -143,6 +143,12 @@
- #define CPPUNIT_PLUGIN_IMPLEMENT_MAIN() \
- typedef char __CppUnitPlugInImplementMainDummyTypeDef
-
-+// Actually this is for iOS where we build the cppunit tests libraries
-+// as plain archives and just link them statically into test fixture programs,
-+// and don't want any stinking duplicate main(), but shouldn't hurt for
MacOSX either.
-+#elif defined(__APPLE__)
-+#define CPPUNIT_PLUGIN_IMPLEMENT_MAIN() \
-+ typedef char __CppUnitPlugInImplementMainDummyTypeDef
- // Unix
- #elif defined(CPPUNIT_HAVE_UNIX_DLL_LOADER) ||
defined(CPPUNIT_HAVE_UNIX_SHL_LOADER)
- #define CPPUNIT_PLUGIN_IMPLEMENT_MAIN() \
diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk
index 9536759..9dab3ca 100644
--- a/cppunit/makefile.mk
+++ b/cppunit/makefile.mk
@@ -42,6 +42,10 @@ PATCH_FILES += android.patch
PATCH_FILES += ios.patch
.ENDIF
+.IF $(DISABLE_DYNLOADING) == TRUE
+PATCH_FILES += disable-dynloading.patch
+.ENDIF
+
.IF $(OS) == WNT
.IF $(COM) == MSC
@@ -148,7 +152,7 @@ CONFIGURE_FLAGS = --prefix=$(shell cd $(PACKAGE_DIR) \
LDFLAGS='$(LDFLAGS)' \
LIBS='$(MY_LIBS)'
-.IF $(OS)==IOS
+.IF $(DISABLE_DYNLOADING) == TRUE
CONFIGURE_FLAGS+=--disable-shared
.ELSE
CONFIGURE_FLAGS+=--disable-static
@@ -173,7 +177,7 @@ PACKAGE_DIR = \
OUT2LIB = ooo-install/lib/libcppunit-1.13.a
.ELIF $(OS) == OPENBSD
OUT2LIB = ooo-install/lib/libcppunit-1.13.so.0.0
-.ELIF $(OS) == IOS
+.ELIF $(DISABLE_DYNLOADING) == TRUE
OUT2LIB = ooo-install/lib/libcppunit.a
.ELIF $(OS) == ANDROID
OUT2LIB = ooo-install/lib/libcppunit-1.13.so
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
