[PATCH] 06_all_jpeg-libtool.patch

3 files changed, 24 insertions, 4 deletions

diff --git a/configure b/configure
index 1443fb5..34b9401 100755
--- a/configure
+++ b/configure
@@ -1529,7 +1529,8 @@ fi
 
 if test "x$LTSHARED" != xno  -o  "x$LTSTATIC" != xno; then
   USELIBTOOL="yes"
-  LIBTOOL="./libtool"
+  LIBTOOL="./libtool-wrap"
+  chmod a+rx libtool-wrap
   O="lo"
   A="la"
   LN='$(LIBTOOL) --mode=link $(CC)'
@@ -1559,7 +1560,7 @@ if test $USELIBTOOL = yes; then
   if test "x$LTSTATIC" = xno; then
     disable_static="--disable-static"
   fi
-  $srcdir/ltconfig $disable_shared $disable_static $srcdir/ltmain.sh
+  $srcdir/ltconfig $disable_shared $disable_static $srcdir/ltmain.sh $CHOST
 fi
 
 # Select memory manager depending on user input.
diff --git a/libtool-wrap b/libtool-wrap
new file mode 100644
index 0000000..adee2f9
--- /dev/null
+++ b/libtool-wrap
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+export PATH=${PATH}:/usr/bin
+
+doit=
+for x in glibtool libtool ; do
+	if type -p ${x} > /dev/null ; then
+		doit=${x}
+		break
+	fi
+done
+
+if [ -z "${doit}" ] ; then
+	echo "Unable to locate libtool :("
+	exit 1
+fi
+
+exec ${doit} "$@"
diff --git a/ltconfig b/ltconfig
index 2347e69..a06dba0 100755
--- a/ltconfig
+++ b/ltconfig
@@ -552,7 +552,9 @@ if test -n "$pic_flag"; then
     # On HP-UX, both CC and GCC only warn that PIC is supported... then they
     # create non-PIC objects.  So, if there were any warnings, we assume that
     # PIC is not supported.
-    if test -s conftest.err; then
+    # Make sure we only test warnings on HP-UX (pic_flag == +Z) or we can
+    # easily break Linux builds http://bugs.gentoo.org/70947
+    if test -s conftest.err -a "$pic_flag" = "+Z"; then
       echo "$ac_t"no 1>&6
       can_build_shared=no
       pic_flag=
@@ -1173,7 +1175,6 @@ linux-gnu*)
   else
     # Only the GNU ld.so supports shared libraries on MkLinux.
     case "$host_cpu" in
-    powerpc*) dynamic_linker=no ;;
     *) dynamic_linker='Linux ld.so' ;;
     esac
   fi