diff options
author | Khem Raj <raj.khem@gmail.com> | 2020-11-22 11:31:08 -0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2020-11-23 07:09:34 -0800 |
commit | d67b8e191e6ddc61094a94a2e315fbe5bfc3d072 (patch) | |
tree | 6200c483660804d540d0eccfee6652aa5b300f41 | |
parent | bb956f060550ab56bd0dee7a630011635101a7a1 (diff) | |
download | meta-openembedded-d67b8e191e6ddc61094a94a2e315fbe5bfc3d072.tar.gz |
musl-nscd: Add missing deps on flex and bison during build
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>
-rw-r--r-- | meta-oe/recipes-devtools/musl/musl-nscd/0001-configure-Check-for-flex-if-lex-is-not-found.patch | 29 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/musl/musl-nscd_git.bb | 3 |
2 files changed, 32 insertions, 0 deletions
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 @@ | |||
1 | From 4d09032741475c4e9d3de62c8187597f3f72f934 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sun, 22 Nov 2020 12:32:01 -0800 | ||
4 | Subject: [PATCH] configure: Check for flex if lex is not found | ||
5 | |||
6 | lex is already checked by this time, therefore check should be to find | ||
7 | flex | ||
8 | Upstream-Status: Submitted [https://github.com/pikhq/musl-nscd/pull/12] | ||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | configure | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/configure b/configure | ||
15 | index 256824a..4c94568 100755 | ||
16 | --- a/configure | ||
17 | +++ b/configure | ||
18 | @@ -249,7 +249,7 @@ printf "checking for lex... " | ||
19 | trylex ${CROSS_COMPILE}lex | ||
20 | trylex lex | ||
21 | trylex ${CROSS_COMPILE}flex | ||
22 | -trylex lex | ||
23 | +trylex flex | ||
24 | printf "%s\n" "$LEX" | ||
25 | test -n "$LEX" || echo "$0: cannot find lex. Will try to use pre-provided source." | ||
26 | |||
27 | -- | ||
28 | 2.29.2 | ||
29 | |||
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" | |||
7 | LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=9bf479a145bcaff8489e743da58afeee" | 7 | LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=9bf479a145bcaff8489e743da58afeee" |
8 | SECTION = "utils" | 8 | SECTION = "utils" |
9 | 9 | ||
10 | DEPENDS += "flex-native bison-native flex bison" | ||
11 | |||
10 | PV = "1.0.2" | 12 | PV = "1.0.2" |
11 | 13 | ||
12 | SRCREV = "af581482a3e1059458f3c8b20a56f82807ca3bd4" | 14 | SRCREV = "af581482a3e1059458f3c8b20a56f82807ca3bd4" |
13 | SRC_URI = "git://github.com/pikhq/musl-nscd \ | 15 | SRC_URI = "git://github.com/pikhq/musl-nscd \ |
14 | file://0001-Fix-build-under-GCC-fno-common.patch \ | 16 | file://0001-Fix-build-under-GCC-fno-common.patch \ |
17 | file://0001-configure-Check-for-flex-if-lex-is-not-found.patch \ | ||
15 | " | 18 | " |
16 | 19 | ||
17 | UPSTREAM_CHECK_COMMITS = "1" | 20 | UPSTREAM_CHECK_COMMITS = "1" |