diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2010-10-13 13:15:19 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2010-10-13 14:34:03 +0100 |
| commit | 37d631a7ef49fff29afa98faf9813a5dfaa3186c (patch) | |
| tree | bb14a288c1d9a5577a5a8721867b2443b30084e9 /curl | |
| parent | d9cee7d3f364cf68524e1ec1d1dcaa2074edcbfc (diff) | |
update libtooling and config.guess for aix 7
Diffstat (limited to 'curl')
| -rw-r--r-- | curl/curl-aix.patch | 21 | ||||
| -rw-r--r-- | curl/makefile.mk | 8 |
2 files changed, 28 insertions, 1 deletions
diff --git a/curl/curl-aix.patch b/curl/curl-aix.patch new file mode 100644 index 000000000000..1ee1999c1a46 --- /dev/null +++ b/curl/curl-aix.patch @@ -0,0 +1,21 @@ +--- misc/curl-7.19.7/config.guess 2010-09-15 14:29:17.000000000 -0500 ++++ misc/build/curl-7.19.7/config.guess 2010-09-15 14:32:41.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/curl/makefile.mk b/curl/makefile.mk index adab75f41d49..213a887de2cd 100644 --- a/curl/makefile.mk +++ b/curl/makefile.mk @@ -43,7 +43,9 @@ all: TARFILE_NAME=curl-7.19.7 TARFILE_MD5=ecb2e37e45c9933e2a963cabe03670ab -PATCH_FILES=curl-7.19.7.patch +PATCH_FILES=\ + curl-7.19.7.patch \ + curl-aix.patch .IF "$(GUI)"=="WNT" PATCH_FILES+=curl-7.19.7_win.patch @@ -74,6 +76,10 @@ curl_CFLAGS+:=$(ARCH_FLAGS) curl_LDFLAGS+:=$(ARCH_FLAGS) .ENDIF +.IF "$(OS)"=="AIX" +curl_LDFLAGS+:=$(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO) +.ENDIF + CONFIGURE_DIR=.$/ #relative to CONFIGURE_DIR CONFIGURE_ACTION=.$/configure |