diff --git a/templates/libtool-xbps-fixes.diff b/templates/libtool-xbps-fixes.diff deleted file mode 100644 index e2e114200c..0000000000 --- a/templates/libtool-xbps-fixes.diff +++ /dev/null @@ -1,118 +0,0 @@ ---- libltdl/config/ltmain.sh.orig 2008-09-07 19:56:33.000000000 +0200 -+++ libltdl/config/ltmain.sh 2008-10-16 04:51:14.000000000 +0200 -@@ -2018,8 +2018,8 @@ func_mode_install () - # At present, this check doesn't affect windows .dll's that - # are installed into $libdir/../bin (currently, that works fine) - # but it's something to keep an eye on. -- test "$inst_prefix_dir" = "$destdir" && \ -- func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir" -+ #test "$inst_prefix_dir" = "$destdir" && \ -+ # func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir" - - if test -n "$inst_prefix_dir"; then - # Stick the inst_prefix_dir data into the link command. -@@ -5115,7 +5115,7 @@ func_mode_link () - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" -- test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" -+ test "$linkmode" = lib && newdependency_libs="$newdependency_libs" - fi - continue - else # deplib is a libtool library -@@ -5141,7 +5141,7 @@ func_mode_link () - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" -- test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" -+ test "$linkmode" = lib && newdependency_libs="$newdependency_libs" - fi - continue - fi -@@ -5172,7 +5172,7 @@ func_mode_link () - lib) - deplibs="$deplib $deplibs" - test "$pass" = conv && continue -- newdependency_libs="$deplib $newdependency_libs" -+ newdependency_libs="$newdependency_libs" - func_stripname '-L' '' "$deplib" - newlib_search_path="$newlib_search_path $func_stripname_result" - ;; -@@ -5490,7 +5490,7 @@ func_mode_link () - else - # Need to hardcode shared library paths - # or/and link against static libraries -- newdependency_libs="$deplib $newdependency_libs" -+ newdependency_libs="$newdependency_libs" - fi - if $opt_duplicate_deps ; then - case "$tmp_libs " in -@@ -5717,7 +5717,7 @@ func_mode_link () - if test -n "$inst_prefix_dir"; then - case $libdir in - [\\/]*) -- add_dir="$add_dir -L$inst_prefix_dir$libdir" -+ add_dir="$add_dir -L$inst_prefix_dir" - ;; - esac - fi -@@ -5778,8 +5778,8 @@ func_mode_link () - add="-l$name" - elif test "$hardcode_automatic" = yes; then - if test -n "$inst_prefix_dir" && -- test -f "$inst_prefix_dir$libdir/$linklib" ; then -- add="$inst_prefix_dir$libdir/$linklib" -+ test -f "$inst_prefix_dir" ; then -+ add="$inst_prefix_dir" - else - add="$libdir/$linklib" - fi -@@ -5790,7 +5790,7 @@ func_mode_link () - if test -n "$inst_prefix_dir"; then - case $libdir in - [\\/]*) -- add_dir="$add_dir -L$inst_prefix_dir$libdir" -+ add_dir="$add_dir -L$inst_prefix_dir" - ;; - esac - fi -@@ -5881,7 +5881,7 @@ func_mode_link () - # ... and its dependency_libs - tmp_libs= - for deplib in $dependency_libs; do -- newdependency_libs="$deplib $newdependency_libs" -+ newdependency_libs="$newdependency_libs" - if $opt_duplicate_deps ; then - case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; -@@ -6449,7 +6449,7 @@ func_mode_link () - esac - done - if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then -- dependency_libs="$temp_xrpath $dependency_libs" -+ dependency_libs="$dependency_libs" - fi - fi - ---- libltdl/configure.orig 2008-10-16 04:52:43.000000000 +0200 -+++ libltdl/configure 2008-10-16 04:52:52.000000000 +0200 -@@ -10133,7 +10133,7 @@ rm -f core conftest.err conftest.$ac_obj - ;; - - netbsd*) -- version_type=sunos -+ version_type=linux - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then ---- configure.orig 2008-10-16 04:59:42.000000000 +0200 -+++ configure 2008-10-16 04:59:48.000000000 +0200 -@@ -16906,7 +16906,7 @@ rm -f core conftest.err conftest.$ac_obj - ;; - - netbsd*) -- version_type=sunos -+ version_type=linux - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then diff --git a/templates/libtool.tmpl b/templates/libtool.tmpl index ff8c7a15ee..f9b5d8df17 100644 --- a/templates/libtool.tmpl +++ b/templates/libtool.tmpl @@ -2,7 +2,6 @@ pkgname=libtool version=2.2.6a wrksrc="$pkgname-2.2.6" -patch_files="$pkgname-xbps-fixes.diff" distfiles="http://ftp.gnu.org/pub/gnu/libtool/$pkgname-$version@.tar.gz" build_style=gnu_configure short_desc="Generic library support"