diff options
| author | mirko <mirko@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-12-03 11:56:47 +0000 |
|---|---|---|
| committer | mirko <mirko@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-12-03 11:56:47 +0000 |
| commit | 283e9033a520bb575fdeefec939662ca7694cf55 (patch) | |
| tree | b766587d08c62e656c1a9926cb27355a633a9689 /package/libtool/patches/100-libdir_path.patch | |
| parent | 56f5e0b05ac304bca69ecdf07760f0e3579b039c (diff) | |
update libtool from version 1.5.26 to version 2.4, this includes libltdl (to v7) - WARNING: This switch is going to break something quite likely, however since more software is requiring libtool2/libltdl7 this change needs to be done some day anyway
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24224 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/libtool/patches/100-libdir_path.patch')
| -rw-r--r-- | package/libtool/patches/100-libdir_path.patch | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/package/libtool/patches/100-libdir_path.patch b/package/libtool/patches/100-libdir_path.patch deleted file mode 100644 index 1132c3816..000000000 --- a/package/libtool/patches/100-libdir_path.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- a/Makefile.in -+++ b/Makefile.in -@@ -789,6 +789,7 @@ $(srcdir)/ltmain.sh: $(srcdir)/ltmain.in - -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) ---- a/ltmain.in -+++ b/ltmain.in -@@ -2827,7 +2827,7 @@ EOF - fi - else - # We cannot seem to hardcode it, guess we'll fake it. -- add_dir="-L$libdir" -+ add_dir="-L@GLOBAL_LIBDIR@" - # Try looking first in the location we're being installed to. - if test -n "$inst_prefix_dir"; then - case $libdir in -@@ -5669,7 +5669,7 @@ fi\ - $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 -@@ -5694,7 +5694,7 @@ fi\ - $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 ---- a/Makefile.am -+++ b/Makefile.am -@@ -67,6 +67,7 @@ $(srcdir)/ltmain.sh: $(srcdir)/ltmain.in - -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) |