diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2010-10-13 13:13:31 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2010-10-13 14:33:29 +0100 |
| commit | 09a2db1773899320ee36b5c49a8bc033c02bfd38 (patch) | |
| tree | 267d263070b3b98936ebba9e61def6a085fa8894 /cppunit | |
| parent | 408b0b851de7f456c6340f99373d2023618aef52 (diff) | |
update libtooling and config.guess for aix 7
Diffstat (limited to 'cppunit')
| -rw-r--r-- | cppunit/aix.patch | 21 | ||||
| -rw-r--r-- | cppunit/makefile.mk | 4 | ||||
| -rw-r--r-- | cppunit/prj/d.lst | 3 |
3 files changed, 27 insertions, 1 deletions
diff --git a/cppunit/aix.patch b/cppunit/aix.patch new file mode 100644 index 000000000000..2bc78f3f9224 --- /dev/null +++ b/cppunit/aix.patch @@ -0,0 +1,21 @@ +--- misc/cppunit-1.12.1.orig/config/config.guess 2010-09-15 10:25:54.000000000 -0500 ++++ misc/build/cppunit-1.12.1/config/config.guess 2010-09-15 10:26:50.000000000 -0500 +@@ -532,7 +532,7 @@ + echo rs6000-ibm-aix3.2 + fi + exit ;; +- *:AIX:*:[456]) ++ *:AIX:*:[4567]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 +@@ -544,6 +544,9 @@ + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi ++ if [ "$IBM_REV" == "V7BETA" ]; then ++ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} ++ fi + echo ${IBM_ARCH}-ibm-aix${IBM_REV} + exit ;; + *:AIX:*:*) diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk index 7da32f74c99e..50d489322d31 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 +PATCH_FILES = solarisfinite.patch warnings.patch windows.patch ldflags.patch aix.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& @@ -181,6 +181,8 @@ OUT2BIN = ooo-install/bin/DllPlugInTester .IF "$(OS)" == "MACOSX" OUT2LIB = ooo-install/lib/libcppunit-1.12.1.dylib EXTRPATH = NONE +.ELIF "$(OS)" == "AIX" +OUT2LIB = ooo-install/lib/libcppunit-1.12.a .ELSE OUT2LIB = ooo-install/lib/libcppunit-1.12.so.1 .END diff --git a/cppunit/prj/d.lst b/cppunit/prj/d.lst index 6ecac46bfb90..e881e4a2d033 100644 --- a/cppunit/prj/d.lst +++ b/cppunit/prj/d.lst @@ -24,6 +24,9 @@ symlink: %_DEST%\lib%_EXT%\libcppunit-1.12.1.dylib %_DEST%\lib%_EXT%\libcppunit. ..\%__SRC%\lib\libcppunit-1.12.so.1 %_DEST%\lib%_EXT%\libcppunit-1.12.so.1 symlink: %_DEST%\lib%_EXT%\libcppunit-1.12.so.1 %_DEST%\lib%_EXT%\libcppunit.so +..\%__SRC%\lib\libcppunit-1.12.a %_DEST%\lib%_EXT%\libcppunit-1.12.a +symlink: %_DEST%\lib%_EXT%\libcppunit-1.12.a %_DEST%\lib%_EXT%\libcppunit.a + ..\%__SRC%\bin\DllPlugInTester %_DEST%\bin%_EXT%\DllPlugInTester ..\%__SRC%\bin\DllPlugInTester.exe %_DEST%\bin%_EXT%\DllPlugInTester.exe ..\%__SRC%\bin\DllPlugInTester_dll.exe %_DEST%\bin%_EXT%\DllPlugInTester_dll.exe |