From 22889b13f330e4753c5f72440abcfe42830f2f64 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 27 Oct 2023 22:04:23 -0700 Subject: network-manager-applet,networkmanager-openvpn, networkmanager: Apply linker versioning patch when using lld only This patch caused GNU linker to fail linking, therefore limit it to just lld. Signed-off-by: Khem Raj --- ...inker-script-Do-not-export-_IO_stdin_used.patch | 30 ---------------------- ...nker-scripts-Do-not-export-_IO_stdin_used.patch | 30 ++++++++++++++++++++++ .../network-manager-applet_1.32.0.bb | 2 +- ...inker-script-Do-not-export-_IO_stdin_used.patch | 30 ---------------------- ...nker-scripts-Do-not-export-_IO_stdin_used.patch | 30 ++++++++++++++++++++++ .../networkmanager-openvpn_1.10.2.bb | 2 +- .../networkmanager/networkmanager_1.44.0.bb | 2 +- 7 files changed, 63 insertions(+), 63 deletions(-) delete mode 100644 meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet/0001-linker-script-Do-not-export-_IO_stdin_used.patch create mode 100644 meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet/0001-linker-scripts-Do-not-export-_IO_stdin_used.patch delete mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn/0001-linker-script-Do-not-export-_IO_stdin_used.patch create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn/0001-linker-scripts-Do-not-export-_IO_stdin_used.patch diff --git a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet/0001-linker-script-Do-not-export-_IO_stdin_used.patch b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet/0001-linker-script-Do-not-export-_IO_stdin_used.patch deleted file mode 100644 index eafd497ae2..0000000000 --- a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet/0001-linker-script-Do-not-export-_IO_stdin_used.patch +++ /dev/null @@ -1,30 +0,0 @@ -From e09ba80e342b3b24bb2a46e11dae1c30cc61c75c Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 3 Sep 2023 08:48:42 -0700 -Subject: [PATCH] linker-script: Do not export _IO_stdin_used - -This is glibc specific toolhain issue, it should have been handled in -toolchain instead of exposing to applications. This was done to fix - -https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=835550 - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - linker-script-binary.ver | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/linker-script-binary.ver b/linker-script-binary.ver -index a2780c0..f030d35 100644 ---- a/linker-script-binary.ver -+++ b/linker-script-binary.ver -@@ -1,6 +1,5 @@ - { - global: -- _IO_stdin_used; - local: - *; - }; --- -2.42.0 - diff --git a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet/0001-linker-scripts-Do-not-export-_IO_stdin_used.patch b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet/0001-linker-scripts-Do-not-export-_IO_stdin_used.patch new file mode 100644 index 0000000000..eafd497ae2 --- /dev/null +++ b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet/0001-linker-scripts-Do-not-export-_IO_stdin_used.patch @@ -0,0 +1,30 @@ +From e09ba80e342b3b24bb2a46e11dae1c30cc61c75c Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 3 Sep 2023 08:48:42 -0700 +Subject: [PATCH] linker-script: Do not export _IO_stdin_used + +This is glibc specific toolhain issue, it should have been handled in +toolchain instead of exposing to applications. This was done to fix + +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=835550 + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + linker-script-binary.ver | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/linker-script-binary.ver b/linker-script-binary.ver +index a2780c0..f030d35 100644 +--- a/linker-script-binary.ver ++++ b/linker-script-binary.ver +@@ -1,6 +1,5 @@ + { + global: +- _IO_stdin_used; + local: + *; + }; +-- +2.42.0 + diff --git a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.32.0.bb b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.32.0.bb index 20fc0f3868..058aeb58d2 100644 --- a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.32.0.bb +++ b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.32.0.bb @@ -9,7 +9,7 @@ inherit features_check gnomebase gsettings gtk-icon-cache gettext pkgconfig ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -SRC_URI:append:libc-musl = " file://0001-linker-script-Do-not-export-_IO_stdin_used.patch" +SRC_URI:append:libc-musl = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' file://0001-linker-scripts-Do-not-export-_IO_stdin_used.patch', '', d)}" SRC_URI[archive.sha256sum] = "a2b5affa1505ad43902959fdbe09e5bcec57b11ed333fa60458ffb9c62efba38" diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn/0001-linker-script-Do-not-export-_IO_stdin_used.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn/0001-linker-script-Do-not-export-_IO_stdin_used.patch deleted file mode 100644 index eafd497ae2..0000000000 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn/0001-linker-script-Do-not-export-_IO_stdin_used.patch +++ /dev/null @@ -1,30 +0,0 @@ -From e09ba80e342b3b24bb2a46e11dae1c30cc61c75c Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 3 Sep 2023 08:48:42 -0700 -Subject: [PATCH] linker-script: Do not export _IO_stdin_used - -This is glibc specific toolhain issue, it should have been handled in -toolchain instead of exposing to applications. This was done to fix - -https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=835550 - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - linker-script-binary.ver | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/linker-script-binary.ver b/linker-script-binary.ver -index a2780c0..f030d35 100644 ---- a/linker-script-binary.ver -+++ b/linker-script-binary.ver -@@ -1,6 +1,5 @@ - { - global: -- _IO_stdin_used; - local: - *; - }; --- -2.42.0 - diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn/0001-linker-scripts-Do-not-export-_IO_stdin_used.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn/0001-linker-scripts-Do-not-export-_IO_stdin_used.patch new file mode 100644 index 0000000000..eafd497ae2 --- /dev/null +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn/0001-linker-scripts-Do-not-export-_IO_stdin_used.patch @@ -0,0 +1,30 @@ +From e09ba80e342b3b24bb2a46e11dae1c30cc61c75c Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 3 Sep 2023 08:48:42 -0700 +Subject: [PATCH] linker-script: Do not export _IO_stdin_used + +This is glibc specific toolhain issue, it should have been handled in +toolchain instead of exposing to applications. This was done to fix + +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=835550 + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + linker-script-binary.ver | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/linker-script-binary.ver b/linker-script-binary.ver +index a2780c0..f030d35 100644 +--- a/linker-script-binary.ver ++++ b/linker-script-binary.ver +@@ -1,6 +1,5 @@ + { + global: +- _IO_stdin_used; + local: + *; + }; +-- +2.42.0 + diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.10.2.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.10.2.bb index 024ef39361..a9afe3a7e4 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.10.2.bb +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.10.2.bb @@ -10,7 +10,7 @@ inherit gnomebase useradd gettext systemd SRC_URI = "${GNOME_MIRROR}/NetworkManager-openvpn/${@gnome_verdir("${PV}")}/NetworkManager-openvpn-${PV}.tar.xz" -SRC_URI:append:libc-musl = " file://0001-linker-script-Do-not-export-_IO_stdin_used.patch" +SRC_URI:append:libc-musl = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' file://0001-linker-scripts-Do-not-export-_IO_stdin_used.patch', '', d)}" SRC_URI[sha256sum] = "62f0f2a8782221b923f212ac2a8ebbc1002efd6a90ee945dad4adfb56d076d21" diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.44.0.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.44.0.bb index 84ef70c9af..8d1c877baa 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.44.0.bb +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.44.0.bb @@ -31,7 +31,7 @@ SRC_URI = " \ file://enable-dhcpcd.conf \ file://enable-iwd.conf \ " -SRC_URI:append:libc-musl = " file://0001-linker-scripts-Do-not-export-_IO_stdin_used.patch" +SRC_URI:append:libc-musl = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' file://0001-linker-scripts-Do-not-export-_IO_stdin_used.patch', '', d)}" SRC_URI[sha256sum] = "edca09637d182f806b3b12d8c5623d7badbd73ccca1ae63be20d2f298779fb9f" -- cgit v1.2.3-54-g00ecf