update libtooling and config.guess for aix 7

6 files changed, 107 insertions, 4 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:*:*)
diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk
index efe099c88049..9066b01e1267 100644
--- a/redland/rasqal/makefile.mk
+++ b/redland/rasqal/makefile.mk
@@ -56,7 +56,8 @@ OOO_PATCH_FILES= \
     $(TARFILE_NAME).patch.autotools \
     $(TARFILE_NAME).patch.ooo_build \
     $(TARFILE_NAME).patch.dmake \
-    $(TARFILE_NAME).patch.win32
+    $(TARFILE_NAME).patch.win32 \
+    rasqal-aix.patch
 
 PATCH_FILES=$(OOO_PATCH_FILES)
 
@@ -104,6 +105,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"
diff --git a/redland/rasqal/rasqal-aix.patch b/redland/rasqal/rasqal-aix.patch
new file mode 100644
index 000000000000..86470d421f81
--- /dev/null
+++ b/redland/rasqal/rasqal-aix.patch
@@ -0,0 +1,44 @@
+--- misc/rasqal-0.9.16/config.guess	2010-09-16 03:13:19.000000000 -0500
++++ misc/build/rasqal-0.9.16/config.guess	2010-09-16 03:15:05.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:*:*)
+--- misc/rasqal-0.9.16/src/rasqal_literal.c	2010-09-09 14:53:30.000000000 -0500
++++ misc/build/rasqal-0.9.16/src/rasqal_literal.c	2010-09-09 14:54:47.000000000 -0500
+@@ -36,8 +36,20 @@
+ #include <stdlib.h>
+ #endif
+ #include <stdarg.h>
++#ifdef _AIX
++#  ifndef isnan
++#   define isnan(x) \
++      (sizeof (x) == sizeof (long double) ? isnan_ld (x) \
++       : sizeof (x) == sizeof (double) ? isnan_d (x) \
++       : isnan_f (x))
++  static inline int isnan_f  (float       x) { return x != x; }
++  static inline int isnan_d  (double      x) { return x != x; }
++  static inline int isnan_ld (long double x) { return x != x; }
++#  endif
++#else
+ /* for isnan() */
+ #include <math.h>
++#endif
+ 
+ #ifdef RASQAL_REGEX_PCRE
+ #include <pcre.h>
diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk
index 3db7c0559d2e..d7b8002760e2 100644
--- a/redland/redland/makefile.mk
+++ b/redland/redland/makefile.mk
@@ -56,7 +56,8 @@ OOO_PATCH_FILES= \
     $(TARFILE_NAME).patch.autotools \
     $(TARFILE_NAME).patch.dmake \
     $(TARFILE_NAME).patch.ooo_build \
-    $(TARFILE_NAME).patch.win32
+    $(TARFILE_NAME).patch.win32 \
+    redland-aix.patch
 
 PATCH_FILES=$(OOO_PATCH_FILES) \
 
@@ -104,6 +105,10 @@ CFLAGS=-m64
 CPPFLAGS+:=-I$(PWD)$/$(INCCOM) -I$(SOLARINCDIR)$/external
 LDFLAGS+:=-L$(PWD)$/$(LB) -L$(SOLARLIBDIR)
 
+.IF "$(OS)"=="AIX"
+LDFLAGS+:=$(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO)
+.ENDIF
+
 .IF "$(SYSBASE)"!=""
 CPPFLAGS+:=-I$(SYSBASE)$/usr$/include
 .IF "$(OS)"=="SOLARIS" || "$(OS)"=="LINUX"
diff --git a/redland/redland/redland-aix.patch b/redland/redland/redland-aix.patch
new file mode 100644
index 000000000000..20d52e4787f0
--- /dev/null
+++ b/redland/redland/redland-aix.patch
@@ -0,0 +1,21 @@
+--- misc/redland-1.0.8/config.guess	2010-09-16 03:21:03.000000000 -0500
++++ misc/build/redland-1.0.8/config.guess	2010-09-16 03:22:33.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:*:*)