diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2010-10-13 14:50:45 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2010-10-13 14:50:45 +0100 |
| commit | af4e38f4d9174bc3f927ad119cab62e95264a5de (patch) | |
| tree | 2abb1732e7a20781ea03b4be4b68b6e478ec59ba /redland/raptor | |
| parent | 489a9fa814b44d59de059db45ac88a964b0034b8 (diff) | |
update libtooling and config.guess for aix 7
Diffstat (limited to 'redland/raptor')
| -rw-r--r-- | redland/raptor/makefile.mk | 11 | ||||
| -rw-r--r-- | redland/raptor/raptor-aix.patch | 21 |
2 files changed, 30 insertions, 2 deletions
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk index 62d4f704d0e4..c6d8efc16a35 100644 --- a/redland/raptor/makefile.mk +++ b/redland/raptor/makefile.mk @@ -57,7 +57,7 @@ OOO_PATCH_FILES= \ $(TARFILE_NAME).patch.ooo_build \ $(TARFILE_NAME).patch.dmake \ $(TARFILE_NAME).patch.win32 \ - + raptor-aix.patch PATCH_FILES=$(OOO_PATCH_FILES) @@ -108,6 +108,10 @@ CFLAGS=-m64 CPPFLAGS+:=-I$(SOLARINCDIR)$/external LDFLAGS+:=-L$(SOLARLIBDIR) +.IF "$(OS)"=="AIX" +LDFLAGS+:=$(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO) +.ENDIF + .IF "$(SYSBASE)"!="" CPPFLAGS+:=-I$(SYSBASE)$/usr$/include .IF "$(OS)"=="SOLARIS" || "$(OS)"=="LINUX" @@ -141,6 +145,9 @@ OUT2INC+=src$/raptor.h .IF "$(OS)"=="MACOSX" OUT2LIB+=src$/.libs$/libraptor.$(RAPTOR_MAJOR).dylib src$/.libs$/libraptor.dylib OUT2BIN+=src/raptor-config +.ELIF "$(OS)"=="AIX" +OUT2LIB+=src$/.libs$/libraptor.so.$(RAPTOR_MAJOR) src$/.libs$/libraptor.so +OUT2BIN+=src/raptor-config .ELIF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" OUT2LIB+=src$/.libs$/*.a @@ -152,7 +159,7 @@ OUT2BIN+=src/raptor-config .ELIF "$(GUI)"=="OS2" # if we use dmake, this is done automagically .ELSE -OUT2LIB+=src$/.libs$/libraptor.so.$(RAPTOR_MAJOR) src$/.libs$/libraptor.so +OUT2LIB+=src$/.libs$/libraptor.so.$(RAPTOR_MAJOR) OUT2BIN+=src/raptor-config .ENDIF diff --git a/redland/raptor/raptor-aix.patch b/redland/raptor/raptor-aix.patch new file mode 100644 index 000000000000..d6427c501d68 --- /dev/null +++ b/redland/raptor/raptor-aix.patch @@ -0,0 +1,21 @@ +--- misc/raptor-1.4.18/config.guess 2010-09-16 03:07:14.000000000 -0500 ++++ misc/build/raptor-1.4.18/config.guess 2010-09-16 03:08:00.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:*:*) |