diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2010-10-13 13:46:13 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2010-10-13 14:34:03 +0100 |
| commit | b57a972d3025770a48601263b967b98737323365 (patch) | |
| tree | fdd3fde9d85051fb9a1a7ab31becdd46cc81b0b3 /libxslt | |
| parent | f9721ff45344b87099593474bcabbc92f3582d88 (diff) | |
update libtooling and config.guess for aix 7
Diffstat (limited to 'libxslt')
| -rw-r--r-- | libxslt/libxslt-aix.patch | 21 | ||||
| -rw-r--r-- | libxslt/makefile.mk | 7 | ||||
| -rw-r--r-- | libxslt/prj/d.lst | 3 |
3 files changed, 28 insertions, 3 deletions
diff --git a/libxslt/libxslt-aix.patch b/libxslt/libxslt-aix.patch new file mode 100644 index 000000000000..fe38f7bb7e73 --- /dev/null +++ b/libxslt/libxslt-aix.patch @@ -0,0 +1,21 @@ +--- misc/libxslt-1.1.26/config.guess 2010-09-16 02:40:03.000000000 -0500 ++++ misc/build/libxslt-1.1.26/config.guess 2010-09-16 02:41:43.000000000 -0500 +@@ -532,7 +532,7 @@ + echo rs6000-ibm-aix3.2 + fi + exit ;; +- *:AIX:*:[45]) ++ *: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/libxslt/makefile.mk b/libxslt/makefile.mk index fd7273b0c6b9..9a7be2e53532 100644 --- a/libxslt/makefile.mk +++ b/libxslt/makefile.mk @@ -55,8 +55,8 @@ TARFILE_MD5=e61d0364a30146aaa3001296f853b2b9 PATCH_FILES=libxslt-configure.patch \ libxslt-win_manifest.patch \ libxslt-mingw.patch \ - libxslt-internal-symbols.patch - + libxslt-internal-symbols.patch \ + libxslt-aix.patch # This is only for UNX environment now .IF "$(OS)"=="WNT" @@ -96,6 +96,9 @@ LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec .IF "$(OS)$(COM)"=="SOLARISC52" LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' .ENDIF # "$(OS)$(COM)"=="SOLARISC52" +.IF "$(OS)"=="AIX" +LDFLAGS+:=$(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO) +.ENDIF .IF "$(SYSBASE)"!="" CPPFLAGS+:=-I$(SOLARINCDIR)$/external -I$(SYSBASE)$/usr$/include $(EXTRA_CFLAGS) diff --git a/libxslt/prj/d.lst b/libxslt/prj/d.lst index cdb1c1d7dd2e..4913b78c2824 100644 --- a/libxslt/prj/d.lst +++ b/libxslt/prj/d.lst @@ -3,7 +3,8 @@ mkdir: %_DEST%\inc%_EXT%\external\libxslt ..\%__SRC%\lib\libxslt.so.1 %_DEST%\lib%_EXT%\libxslt.so.1 symlink: %_DEST%\lib%_EXT%\libxslt.so.1 %_DEST%\lib%_EXT%\libxslt.so ..\%__SRC%\lib\libexslt.so.0 %_DEST%\lib%_EXT%\libexslt.so.0 -..\%__SRC%\lib\libxslt*.lib %_DEST%\lib%_EXT% +symlink: %_DEST%\lib%_EXT%\libexslt.so.0 %_DEST%\lib%_EXT%\libexslt.so +..\%__SRC%\lib\libxslt*.* %_DEST%\lib%_EXT%\libxslt*.* ..\%__SRC%\lib\lib*.dll.a %_DEST%\lib%_EXT%\*.a ..\%__SRC%\bin\lib*.dll %_DEST%\bin%_EXT% ..\%__SRC%\bin\xsltproc* %_DEST%\bin%_EXT% |