update libtooling and config.guess for aix 7

2 files changed, 92 insertions, 2 deletions

diff --git a/libtextcat/libtextcat-aix.patch b/libtextcat/libtextcat-aix.patch
new file mode 100644
index 000000000000..26fb48c955f7
--- /dev/null
+++ b/libtextcat/libtextcat-aix.patch
@@ -0,0 +1,86 @@
+--- misc/libtextcat-2.2/config.guess	2010-09-10 03:09:48.000000000 -0500
++++ misc/build/libtextcat-2.2/config.guess	2010-09-10 03:20:55.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:*:*)
+--- misc/libtextcat-2.2/configure	2010-09-10 03:45:41.000000000 -0500
++++ misc/build/libtextcat-2.2/configure	2010-09-10 03:48:35.000000000 -0500
+@@ -3371,7 +3371,7 @@
+ # whether `pass_all' will *always* work, you probably want this one.
+ 
+ case $host_os in
+-aix4* | aix5*)
++aix[4-9]*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+@@ -4944,7 +4944,7 @@
+   else
+     # PORTME Check for PIC flags for the system compiler.
+     case $host_os in
+-    aix3* | aix4* | aix5*)
++    aix*)
+       lt_cv_prog_cc_wl='-Wl,'
+       # All AIX code is PIC.
+       if test "$host_cpu" = ia64; then
+@@ -5448,7 +5448,7 @@
+ 
+   # See if GNU ld supports shared libraries.
+   case $host_os in
+-  aix3* | aix4* | aix5*)
++  aix[3-9]*)
+     # On AIX, the GNU linker is very broken
+     # Note:Check GNU linker on AIX 5-IA64 when/if it becomes available.
+     ld_shlibs=no
+@@ -5650,7 +5650,7 @@
+     fi
+     ;;
+ 
+-  aix4* | aix5*)
++  aix[4-9]*)
+     if test "$host_cpu" = ia64; then
+       # On IA64, the linker does run time linking by default, so we don't
+       # have to do anything special.
+@@ -5663,7 +5663,7 @@
+       # Test if we are trying to use run time linking or normal
+       # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+       # need to do runtime linking.
+-      case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++      case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+ 	for ld_flag in $LDFLAGS; do
+ 	  case $ld_flag in
+ 	  *-brtl*)
+@@ -6157,7 +6157,7 @@
+   soname_spec='${libname}${release}.so$major'
+   ;;
+ 
+-aix4* | aix5*)
++aix[4-9]*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -6563,7 +6563,7 @@
+   fi
+   ;;
+ 
+-aix4*)
++aix[4-9]*)
+   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+     test "$enable_shared" = yes && enable_static=no
+   fi
diff --git a/libtextcat/makefile.mk b/libtextcat/makefile.mk
index 661a49cc6e5f..526c23c1f6f9 100644
--- a/libtextcat/makefile.mk
+++ b/libtextcat/makefile.mk
@@ -46,8 +46,9 @@ TARFILE_NAME=libtextcat-2.2
 TARFILE_MD5=128cfc86ed5953e57fe0f5ae98b62c2e
 TARFILE_ROOTDIR=libtextcat-2.2
 
-PATCH_FILES=libtextcat-2.2.patch
-
+PATCH_FILES=\
+    libtextcat-2.2.patch \
+    libtextcat-aix.patch
 
 ADDITIONAL_FILES= \
                 src$/utf8misc.h \
@@ -62,6 +63,9 @@ ADDITIONAL_FILES= \
 #relative to CONFIGURE_DIR
 CONFIGURE_ACTION=configure CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)"
 CONFIGURE_FLAGS=$(eq,$(OS),MACOSX CPPFLAGS="$(EXTRA_CDEFS)" $(NULL))
+.IF "$(OS)"=="AIX"
+CONFIGURE_FLAGS+= CFLAGS=-D_LINUX_SOURCE_COMPAT
+.ENDIF
 
 BUILD_ACTION=make