libtool: Revert "libtool: bump to 2.4.6"
This breaks the package builds using the SDK.
The targets all build fine, but the package builder fails on many
packages. The package builder uses the OpenWrt SDK.
This reverts commit c377d874be.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
@@ -1,33 +1,20 @@
|
||||
From 375833af93999f8b0a747c8a1dfa3ec8d347743d Mon Sep 17 00:00:00 2001
|
||||
From: Eneas U de Queiroz <cotequeiroz@gmail.com>
|
||||
Date: Tue, 20 Jul 2021 16:52:37 -0300
|
||||
Subject: openwrt: don't use target dir for relinking
|
||||
|
||||
This was originally commited to openwrt by Jo-Philipp Wich
|
||||
<jow@openwrt.org>.
|
||||
|
||||
(adjusted to v2.4.6)
|
||||
Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
|
||||
|
||||
--- a/build-aux/ltmain.in
|
||||
+++ b/build-aux/ltmain.in
|
||||
@@ -6434,13 +6434,13 @@ func_mode_link ()
|
||||
add_dir=
|
||||
add=
|
||||
# Finalize command for both is simple: just hardcode it.
|
||||
- if test yes = "$hardcode_direct" &&
|
||||
- test no = "$hardcode_direct_absolute"; then
|
||||
- add=$libdir/$linklib
|
||||
- elif test yes = "$hardcode_minus_L"; then
|
||||
+ if test "$hardcode_direct" = yes &&
|
||||
+ test "$hardcode_direct_absolute" = no; then
|
||||
+ add="$libdir/$linklib"
|
||||
+ elif test "$hardcode_minus_L" = yes; then
|
||||
add_dir=-L$libdir
|
||||
- add=-l$name
|
||||
- elif test yes = "$hardcode_shlibpath_var"; then
|
||||
+ add="-l$name"
|
||||
+ elif test "$hardcode_shlibpath_var" = yes; then
|
||||
--- a/libltdl/config/ltmain.m4sh
|
||||
+++ b/libltdl/config/ltmain.m4sh
|
||||
@@ -6120,7 +6120,6 @@ func_mode_link ()
|
||||
test "$hardcode_direct_absolute" = no; then
|
||||
add="$libdir/$linklib"
|
||||
elif test "$hardcode_minus_L" = yes; then
|
||||
- add_dir="-L$libdir"
|
||||
add="-l$name"
|
||||
elif test "$hardcode_shlibpath_var" = yes; then
|
||||
case :$finalize_shlibpath: in
|
||||
--- a/libltdl/config/ltmain.sh
|
||||
+++ b/libltdl/config/ltmain.sh
|
||||
@@ -6907,7 +6907,6 @@ func_mode_link ()
|
||||
test "$hardcode_direct_absolute" = no; then
|
||||
add="$libdir/$linklib"
|
||||
elif test "$hardcode_minus_L" = yes; then
|
||||
- add_dir="-L$libdir"
|
||||
add="-l$name"
|
||||
elif test "$hardcode_shlibpath_var" = yes; then
|
||||
case :$finalize_shlibpath: in
|
||||
*":$libdir:"*) ;;
|
||||
*) func_append finalize_shlibpath "$libdir:" ;;
|
||||
|
||||
Reference in New Issue
Block a user