X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=package%2Flibtool%2Fpatches%2F100-libdir_path.patch;fp=package%2Flibtool%2Fpatches%2F100-libdir_path.patch;h=0000000000000000000000000000000000000000;hp=1132c38169540efd59f8c61198b1ffb945f6431c;hb=78d6b30185d9200e25a7ce5826e206b6ec206c43;hpb=2b7035f9bb2aa2a82f7e5e07ae7d989c25cbee70

diff --git a/package/libtool/patches/100-libdir_path.patch b/package/libtool/patches/100-libdir_path.patch
deleted file mode 100644
index 1132c38169..0000000000
--- 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)