mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2025-10-30 13:34:27 -04:00
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>
26 lines
997 B
Diff
26 lines
997 B
Diff
From 7f2b8a1ab4fa1475eeeddfb84eb5b92594bfce43 Mon Sep 17 00:00:00 2001
|
|
From: Eneas U de Queiroz <cotequeiroz@gmail.com>
|
|
Date: Tue, 20 Jul 2021 16:54:12 -0300
|
|
Subject: openwrt: strip unsave directories from relink command
|
|
|
|
strip unsave directories from relink command, nuke every -L that looks
|
|
like /usr/lib or /lib
|
|
|
|
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
|
|
@@ -2400,6 +2400,9 @@ func_mode_install ()
|
|
relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
|
|
fi
|
|
|
|
+ relink_command=`$ECHO "$relink_command" | $SED "s%-L[[:space:]]*/lib[^[:space:]]*%%"`
|
|
+ relink_command=`$ECHO "$relink_command" | $SED "s%-L[[:space:]]*/usr/lib[^[:space:]]*%%"`
|
|
+
|
|
func_warning "relinking '$file'"
|
|
func_show_eval "$relink_command" \
|
|
'func_fatal_error "error: relink '\''$file'\'' with the above command before installing it"'
|