diff options
author | Khem Raj <raj.khem@gmail.com> | 2015-09-02 03:21:58 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-12 22:48:38 +0100 |
commit | 7e4cc9892dc72bfd360855940e715f8d43186053 (patch) | |
tree | 6ec374a04ba9e19267c3fd27746a09ab361fa926 | |
parent | f03b36b199b8c6259eb4ceb5b8b0717ca753c257 (diff) | |
download | poky-7e4cc9892dc72bfd360855940e715f8d43186053.tar.gz |
minicom: Fix build with musl
musl exposes the inherent assumption about certain header files from
glibc
(From OE-Core rev: 77789bdd0f55714590d95589558edc8151f9860d)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-extended/minicom/minicom/0001-Fix-build-issus-surfaced-due-to-musl.patch | 47 | ||||
-rw-r--r-- | meta/recipes-extended/minicom/minicom_2.7.bb | 1 |
2 files changed, 48 insertions, 0 deletions
diff --git a/meta/recipes-extended/minicom/minicom/0001-Fix-build-issus-surfaced-due-to-musl.patch b/meta/recipes-extended/minicom/minicom/0001-Fix-build-issus-surfaced-due-to-musl.patch new file mode 100644 index 0000000000..fec67fdd3f --- /dev/null +++ b/meta/recipes-extended/minicom/minicom/0001-Fix-build-issus-surfaced-due-to-musl.patch | |||
@@ -0,0 +1,47 @@ | |||
1 | From d62a5862e26ed3fc58d789efe9c40ca6c911d36b Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 31 Aug 2015 22:35:31 +0000 | ||
4 | Subject: [PATCH] Fix build issus surfaced due to musl | ||
5 | |||
6 | src/getsdir.h:28:14: error: 'MAXNAMLEN' undeclared here (not in a function) | ||
7 | char fname[MAXNAMLEN + 1]; /* filename + terminating null */ | ||
8 | |||
9 | src/dial.c:352:22: error: 'KIOCSOUND' undeclared (first use in this function) | ||
10 | | ioctl(consolefd, KIOCSOUND, k); | ||
11 | |||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
13 | --- | ||
14 | Upstream-Status: Pending | ||
15 | |||
16 | src/dial.c | 2 +- | ||
17 | src/getsdir.c | 1 + | ||
18 | 2 files changed, 2 insertions(+), 1 deletion(-) | ||
19 | |||
20 | diff --git a/src/dial.c b/src/dial.c | ||
21 | index a90c1d2..bf02574 100644 | ||
22 | --- a/src/dial.c | ||
23 | +++ b/src/dial.c | ||
24 | @@ -39,7 +39,7 @@ | ||
25 | #include "intl.h" | ||
26 | |||
27 | #ifdef VC_MUSIC | ||
28 | -# if defined(__GLIBC__) | ||
29 | +# if defined(__GLIBC__) || defined(__linux__) | ||
30 | # include <sys/ioctl.h> | ||
31 | # include <sys/kd.h> | ||
32 | # include <sys/time.h> | ||
33 | diff --git a/src/getsdir.c b/src/getsdir.c | ||
34 | index 2195b27..b61a361 100644 | ||
35 | --- a/src/getsdir.c | ||
36 | +++ b/src/getsdir.c | ||
37 | @@ -30,6 +30,7 @@ | ||
38 | #include <string.h> | ||
39 | #include <sys/types.h> | ||
40 | #include <sys/stat.h> | ||
41 | +#include <sys/param.h> | ||
42 | #include <errno.h> | ||
43 | |||
44 | #include "getsdir.h" | ||
45 | -- | ||
46 | 2.5.1 | ||
47 | |||
diff --git a/meta/recipes-extended/minicom/minicom_2.7.bb b/meta/recipes-extended/minicom/minicom_2.7.bb index c002bc82d9..1575cfbc7e 100644 --- a/meta/recipes-extended/minicom/minicom_2.7.bb +++ b/meta/recipes-extended/minicom/minicom_2.7.bb | |||
@@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=420477abc567404debca0a2a1cb6b645 \ | |||
9 | SRC_URI = "https://alioth.debian.org/frs/download.php/latestfile/3/${BP}.tar.gz \ | 9 | SRC_URI = "https://alioth.debian.org/frs/download.php/latestfile/3/${BP}.tar.gz \ |
10 | file://allow.to.disable.lockdev.patch \ | 10 | file://allow.to.disable.lockdev.patch \ |
11 | file://0001-fix-minicom-h-v-return-value-is-not-0.patch \ | 11 | file://0001-fix-minicom-h-v-return-value-is-not-0.patch \ |
12 | file://0001-Fix-build-issus-surfaced-due-to-musl.patch \ | ||
12 | " | 13 | " |
13 | 14 | ||
14 | SRC_URI[md5sum] = "7044ca3e291268c33294f171d426dc2d" | 15 | SRC_URI[md5sum] = "7044ca3e291268c33294f171d426dc2d" |