diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2010-10-13 13:45:34 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2010-10-13 14:34:03 +0100 |
| commit | f9721ff45344b87099593474bcabbc92f3582d88 (patch) | |
| tree | 5d72281697ee90f503529b5edd70569ff7ebbaaa /libxml2 | |
| parent | c6ab29e5621f30bbb214ad2fb7c6cf5ad159c0d7 (diff) | |
update libtooling and config.guess for aix 7
Diffstat (limited to 'libxml2')
| -rw-r--r-- | libxml2/libxml2-aix.patch | 21 | ||||
| -rw-r--r-- | libxml2/makefile.mk | 4 |
2 files changed, 23 insertions, 2 deletions
diff --git a/libxml2/libxml2-aix.patch b/libxml2/libxml2-aix.patch new file mode 100644 index 000000000000..d187ea0f807f --- /dev/null +++ b/libxml2/libxml2-aix.patch @@ -0,0 +1,21 @@ +--- misc/libxml2-2.7.6/config.guess 2010-09-15 14:53:52.000000000 -0500 ++++ misc/build/libxml2-2.7.6/config.guess 2010-09-15 14:56:09.000000000 -0500 +@@ -548,7 +548,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 +@@ -560,6 +560,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/libxml2/makefile.mk b/libxml2/makefile.mk index bef2d43aa6e3..c9677f0831d9 100644 --- a/libxml2/makefile.mk +++ b/libxml2/makefile.mk @@ -52,7 +52,7 @@ PATCH_FILES=libxml2-configure.patch \ libxml2-mingw.patch \ libxml2-gnome599717.patch \ libxml2-global-symbols.patch \ - + libxml2-aix.patch # This is only for UNX environment now @@ -100,7 +100,7 @@ CONFIGURE_ACTION=sh .$/configure CONFIGURE_FLAGS=--enable-ipv6=no --without-python --without-zlib --enable-static=yes --with-sax1=yes ADDCFLAGS="$(xml2_CFLAGS)" CFLAGS="$(EXTRA_CFLAGS)" LDFLAGS="$(xml2_LDFLAGS) $(EXTRA_LINKFLAGS)" .ELSE CONFIGURE_ACTION=.$/configure -CONFIGURE_FLAGS=--enable-ipv6=no --without-python --without-zlib --enable-static=no --with-sax1=yes ADDCFLAGS="$(xml2_CFLAGS) $(EXTRA_CFLAGS)" LDFLAGS="$(xml2_LDFLAGS) $(EXTRA_LINKFLAGS)" +CONFIGURE_FLAGS=--enable-ipv6=no --without-python --without-zlib --enable-shared --disable-static --with-sax1=yes ADDCFLAGS="$(xml2_CFLAGS) $(EXTRA_CFLAGS)" LDFLAGS="$(xml2_LDFLAGS) $(EXTRA_LINKFLAGS)" .ENDIF BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) |