diff options
| -rw-r--r-- | package/libtool/patches/001-force_dlopen_deplibs.patch | 7 | ||||
| -rw-r--r-- | package/libtool/patches/100-libdir_path.patch | 26 | ||||
| -rw-r--r-- | package/libtool/patches/110-no_rpath.patch | 8 | ||||
| -rw-r--r-- | package/libtool/patches/120-libdir_search.patch | 8 |
4 files changed, 20 insertions, 29 deletions
diff --git a/package/libtool/patches/001-force_dlopen_deplibs.patch b/package/libtool/patches/001-force_dlopen_deplibs.patch index dfcf56b320..a95e5bea98 100644 --- a/package/libtool/patches/001-force_dlopen_deplibs.patch +++ b/package/libtool/patches/001-force_dlopen_deplibs.patch @@ -1,7 +1,6 @@ -diff -urN libtool-1.5.14/libltdl/acinclude.m4 libtool-1.5.14.new/libltdl/acinclude.m4 ---- libtool-1.5.14/libltdl/acinclude.m4 2005-02-12 13:20:02.000000000 +0100 -+++ libtool-1.5.14.new/libltdl/acinclude.m4 2006-04-17 23:00:24.000000000 +0200 -@@ -6228,10 +6228,8 @@ +--- a/libltdl/acinclude.m4 ++++ b/libltdl/acinclude.m4 +@@ -6771,10 +6771,8 @@ AC_CACHE_CHECK([whether deplibs are load ;; esac ]) diff --git a/package/libtool/patches/100-libdir_path.patch b/package/libtool/patches/100-libdir_path.patch index 8ce01e71aa..08c4c6806a 100644 --- a/package/libtool/patches/100-libdir_path.patch +++ b/package/libtool/patches/100-libdir_path.patch @@ -1,8 +1,6 @@ -Index: libtool-1.5.24/Makefile.in -=================================================================== ---- libtool-1.5.24.orig/Makefile.in 2007-12-28 17:45:43.195523115 +0100 -+++ libtool-1.5.24/Makefile.in 2007-12-28 17:45:58.032368617 +0100 -@@ -789,6 +789,7 @@ +--- 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@/' \ @@ -10,11 +8,9 @@ Index: libtool-1.5.24/Makefile.in -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-28 17:45:43.203523567 +0100 -+++ libtool-1.5.24/ltmain.in 2007-12-28 17:45:58.036368842 +0100 -@@ -5669,7 +5669,7 @@ +--- a/ltmain.in ++++ b/ltmain.in +@@ -5669,7 +5669,7 @@ fi\ $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 exit $EXIT_FAILURE fi @@ -23,7 +19,7 @@ Index: libtool-1.5.24/ltmain.in ;; *) newdependency_libs="$newdependency_libs $deplib" ;; esac -@@ -5694,7 +5694,7 @@ +@@ -5694,7 +5694,7 @@ fi\ $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 exit $EXIT_FAILURE fi @@ -32,11 +28,9 @@ Index: libtool-1.5.24/ltmain.in done dlprefiles="$newdlprefiles" else -Index: libtool-1.5.24/Makefile.am -=================================================================== ---- libtool-1.5.24.orig/Makefile.am 2007-12-28 17:46:04.428733124 +0100 -+++ libtool-1.5.24/Makefile.am 2007-12-28 17:46:38.494674431 +0100 -@@ -67,6 +67,7 @@ +--- 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@/' \ diff --git a/package/libtool/patches/110-no_rpath.patch b/package/libtool/patches/110-no_rpath.patch index 7c92524b3b..685da9d6d0 100644 --- a/package/libtool/patches/110-no_rpath.patch +++ b/package/libtool/patches/110-no_rpath.patch @@ -6,11 +6,9 @@ Only should be necessary.... -Index: libtool-1.5.10/libtool.m4 -=================================================================== ---- libtool-1.5.10.orig/libtool.m4 2007-05-27 23:31:51.000000000 +0200 -+++ libtool-1.5.10/libtool.m4 2007-05-27 23:50:26.000000000 +0200 -@@ -4244,16 +4244,16 @@ +--- a/libtool.m4 ++++ b/libtool.m4 +@@ -4601,16 +4601,16 @@ shlibpath_overrides_runpath=$shlibpath_o hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1) # Whether we should hardcode library paths into libraries. diff --git a/package/libtool/patches/120-libdir_search.patch b/package/libtool/patches/120-libdir_search.patch index ba2ab835ea..91ece84f4b 100644 --- a/package/libtool/patches/120-libdir_search.patch +++ b/package/libtool/patches/120-libdir_search.patch @@ -1,6 +1,6 @@ ---- libtool-1.5.6/ltmain.in~libdir-la 2004-04-01 21:46:15.000000000 -0600 -+++ libtool-1.5.6/ltmain.in 2004-05-14 22:53:51.000000000 -0500 -@@ -2147,8 +2147,14 @@ +--- a/ltmain.in ++++ b/ltmain.in +@@ -2444,8 +2444,14 @@ EOF absdir="$abs_ladir" libdir="$abs_ladir" else @@ -15,5 +15,5 @@ + #dir="$libdir" + #absdir="$libdir" fi + test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes else - dir="$ladir/$objdir" |