X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/c8b1ee477f04a2c2ce175b32682a415d9ce69425..5986668ca9d41f7b6aee1c9890345853e157aa6b:/package/libtool/patches/100-libdir_path.patch

diff --git a/package/libtool/patches/100-libdir_path.patch b/package/libtool/patches/100-libdir_path.patch
index 692d2f553..1132c3816 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-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 @@
+--- 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,18 @@ 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-26 04:39:09.151478801 +0100
-+++ libtool-1.5.24/ltmain.in	2007-12-26 04:43:31.962455550 +0100
-@@ -5675,7 +5675,7 @@
+--- 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
@@ -23,7 +28,7 @@ Index: libtool-1.5.24/ltmain.in
  		;;
  	      *) newdependency_libs="$newdependency_libs $deplib" ;;
  	      esac
-@@ -5700,7 +5700,7 @@
+@@ -5694,7 +5694,7 @@ fi\
  		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
  		exit $EXIT_FAILURE
  	      fi
@@ -32,3 +37,13 @@ Index: libtool-1.5.24/ltmain.in
  	    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)