diff options
| author | Tor Lillqvist <tml@iki.fi> | 2011-06-21 21:38:33 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2011-06-21 21:38:33 +0300 |
| commit | 167311be9b2ddbb9acb9e7253143330101fd9d11 (patch) | |
| tree | d0a0d231ebd9f330c4ae2c7f945a81e82b4c57e4 /cppunit | |
| parent | fc030944c592cac397bac674b05b78ed814c7941 (diff) | |
Make cppunit build for Android
Diffstat (limited to 'cppunit')
| -rw-r--r-- | cppunit/android.patch | 11 | ||||
| -rw-r--r-- | cppunit/makefile.mk | 4 |
2 files changed, 13 insertions, 2 deletions
diff --git a/cppunit/android.patch b/cppunit/android.patch new file mode 100644 index 000000000000..595f840ab712 --- /dev/null +++ b/cppunit/android.patch @@ -0,0 +1,11 @@ +--- misc/cppunit-1.12.1/config/config.sub ++++ misc/build/cppunit-1.12.1/config/config.sub +@@ -1246,7 +1246,7 @@ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ +- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ ++ | -udi* | -eabi* | -androideabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* \ + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk index d77f3fac8d76..54c55c25469d 100644 --- a/cppunit/makefile.mk +++ b/cppunit/makefile.mk @@ -34,7 +34,7 @@ TARFILE_MD5=bd30e9cf5523cdfc019b94f5e1d7fd19 # from <https://sourceforge.net/projects/cppunit/files/cppunit/1.12.1/ # cppunit-1.12.1.tar.gz/download> -PATCH_FILES = solarisfinite.patch warnings.patch windows.patch ldflags.patch aix.patch avoid-synthetised-destructor.patch +PATCH_FILES = solarisfinite.patch warnings.patch windows.patch ldflags.patch aix.patch avoid-synthetised-destructor.patch android.patch # solarisfinite.patch: see <https://sourceforge.net/tracker/?func=detail& # aid=2912590&group_id=11795&atid=311795> # warnings.patch: see <https://sourceforge.net/tracker/?func=detail& @@ -149,7 +149,7 @@ EXTRPATH = NONE OUT2LIB = ooo-install/lib/libcppunit-1.12.a .ELIF "$(OS)" == "OPENBSD" OUT2LIB = ooo-install/lib/libcppunit-1.12.so.1.0 -.ELIF "$(OS)" == "IOS" +.ELIF "$(OS)" == "IOS" || "$(OS)" == "ANDROID" OUT2LIB = ooo-install/lib/libcppunit.a .ELSE OUT2LIB = ooo-install/lib/libcppunit-1.12.so.1 |