mirror of
https://github.com/openwrt/openwrt.git
synced 2025-03-11 15:04:26 +00:00
0d0cfe9f2d
This updates libtool to its current release, from 2015. Current patches
were renumbered and given a description text. The fix in
160-passthrough-ssp.patch is no longer needed.
A patch to speed up build was cherry-picked, and another openwrt
specific patch was needed to not use quotes in $(SHELL), to acommodate
our "SHELL=/usr/bin/env bash" usage.
The already present call to ./bootstrap ensures that generated files are
refreshed, so the patches are applied only to their sources. Also, that
bootstrap call was adjusted to run at the appropriate time when QUILT=1.
References below are relevant commits to upstream libtool
regarding some of the changes to patches.
This commit is being reapplied after previous revertion, and after some editing.
The fix for the issue that prompted reverting is the parent of this commit.
Ref: 435cb8d71 ("libtoolize: simplify runtime by substituting pkgauxdir")
Ref: 3cf11cfe2 ("libtoolize: rewritten over funclib.sh instead of general.m4sh")
Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
[refactored to simplify patch changes, expanded patches, added upstream references]
Signed-off-by: Michael Pratt <mcpratt@pm.me>
35 lines
977 B
Diff
35 lines
977 B
Diff
From 90707200efadc8e230635c7c204c9c272cbc8631 Mon Sep 17 00:00:00 2001
|
|
From: Eneas U de Queiroz <cotequeiroz@gmail.com>
|
|
Date: Tue, 20 Jul 2021 17:01:03 -0300
|
|
Subject: openwrt: add openwrt branding
|
|
|
|
This prepends program name with "OpenWrt-".
|
|
|
|
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
|
|
@@ -82,7 +82,7 @@ func_echo ()
|
|
IFS=$nl
|
|
for _G_line in $_G_message; do
|
|
IFS=$func_echo_IFS
|
|
- $ECHO "$progname${opt_mode+: $opt_mode}: $_G_line"
|
|
+ $ECHO "OpenWrt-$progname${opt_mode+: $opt_mode}: $_G_line"
|
|
done
|
|
IFS=$func_echo_IFS
|
|
}
|
|
--- a/build-aux/funclib.sh
|
|
+++ b/build-aux/funclib.sh
|
|
@@ -656,7 +656,7 @@ func_echo ()
|
|
IFS=$nl
|
|
for _G_line in $_G_message; do
|
|
IFS=$func_echo_IFS
|
|
- $ECHO "$progname: $_G_line"
|
|
+ $ECHO "OpenWrt-$progname: $_G_line"
|
|
done
|
|
IFS=$func_echo_IFS
|
|
}
|