diff options
| author | Jay Freeman <saurik@saurik.com> | 2008-01-22 14:27:46 +0000 |
|---|---|---|
| committer | Jay Freeman <saurik@saurik.com> | 2008-01-22 14:27:46 +0000 |
| commit | 6765ad3caffc16ded5ab89ac8317993f28ac64d4 (patch) | |
| tree | 7c94597ec329ff56b8ede13e6f40d906361e5cfa /util | |
| parent | 5a54c9a1c64f5524e0bb1e9b9dc7764c0d674e49 (diff) | |
Further hacked libtool in order to support sysroot compilation.
git-svn-id: http://svn.telesphoreo.org/trunk@28 514c082c-b64e-11dc-b46d-3d985efe055d
Diffstat (limited to 'util')
| -rw-r--r-- | util/libtool.diff | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/util/libtool.diff b/util/libtool.diff index 634e5b456..a3b4513ee 100644 --- a/util/libtool.diff +++ b/util/libtool.diff @@ -1,7 +1,15 @@ -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" else @@ -10,7 +18,7 @@ diff -ru libX11-1.1.3/ltmain.sh libX11-1.1.3+iPhone/ltmain.sh if test -z "$libdir"; then $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) name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'` |