Skip to contentSkip to conversation

libyui-ncurses: Fix build with musl _nl_msg_cat_cntr in not available

PATCH New Khem Raj 2 participants 3 messages Mar 5, 2018

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/2 libyui-ncurses: Fix build with musl _nl_msg_cat_cntr in not available

Signed-off-by Khem Raj <[email protected]>
---
 ...0001-use-_nl_msg_cat_cntr-only-with-glibc.patch | 40 ++++++++++++++++++++++
 .../recipes-graphics/libyui/libyui-ncurses_git.bb  |  1 +
 2 files changed, 41 insertions(+)
 create mode 100644 meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-use-_nl_msg_cat_cntr-only-with-glibc.patch
meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-use-_nl_msg_cat_cntr-only-with-glibc.patch new file +40 -0
new file mode 100644
index 000000000..8e3774c1a
@@ -0,0 +1,40 @@
+From 4b84f243a70a8c07f6a38dad3c9411fa707f25c9 Mon Sep 17 00:00:00 2001
+From: Khem Raj <[email protected]>
+Date: Sun, 4 Mar 2018 17:08:43 -0800
+Subject: [PATCH] use _nl_msg_cat_cntr only with glibc
+
+The musl libc provides libintl (similar to glibc)
+but does not use the same internals,
+so even though we are using the GNU gettext
+the libintl included with the libc does not define
+_nl_msg_cat_cntr and it does not need to.
+
+Signed-off-by: Khem Raj <[email protected]>
+---
+Upstream-Status: Pending
+
+ src/NCi18n.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/NCi18n.h b/src/NCi18n.h
+index 165b0e7..bfc4ed7 100644
+--- a/src/NCi18n.h
++++ b/src/NCi18n.h
+@@ -59,12 +59,13 @@ inline void setTextdomain( const char * domain )
+     bindtextdomain( domain,  YSettings::localeDir().c_str() );
+     bind_textdomain_codeset( domain, "UTF-8" );
+     textdomain( domain );
+-
++#if defined(__GLIBC__)
+     // Make change known
+     {
+ 	extern int _nl_msg_cat_cntr;
+ 	++_nl_msg_cat_cntr;
+     }
++#endif
+ }
+ 
+ 
+-- 
+2.16.2
+
meta-oe/recipes-graphics/libyui/libyui-ncurses_git.bb +1 -0
index f60c85668..578c71301 100644
@@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING.lgpl-3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
 "
 
 SRC_URI = "git://github.com/libyui/libyui-ncurses.git \
+           file://0001-use-_nl_msg_cat_cntr-only-with-glibc.patch \
           "
 
 SRC_URI_append_class-target = " file://0001-Fix-the-error-of-can-t-find-header-file.patch"
Signature · 1 line
2.16.2
author
#1 lore raw

PATCH v2 2/2 ebtables: Fix duplicate definition errors due to netinet/ether.h

Make the patch musl specific as it is regressing glibc 2.27

Signed-off-by Khem Raj <[email protected]>

---
Changes since v1:
- Drop the new patch since it was reverting existing patch partially
- Apply the regressing patch conditionally to musl builds alone

 meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb +2 -1
index d5e7341a0..e4adafd3c 100644
@@ -29,9 +29,10 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/ebtables/ebtables-v${PV}.tar.gz \
            file://0007-extensions-Use-stdint-types.patch \
            file://0008-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch \
            file://0009-ebtables-Allow-RETURN-target-rules-in-user-defined-c.patch \
-           file://0010-Adjust-header-include-sequence.patch \
            "
 
+SRC_URI_append_libc-musl = " file://0010-Adjust-header-include-sequence.patch"
+
 SRC_URI[md5sum] = "506742a3d44b9925955425a659c1a8d0"
 SRC_URI[sha256sum] = "dc6f7b484f207dc712bfca81645f45120cb6aee3380e77a1771e9c34a9a4455d"
Signature · 1 line
2.16.2
#2 lore raw

Re: [meta-networking][PATCH V2 2/2] ebtables: Fix duplicate definition errors due to netinet/ether.h

FYI: I'm also about to spin a new linux-libc-headers that addresses this issue as well.

There's a -stable patch that fixes the regression introduced in 4.15 headers, so I've bumped to 4.15.7 to pick up that fix. I also had to adjust the musl libc-headers
patches for it slightly, but after those chances, this should build without needing
any package specific patches.

I'm doing final testing (and will build ebtables directly to confirm), and I expect to
get the series out Monday.

Bruce

Quoted 35 lines · Khem Raj

Make the patch musl specific as it is regressing glibc 2.27

Signed-off-by Khem Raj <[email protected]>

---
Changes since v1:
- Drop the new patch since it was reverting existing patch partially
- Apply the regressing patch conditionally to musl builds alone

 meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb +2 -2
index d5e7341a0..e4adafd3c 100644
@@ -29,9 +29,10 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/ebtables/ebtables-v${PV}.tar.gz \
            file://0007-extensions-Use-stdint-types.patch \
            file://0008-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch \
            file://0009-ebtables-Allow-RETURN-target-rules-in-user-defined-c.patch \
-           file://0010-Adjust-header-include-sequence.patch \
            "
 
+SRC_URI_append_libc-musl = " file://0010-Adjust-header-include-sequence.patch"
+
 SRC_URI[md5sum] = "506742a3d44b9925955425a659c1a8d0"
 SRC_URI[sha256sum] = "dc6f7b484f207dc712bfca81645f45120cb6aee3380e77a1771e9c34a9a4455d"
 
--

2.16.2

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Signature · 2 lines
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"