Message ID | 20230903160349.2052956-2-raj.khem@gmail.com |
---|---|
State | New |
Headers | show |
Series | [meta-networking,1/2] network-manager-applet: Fix build with musl/lld linker | expand |
Hi Khem, On Sun, 3 Sept 2023 at 18:03, Khem Raj <raj.khem@gmail.com> wrote: > > Signed-off-by: Khem Raj <raj.khem@gmail.com> > --- > ...-script-Do-not-export-_IO_stdin_used.patch | 30 +++++++++++++++++++ > .../networkmanager-openvpn_1.10.2.bb | 2 ++ > 2 files changed, 32 insertions(+) > create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn/0001-linker-script-Do-not-export-_IO_stdin_used.patch > > 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 > new file mode 100644 > index 0000000000..eafd497ae2 > --- /dev/null > +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn/0001-linker-script-Do-not-export-_IO_stdin_used.patch > @@ -0,0 +1,30 @@ > +From e09ba80e342b3b24bb2a46e11dae1c30cc61c75c Mon Sep 17 00:00:00 2001 > +From: Khem Raj <raj.khem@gmail.com> > +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 <raj.khem@gmail.com> > +--- > + 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; This gives me the following error when building for qemuarm64 with musl /test-meta-oe/build/tmp/work/cortexa57-poky-linux-musl/networkmanager/1.44.0/recipe-sysroot-native/usr/bin/aarch64-poky-linux-musl/../../libexec/aarch64-poky-linux-musl/gcc/aarch64-poky-linux-musl/13.2.0/ld:/test-meta-oe/build/tmp/work/cortexa57-poky-linux-musl/networkmanager/1.44.0/NetworkManager-1.44.0/linker-script-binary.ver:3: syntax error in VERSION script collect2: error: ld returned 1 exit status $> cat /test-meta-oe/build/tmp/work/cortexa57-poky-linux-musl/networkmanager/1.44.0/NetworkManager-1.44.0/linker-script-binary.ver { global: local: *; }; I am on top of master of Poky Regards, Clement > + 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 3114731f2a..024ef39361 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,6 +10,8 @@ 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[sha256sum] = "62f0f2a8782221b923f212ac2a8ebbc1002efd6a90ee945dad4adfb56d076d21" > > S = "${WORKDIR}/NetworkManager-openvpn-${PV}" > -- > 2.42.0 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#104702): https://lists.openembedded.org/g/openembedded-devel/message/104702 > Mute This Topic: https://lists.openembedded.org/mt/101132829/4240582 > Group Owner: openembedded-devel+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [peron.clem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
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 new file mode 100644 index 0000000000..eafd497ae2 --- /dev/null +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn/0001-linker-script-Do-not-export-_IO_stdin_used.patch @@ -0,0 +1,30 @@ +From e09ba80e342b3b24bb2a46e11dae1c30cc61c75c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +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 <raj.khem@gmail.com> +--- + 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 3114731f2a..024ef39361 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,6 +10,8 @@ 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[sha256sum] = "62f0f2a8782221b923f212ac2a8ebbc1002efd6a90ee945dad4adfb56d076d21" S = "${WORKDIR}/NetworkManager-openvpn-${PV}"
Signed-off-by: Khem Raj <raj.khem@gmail.com> --- ...-script-Do-not-export-_IO_stdin_used.patch | 30 +++++++++++++++++++ .../networkmanager-openvpn_1.10.2.bb | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn/0001-linker-script-Do-not-export-_IO_stdin_used.patch