qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-18 09:54:05 +02:00
Code

libtool: refresh patches

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14592 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
hauke 2009-02-21 15:32:34 +00:00
parent 06e82a970e
commit d75c935a76
4 changed files with 20 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
package/libtool/patches/001-force_dlopen_deplibs.patch
View File

@ -1,7 +1,6 @@
diff -urN libtool-1.5.14/libltdl/acinclude.m4 libtool-1.5.14.new/libltdl/acinclude.m4 --- a/libltdl/acinclude.m4
--- libtool-1.5.14/libltdl/acinclude.m4 2005-02-12 13:20:02.000000000 +0100 +++ b/libltdl/acinclude.m4
+++ libtool-1.5.14.new/libltdl/acinclude.m4 2006-04-17 23:00:24.000000000 +0200 @@ -6771,10 +6771,8 @@ AC_CACHE_CHECK([whether deplibs are load
@@ -6228,10 +6228,8 @@
;; ;;
esac esac
]) ])

26
package/libtool/patches/100-libdir_path.patch
View File

@ -1,8 +1,6 @@
Index: libtool-1.5.24/Makefile.in --- a/Makefile.in
=================================================================== +++ b/Makefile.in
--- libtool-1.5.24.orig/Makefile.in 2007-12-28 17:45:43.195523115 +0100 @@ -789,6 +789,7 @@ $(srcdir)/ltmain.sh: $(srcdir)/ltmain.in
+++ libtool-1.5.24/Makefile.in 2007-12-28 17:45:58.032368617 +0100
@@ -789,6 +789,7 @@
-rm -f ltmain.shT -rm -f ltmain.shT
date=`$(SHELL) $(srcdir)/mkstamp < $(srcdir)/ChangeLog` && \ date=`$(SHELL) $(srcdir)/mkstamp < $(srcdir)/ChangeLog` && \
sed -e 's/@''PACKAGE@/@PACKAGE@/' -e 's/@''VERSION@/@VERSION@/' \ 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 -e "s%@""TIMESTAMP@%$$date%" $(srcdir)/ltmain.in > ltmain.shT
mv -f ltmain.shT $@ || \ mv -f ltmain.shT $@ || \
(rm -f $@ && cp ltmain.shT $@ && rm -f ltmain.shT) (rm -f $@ && cp ltmain.shT $@ && rm -f ltmain.shT)
Index: libtool-1.5.24/ltmain.in --- a/ltmain.in
=================================================================== +++ b/ltmain.in
--- libtool-1.5.24.orig/ltmain.in 2007-12-28 17:45:43.203523567 +0100 @@ -5669,7 +5669,7 @@ fi\
+++ libtool-1.5.24/ltmain.in 2007-12-28 17:45:58.036368842 +0100
@@ -5669,7 +5669,7 @@
$echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
exit $EXIT_FAILURE exit $EXIT_FAILURE
fi fi
@ -23,7 +19,7 @@ Index: libtool-1.5.24/ltmain.in
;; ;;
*) newdependency_libs="$newdependency_libs $deplib" ;; *) newdependency_libs="$newdependency_libs $deplib" ;;
esac esac
@@ -5694,7 +5694,7 @@ @@ -5694,7 +5694,7 @@ fi\
$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
exit $EXIT_FAILURE exit $EXIT_FAILURE
fi fi
@ -32,11 +28,9 @@ Index: libtool-1.5.24/ltmain.in
done done
dlprefiles="$newdlprefiles" dlprefiles="$newdlprefiles"
else else
Index: libtool-1.5.24/Makefile.am --- a/Makefile.am
=================================================================== +++ b/Makefile.am
--- libtool-1.5.24.orig/Makefile.am 2007-12-28 17:46:04.428733124 +0100 @@ -67,6 +67,7 @@ $(srcdir)/ltmain.sh: $(srcdir)/ltmain.in
+++ libtool-1.5.24/Makefile.am 2007-12-28 17:46:38.494674431 +0100
@@ -67,6 +67,7 @@
-rm -f ltmain.shT -rm -f ltmain.shT
date=`$(SHELL) $(srcdir)/mkstamp < $(srcdir)/ChangeLog` && \ date=`$(SHELL) $(srcdir)/mkstamp < $(srcdir)/ChangeLog` && \
sed -e 's/@''PACKAGE@/@PACKAGE@/' -e 's/@''VERSION@/@VERSION@/' \ sed -e 's/@''PACKAGE@/@PACKAGE@/' -e 's/@''VERSION@/@VERSION@/' \

8
package/libtool/patches/110-no_rpath.patch
View File

@ -6,11 +6,9 @@ Only
should be necessary.... should be necessary....
Index: libtool-1.5.10/libtool.m4 --- a/libtool.m4
=================================================================== +++ b/libtool.m4
--- libtool-1.5.10.orig/libtool.m4 2007-05-27 23:31:51.000000000 +0200 @@ -4601,16 +4601,16 @@ shlibpath_overrides_runpath=$shlibpath_o
+++ libtool-1.5.10/libtool.m4 2007-05-27 23:50:26.000000000 +0200
@@ -4244,16 +4244,16 @@
hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1) hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
# Whether we should hardcode library paths into libraries. # Whether we should hardcode library paths into libraries.

8
package/libtool/patches/120-libdir_search.patch
View File

@ -1,6 +1,6 @@
--- libtool-1.5.6/ltmain.in~libdir-la 2004-04-01 21:46:15.000000000 -0600 --- a/ltmain.in
+++ libtool-1.5.6/ltmain.in 2004-05-14 22:53:51.000000000 -0500 +++ b/ltmain.in
@@ -2147,8 +2147,14 @@ @@ -2444,8 +2444,14 @@ EOF
absdir="$abs_ladir" absdir="$abs_ladir"
libdir="$abs_ladir" libdir="$abs_ladir"
else else
@ -15,5 +15,5 @@
+ #dir="$libdir" + #dir="$libdir"
+ #absdir="$libdir" + #absdir="$libdir"
fi fi
test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
else else
dir="$ladir/$objdir"