Changeset 28 for trunk/util

Timestamp:

01/22/08 14:27:46 (1 year ago)

Author:

saurik

Message:

Further hacked libtool in order to support sysroot compilation.

Files:

• trunk/util/libtool.diff (modified) (2 diffs)

trunk/util/libtool.diff

@@ -1 @@
-diff -ru libX11-1.1.3/ltmain.sh libX11-1.1.3+iPhone/ltmain.sh
---- libX11-1.1.3/ltmain.sh      2007-07-06 08:20:15.000000000 +0000
-+++ libX11-1.1.3+iPhone/ltmain.sh       2008-01-04 09:47:45.000000000 +0000
-@@ -2929,7 +2929,7 @@
+--- ltmain.sh.orig      2006-03-11 18:49:04.000000000 +0000
++++ ltmain.sh   2008-01-14 04:23:08.000000000 +0000
+@@ -2213,7 +2213,7 @@
+          deplibs="$deplib $deplibs"
+          continue
+          ;;
+-       *.la) lib="$deplib" ;;
++       *.la) if [[ ${deplib:0:1} == '/' ]]; then lib="$PKG_ROOT$deplib"; else lib="$deplib"; fi ;;
+        *.$libext)
+          if test "$pass" = conv; then
+            deplibs="$deplib $deplibs"
+@@ -2890,7 +2890,7 @@
                 if grep "^installed=no" $deplib > /dev/null; then
                   path="$absdir/$objdir"
@@ -11 +19 @@
                     $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
                     exit $EXIT_FAILURE
-@@ -5664,7 +5664,7 @@
+@@ -5609,7 +5609,7 @@
               case $deplib in
               *.la)