bf261073dc
Remove upstreamed patch and refresh others. Signed-off-by: Rosen Penev <rosenp@gmail.com> [rebased and refreshed patches again] Signed-off-by: Michael Pratt <mcpratt@pm.me>
33 lines
1.1 KiB
Diff
33 lines
1.1 KiB
Diff
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>.
|
|
|
|
Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
|
|
|
|
--- a/build-aux/ltmain.in
|
|
+++ b/build-aux/ltmain.in
|
|
@@ -6482,13 +6482,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
|
|
case :$finalize_shlibpath: in
|
|
*":$libdir:"*) ;;
|
|
*) func_append finalize_shlibpath "$libdir:" ;;
|