[meta-oe][PATCH 1/2] musl-nscd: Replace -fcommon with code patch

[meta-oe][PATCH 1/2] musl-nscd: Replace -fcommon with code patch

[Khem Raj]

The patch fixes the need for -fcommon

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Armin Kuster <akuster808@gmail.com>
---
 .../0001-Fix-build-under-GCC-fno-common.patch | 43 +++++++++++++++++++
 .../recipes-devtools/musl/musl-nscd_git.bb    |  6 +--
 2 files changed, 46 insertions(+), 3 deletions(-)
 create mode 100644 meta-oe/recipes-devtools/musl/musl-nscd/0001-Fix-build-under-GCC-fno-common.patch

diff --git a/meta-oe/recipes-devtools/musl/musl-nscd/0001-Fix-build-under-GCC-fno-common.patch b/meta-oe/recipes-devtools/musl/musl-nscd/0001-Fix-build-under-GCC-fno-common.patch
new file mode 100644
index 0000000000..6fee0526d2
--- /dev/null
+++ b/meta-oe/recipes-devtools/musl/musl-nscd/0001-Fix-build-under-GCC-fno-common.patch
@@ -0,0 +1,43 @@
+From 8c0e4b7907eb577b1e5214f9a7bc75d5c3263b0a Mon Sep 17 00:00:00 2001
+From: Ariadne Conill <ariadne@dereferenced.org>
+Date: Sat, 14 Nov 2020 22:55:30 -0700
+Subject: [PATCH] Fix build under GCC -fno-common.
+
+Upstream-Status: Submitted [https://github.com/pikhq/musl-nscd/pull/11]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ include/modules.h | 4 ++--
+ src/main.c        | 3 +++
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/include/modules.h b/include/modules.h
+index 70c1960..e77ec58 100644
+--- a/include/modules.h
++++ b/include/modules.h
+@@ -28,7 +28,7 @@ struct mod_passwd {
+ 	link_t link;
+ };
+ 
+-list_t passwd_mods;
+-list_t group_mods;
++extern list_t passwd_mods;
++extern list_t group_mods;
+ 
+ #endif
+diff --git a/src/main.c b/src/main.c
+index c1a78bb..808ef74 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -18,6 +18,9 @@
+ #include "parse.h"
+ #include "util.h"
+ 
++list_t passwd_mods;
++list_t group_mods;
++
+ static void *get_dll(const char *service)
+ {
+ 	char *path;
+-- 
+2.29.2
+
diff --git a/meta-oe/recipes-devtools/musl/musl-nscd_git.bb b/meta-oe/recipes-devtools/musl/musl-nscd_git.bb
index b03cc868fd..94a506ae71 100644
--- a/meta-oe/recipes-devtools/musl/musl-nscd_git.bb
+++ b/meta-oe/recipes-devtools/musl/musl-nscd_git.bb
@@ -9,10 +9,10 @@ SECTION = "utils"
 
 PV = "1.0.2"
 
-CFLAGS += "-fcommon"
-
 SRCREV = "af581482a3e1059458f3c8b20a56f82807ca3bd4"
-SRC_URI = "git://github.com/pikhq/musl-nscd"
+SRC_URI = "git://github.com/pikhq/musl-nscd \
+           file://0001-Fix-build-under-GCC-fno-common.patch \
+          "
 
 UPSTREAM_CHECK_COMMITS = "1"
 
-- 
2.29.2

[meta-oe][PATCH 2/2] musl-nscd: Add missing deps on flex and bison during build

[Khem Raj]

Fix check for flex

Fails in do_compile at times see below

cp dist/src/nsswitch.yy.c obj/src/nsswitch.yy.c
cp: cannot create regular file 'obj/src/nsswitch.yy.c': No such file or directory
Makefile:78: recipe for target 'obj/src/nsswitch.yy.c' failed
make: *** [obj/src/nsswitch.yy.c] Error 1

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Armin Kuster <akuster808@gmail.com>
---
 ...e-Check-for-flex-if-lex-is-not-found.patch | 29 +++++++++++++++++++
 .../recipes-devtools/musl/musl-nscd_git.bb    |  3 ++
 2 files changed, 32 insertions(+)
 create mode 100644 meta-oe/recipes-devtools/musl/musl-nscd/0001-configure-Check-for-flex-if-lex-is-not-found.patch

diff --git a/meta-oe/recipes-devtools/musl/musl-nscd/0001-configure-Check-for-flex-if-lex-is-not-found.patch b/meta-oe/recipes-devtools/musl/musl-nscd/0001-configure-Check-for-flex-if-lex-is-not-found.patch
new file mode 100644
index 0000000000..691aa3d2ac
--- /dev/null
+++ b/meta-oe/recipes-devtools/musl/musl-nscd/0001-configure-Check-for-flex-if-lex-is-not-found.patch
@@ -0,0 +1,29 @@
+From 4d09032741475c4e9d3de62c8187597f3f72f934 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sun, 22 Nov 2020 12:32:01 -0800
+Subject: [PATCH] configure: Check for flex if lex is not found
+
+lex is already checked by this time, therefore check should be to find
+flex
+Upstream-Status: Submitted [https://github.com/pikhq/musl-nscd/pull/12]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index 256824a..4c94568 100755
+--- a/configure
++++ b/configure
+@@ -249,7 +249,7 @@ printf "checking for lex... "
+ trylex ${CROSS_COMPILE}lex
+ trylex lex
+ trylex ${CROSS_COMPILE}flex
+-trylex lex
++trylex flex
+ printf "%s\n" "$LEX"
+ test -n "$LEX" || echo "$0: cannot find lex. Will try to use pre-provided source."
+ 
+-- 
+2.29.2
+
diff --git a/meta-oe/recipes-devtools/musl/musl-nscd_git.bb b/meta-oe/recipes-devtools/musl/musl-nscd_git.bb
index 94a506ae71..83125a1ba4 100644
--- a/meta-oe/recipes-devtools/musl/musl-nscd_git.bb
+++ b/meta-oe/recipes-devtools/musl/musl-nscd_git.bb
@@ -7,11 +7,14 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=9bf479a145bcaff8489e743da58afeee"
 SECTION = "utils"
 
+DEPENDS += "flex-native bison-native flex bison"
+
 PV = "1.0.2"
 
 SRCREV = "af581482a3e1059458f3c8b20a56f82807ca3bd4"
 SRC_URI = "git://github.com/pikhq/musl-nscd \
            file://0001-Fix-build-under-GCC-fno-common.patch \
+           file://0001-configure-Check-for-flex-if-lex-is-not-found.patch \
           "
 
 UPSTREAM_CHECK_COMMITS = "1"
-- 
2.29.2