[openwrt/openwrt] tools/libtool: add commit messages to patches

LEDE Commits lede-commits at lists.infradead.org
Mon Mar 13 14:59:13 PDT 2023


hauke pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/efe56a51bcd0b2c2db39c682e88fb166a2431727

commit efe56a51bcd0b2c2db39c682e88fb166a2431727
Author: Michael Pratt <mcpratt at pm.me>
AuthorDate: Thu Mar 9 09:35:13 2023 -0500

    tools/libtool: add commit messages to patches
    
    Add commit messages to patches as intended
    by the last bump to libtool which had to be reverted.
    
    This allows for a cleaner diff later,
    removing this clutter from the complex changes to patches
    that are required to bump to the latest libtool version.
    
    Ref: c377d874b ("libtool: bump to 2.4.6")
    Signed-off-by: Michael Pratt <mcpratt at pm.me>
---
 tools/libtool/patches/000-relocatable.patch           | 10 ++++++++++
 tools/libtool/patches/100-libdir-fixes.patch          | 19 +++++++++++++++++++
 .../110-dont-use-target-dir-for-relinking.patch       | 10 ++++++++++
 .../patches/120-strip-unsafe-dirs-for-relinking.patch | 13 +++++++++++++
 tools/libtool/patches/150-trailingslash.patch         |  7 +++++++
 tools/libtool/patches/200-openwrt-branding.patch      | 12 ++++++++++++
 6 files changed, 71 insertions(+)

diff --git a/tools/libtool/patches/000-relocatable.patch b/tools/libtool/patches/000-relocatable.patch
index a5fa040696..6ac293afbe 100644
--- a/tools/libtool/patches/000-relocatable.patch
+++ b/tools/libtool/patches/000-relocatable.patch
@@ -1,3 +1,13 @@
+From ca10caa502f971f90d8c041aa2476de54ef0ce2b Mon Sep 17 00:00:00 2001
+From: Eneas U de Queiroz <cotequeiroz at gmail.com>
+Date: Tue, 20 Jul 2021 16:41:11 -0300
+Subject: openwrt: make relocatable, search resources relative to STAGING_DIR
+
+This was originally commited to openwrt by Jo-Philipp Wich
+<jow at openwrt.org>.
+
+Signed-off-by: Eneas U de Queiroz <cotequeiroz at gmail.com>
+
 --- a/libltdl/config/general.m4sh
 +++ b/libltdl/config/general.m4sh
 @@ -45,15 +45,22 @@ progpath="$0"
diff --git a/tools/libtool/patches/100-libdir-fixes.patch b/tools/libtool/patches/100-libdir-fixes.patch
index 3df2b14b60..75ab583806 100644
--- a/tools/libtool/patches/100-libdir-fixes.patch
+++ b/tools/libtool/patches/100-libdir-fixes.patch
@@ -1,3 +1,22 @@
+From 67ffe8e8582a7ba1f1d1307a419098e6dd88bdaf Mon Sep 17 00:00:00 2001
+From: Eneas U de Queiroz <cotequeiroz at gmail.com>
+Date: Tue, 20 Jul 2021 16:41:11 -0300
+Subject: openwrt: cross-compilation path adjustments
+
+Comments from the patch:
+
+Adding 'libdir' from the .la file to our library search paths
+breaks crosscompilation horribly.  We cheat here and don't add
+it, instead adding the path where we found the .la.  -CL
+
+OE sets installed=no in staging. We need to look in $objdir and $absdir,
+preferring $objdir. RP 31/04/2008
+
+This was originally commited to openwrt by Jo-Philipp Wich
+<jow at openwrt.org>.
+
+Signed-off-by: Eneas U de Queiroz <cotequeiroz at gmail.com>
+
 --- a/libltdl/config/ltmain.m4sh
 +++ b/libltdl/config/ltmain.m4sh
 @@ -5731,8 +5731,14 @@ func_mode_link ()
