projects
/
openwrt
/
svn-archive
/
archive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2b96b9b
)
libtool: refresh patches
author
Hauke Mehrtens
<hauke@hauke-m.de>
Sat, 21 Feb 2009 15:32:34 +0000
(15:32 +0000)
committer
Hauke Mehrtens
<hauke@hauke-m.de>
Sat, 21 Feb 2009 15:32:34 +0000
(15:32 +0000)
SVN-Revision: 14592
package/libtool/patches/001-force_dlopen_deplibs.patch
patch
|
blob
|
history
package/libtool/patches/100-libdir_path.patch
patch
|
blob
|
history
package/libtool/patches/110-no_rpath.patch
patch
|
blob
|
history
package/libtool/patches/120-libdir_search.patch
patch
|
blob
|
history
diff --git
a/package/libtool/patches/001-force_dlopen_deplibs.patch
b/package/libtool/patches/001-force_dlopen_deplibs.patch
index dfcf56b32035eb6f53119de8bf3ca06c21e37e84..a95e5bea98bbe65cf93be0df1e7dd8e5a64fe97a 100644
(file)
--- 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
])
;;
esac
])
diff --git
a/package/libtool/patches/100-libdir_path.patch
b/package/libtool/patches/100-libdir_path.patch
index 8ce01e71aa25c322f992b8ed204a0340e52d3be1..08c4c6806a30c0b2bded46dc6a1907faf327fdb6 100644
(file)
--- 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@/' \
-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)
-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
$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
;;
*) 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
$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
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@/' \
-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 7c92524b3b95bb92160e908ed51a8abec24913b2..685da9d6d01e2613dda650ad7cb65ff274df08f7 100644
(file)
--- a/
package/libtool/patches/110-no_rpath.patch
+++ b/
package/libtool/patches/110-no_rpath.patch
@@
-6,11
+6,9
@@
Only
should be necessary....
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.
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 ba2ab835eaffbf7726fa13a1204c4e0023804601..91ece84f4b4efac8b28f4bbadb012d2c57b2d650 100644
(file)
--- 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
-@@ -2
147,8 +2147,14 @@
+---
a/ltmain.in
++++
b/ltmain.in
+@@ -2
444,8 +2444,14 @@ EOF
absdir="$abs_ladir"
libdir="$abs_ladir"
else
absdir="$abs_ladir"
libdir="$abs_ladir"
else
@@
-15,5
+15,5
@@
+ #dir="$libdir"
+ #absdir="$libdir"
fi
+ #dir="$libdir"
+ #absdir="$libdir"
fi
+ test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
else
else
- dir="$ladir/$objdir"