diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2007-12-27 02:11:03 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2007-12-27 02:11:03 +0000 |
| commit | 01dd5fc03aec5e2e0590b469bb17709dcb841861 (patch) | |
| tree | 5ed367409b643e52c8a3726d18289d76e8886c86 /package/libtool/patches/100-libdir_path.patch | |
| parent | 4fe3a3e727c5e85815f798d848129f7d4e10a7bb (diff) | |
| download | upstream-01dd5fc03aec5e2e0590b469bb17709dcb841861.tar.gz upstream-01dd5fc03aec5e2e0590b469bb17709dcb841861.tar.bz2 upstream-01dd5fc03aec5e2e0590b469bb17709dcb841861.zip | |
upgrade libtool, add fixes for libdir searching, fix up paths to .la files
SVN-Revision: 9941
Diffstat (limited to 'package/libtool/patches/100-libdir_path.patch')
| -rw-r--r-- | package/libtool/patches/100-libdir_path.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/package/libtool/patches/100-libdir_path.patch b/package/libtool/patches/100-libdir_path.patch new file mode 100644 index 0000000000..692d2f5536 --- /dev/null +++ b/package/libtool/patches/100-libdir_path.patch @@ -0,0 +1,34 @@ +Index: libtool-1.5.24/Makefile.in +=================================================================== +--- libtool-1.5.24.orig/Makefile.in 2007-06-24 04:20:36.000000000 +0200 ++++ libtool-1.5.24/Makefile.in 2007-12-26 04:39:04.171194995 +0100 +@@ -789,6 +789,7 @@ + -rm -f ltmain.shT + date=`$(SHELL) $(srcdir)/mkstamp < $(srcdir)/ChangeLog` && \ + sed -e 's/@''PACKAGE@/@PACKAGE@/' -e 's/@''VERSION@/@VERSION@/' \ ++ -e 's#@''GLOBAL_LIBDIR@#$(GLOBAL_LIBDIR)#' \ + -e "s%@""TIMESTAMP@%$$date%" $(srcdir)/ltmain.in > ltmain.shT + mv -f ltmain.shT $@ || \ + (rm -f $@ && cp ltmain.shT $@ && rm -f ltmain.shT) +Index: libtool-1.5.24/ltmain.in +=================================================================== +--- libtool-1.5.24.orig/ltmain.in 2007-12-26 04:39:09.151478801 +0100 ++++ libtool-1.5.24/ltmain.in 2007-12-26 04:43:31.962455550 +0100 +@@ -5675,7 +5675,7 @@ + $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 + exit $EXIT_FAILURE + fi +- newdependency_libs="$newdependency_libs $libdir/$name" ++ newdependency_libs="$newdependency_libs @GLOBAL_LIBDIR@/$name" + ;; + *) newdependency_libs="$newdependency_libs $deplib" ;; + esac +@@ -5700,7 +5700,7 @@ + $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 + exit $EXIT_FAILURE + fi +- newdlprefiles="$newdlprefiles $libdir/$name" ++ newdlprefiles="$newdlprefiles @GLOBAL_LIBDIR@/$name" + done + dlprefiles="$newdlprefiles" + else |