diff --git a/tools/libtool/patches/110-dont-use-target-dir-for-relinking.patch b/tools/libtool/patches/110-dont-use-target-dir-for-relinking.patch
index bbfd125003..be25c29e87 100644
--- a/tools/libtool/patches/110-dont-use-target-dir-for-relinking.patch
+++ b/tools/libtool/patches/110-dont-use-target-dir-for-relinking.patch
@@ -1,3 +1,13 @@
+From 375833af93999f8b0a747c8a1dfa3ec8d347743d Mon Sep 17 00:00:00 2001
+From: Eneas U de Queiroz <cotequeiroz at 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 at openwrt.org>.
+
+Signed-off-by: Eneas U de Queiroz <cotequeiroz at gmail.com>
+
 --- a/libltdl/config/ltmain.m4sh
 +++ b/libltdl/config/ltmain.m4sh
 @@ -6120,7 +6120,6 @@ func_mode_link ()
diff --git a/tools/libtool/patches/120-strip-unsafe-dirs-for-relinking.patch b/tools/libtool/patches/120-strip-unsafe-dirs-for-relinking.patch
index d5729e68ac..575b5fd24b 100644
--- a/tools/libtool/patches/120-strip-unsafe-dirs-for-relinking.patch
+++ b/tools/libtool/patches/120-strip-unsafe-dirs-for-relinking.patch
@@ -1,3 +1,16 @@
+From 7f2b8a1ab4fa1475eeeddfb84eb5b92594bfce43 Mon Sep 17 00:00:00 2001
+From: Eneas U de Queiroz <cotequeiroz at 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 at openwrt.org>.
+
+Signed-off-by: Eneas U de Queiroz <cotequeiroz at gmail.com>
+
 --- a/libltdl/config/ltmain.m4sh
 +++ b/libltdl/config/ltmain.m4sh
 @@ -2186,6 +2186,9 @@ func_mode_install ()
diff --git a/tools/libtool/patches/150-trailingslash.patch b/tools/libtool/patches/150-trailingslash.patch
index 423911cf4b..833acbb38f 100644
--- a/tools/libtool/patches/150-trailingslash.patch
+++ b/tools/libtool/patches/150-trailingslash.patch
@@ -1,3 +1,8 @@
+From 1b45c3c0d6682be7f4876b620780ee246a5acbaa Mon Sep 17 00:00:00 2001
+From: Eneas U de Queiroz <cotequeiroz at gmail.com>
+Date: Tue, 20 Jul 2021 16:56:16 -0300
+Subject: openwrt: remove trailing slash in install destdir
+
 A command like /bin/sh ../../i586-poky-linux-libtool   --mode=install /usr/bin/install -c   gck-roots-store-standalone.la '/media/data1/builds/poky1/tmp/work/core2-poky-linux/gnome-keyring-2.26.1-r1/image/usr/lib/gnome-keyring/standalone/' fails (e.g. gnome-keyring or pulseaudio)
 
 This is because libdir has a trailing slash which breaks the comparision.
@@ -9,6 +14,8 @@ Merged a patch received from Gary Thomas <gary at mlbassoc.com>
 Date: 2010/07/12
 Nitin A Kamble <nitin.a.kamble at intel.com>
 
+Signed-off-by: Eneas U de Queiroz <cotequeiroz at gmail.com>
+
 --- a/libltdl/config/ltmain.m4sh
 +++ b/libltdl/config/ltmain.m4sh
 @@ -2167,8 +2167,15 @@ func_mode_install ()
diff --git a/tools/libtool/patches/200-openwrt-branding.patch b/tools/libtool/patches/200-openwrt-branding.patch
index 3fc0afb866..1c599b0201 100644
--- a/tools/libtool/patches/200-openwrt-branding.patch
+++ b/tools/libtool/patches/200-openwrt-branding.patch
@@ -1,3 +1,15 @@
+From 90707200efadc8e230635c7c204c9c272cbc8631 Mon Sep 17 00:00:00 2001
+From: Eneas U de Queiroz <cotequeiroz at 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 at openwrt.org>.
+
+Signed-off-by: Eneas U de Queiroz <cotequeiroz at gmail.com>
+
 --- a/libltdl/config/general.m4sh
 +++ b/libltdl/config/general.m4sh
 @@ -359,7 +359,7 @@ opt_warning=:




More information about the lede-commits mailing list