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/rasqal | |
| parent | 489a9fa814b44d59de059db45ac88a964b0034b8 (diff) | |
update libtooling and config.guess for aix 7
Diffstat (limited to 'redland/rasqal')
| -rw-r--r-- | redland/rasqal/makefile.mk | 7 | ||||
| -rw-r--r-- | redland/rasqal/rasqal-aix.patch | 44 |
2 files changed, 50 insertions, 1 deletions
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> |