diff options
Diffstat (limited to 'curl')
| -rw-r--r-- | curl/curl-aix.patch | 21 | ||||
| -rw-r--r-- | curl/makefile.mk | 24 |
2 files changed, 37 insertions, 8 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 cb6ac50dc705..dfcb77fa1ce4 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 @@ -70,6 +72,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 @@ -102,8 +108,6 @@ BUILD_ACTION=make OUT2BIN=$(BUILD_DIR)$/.libs$/libcurl*.dll OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl*.a .ELSE -# make use of stlport headerfiles -EXT_USE_STLPORT=TRUE .IF "$(CCNUMVER)" > "001399999999" EXCFLAGS="/EHa /Zc:wchar_t- /D "_CRT_SECURE_NO_DEPRECATE"" @@ -112,10 +116,17 @@ EXCFLAGS="/EHsc /YX" .ENDIF BUILD_DIR=.$/lib + +.IF "$(CPU)" == "I" +MACHINE=X86 +.ELSE +MACHINE=X64 +.ENDIF + .IF "$(debug)"=="" -BUILD_ACTION=nmake -f Makefile.vc9 cfg=release-dll EXCFLAGS=$(EXCFLAGS) +BUILD_ACTION=nmake -f Makefile.vc9 cfg=release-dll EXCFLAGS=$(EXCFLAGS) MACHINE=$(MACHINE) .ELSE -BUILD_ACTION=nmake -f Makefile.vc9 cfg=debug-dll EXCFLAGS=$(EXCFLAGS) +BUILD_ACTION=nmake -f Makefile.vc9 cfg=debug-dll EXCFLAGS=$(EXCFLAGS) MACHINE=$(MACHINE) .ENDIF OUT2BIN=$(BUILD_DIR)$/libcurl.dll @@ -125,9 +136,6 @@ OUT2LIB=$(BUILD_DIR)$/libcurl.lib .ENDIF # "$(GUI)"=="WNT" .IF "$(GUI)"=="OS2" -# make use of stlport headerfiles -EXT_USE_STLPORT=TRUE - BUILD_DIR=.$/lib .IF "$(debug)"=="" BUILD_ACTION=make -f Makefile.os2 |