Message ID | 20231028050606.3438884-1-raj.khem@gmail.com |
---|---|
State | New |
Headers | show |
Series | [meta-networking,meta-gnome,v2] network-manager-applet,networkmanager-openvpn, networkmanager: Apply linker versioning patch when using lld only | expand |
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_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"
This patch caused GNU linker to fail linking, therefore limit it to just lld. Signed-off-by: Khem Raj <raj.khem@gmail.com> --- .../network-manager-applet/network-manager-applet_1.32.0.bb | 2 +- .../networkmanager/networkmanager-openvpn_1.10.2.bb | 2 +- .../networkmanager/networkmanager_1.44.0.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)