diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-06-27 18:41:54 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-06-27 19:09:50 +0200 |
| commit | fa0fd16526f05e37e10af7a367c9950a974d7c90 (patch) | |
| tree | d1861166ba6fd60e4b6f8cb44c3fc07aae6aa41b /cppunit/ios.patch | |
| parent | 887fc099c118da335e8a507db9521437f5bd2e82 (diff) | |
update cppunit to 1.13.0
Change-Id: If3896361c31a84b77e4c446dac75aeb9268605a0
Diffstat (limited to 'cppunit/ios.patch')
| -rw-r--r-- | cppunit/ios.patch | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/cppunit/ios.patch b/cppunit/ios.patch deleted file mode 100644 index 89204618ef4e..000000000000 --- a/cppunit/ios.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- misc/build/cppunit-1.12.1/configure -+++ misc/build/cppunit-1.12.1/configure -@@ -23273,7 +23273,7 @@ - { echo "$as_me:$LINENO: result: creating $ac_prefix_conf_OUT - prefix $ac_prefix_conf_UPP for $ac_prefix_conf_INP defines" >&5 - echo "${ECHO_T}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 @@ - echo "$as_me: error: input file $ac_prefix_conf_IN does not exist, skip generating $ac_prefix_conf_OUT" >&2;} - { (exit 1); exit 1; }; } - fi -- rm -f conftest.* -+ rm -f -r conftest.* - fi ---- misc/build/cppunit-1.12.1/include/cppunit/plugin/TestPlugIn.h -+++ misc/build/cppunit-1.12.1/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() \ |