diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-08-21 19:14:25 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-08-21 19:16:00 +0300 |
| commit | df812bf9d5dc13788ec43710df9d0c052c418f11 (patch) | |
| tree | 9211bb6ee55a81cd985f9d53edde958530dddcd4 /cppunit | |
| parent | 2d59d6904c2c73d5645aa0861223f399ce077781 (diff) | |
Resurrect cppunit/ios.patch
Change-Id: Ie39f608d807ffd8cfb670e69a165cf4dd1e50d49
Diffstat (limited to 'cppunit')
| -rw-r--r-- | cppunit/ios.patch | 43 | ||||
| -rw-r--r-- | cppunit/makefile.mk | 4 |
2 files changed, 47 insertions, 0 deletions
diff --git a/cppunit/ios.patch b/cppunit/ios.patch new file mode 100644 index 000000000000..2a0cba1677b7 --- /dev/null +++ b/cppunit/ios.patch @@ -0,0 +1,43 @@ +--- misc/build/cppunit-1.13.0/configure ++++ misc/build/cppunit-1.13.0/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 +--- 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 03927e6d5b4c..95367596d82c 100644 --- a/cppunit/makefile.mk +++ b/cppunit/makefile.mk @@ -38,6 +38,10 @@ PATCH_FILES = windows.patch unix.patch PATCH_FILES += android.patch .ENDIF +.IF "$(OS)" == "IOS" +PATCH_FILES += ios.patch +.ENDIF + .IF "$(OS)" == "WNT" .IF "$(COM)" == "MSC" |