diff options
-rw-r--r-- | meta-oe/recipes-core/safec/safec/0001-memrchr-Use-_ISOC11_SOURCE-only-with-glibc.patch | 30 | ||||
-rw-r--r-- | meta-oe/recipes-core/safec/safec_3.5.1.bb (renamed from meta-oe/recipes-core/safec/safec_3.5.bb) | 8 |
2 files changed, 3 insertions, 35 deletions
diff --git a/meta-oe/recipes-core/safec/safec/0001-memrchr-Use-_ISOC11_SOURCE-only-with-glibc.patch b/meta-oe/recipes-core/safec/safec/0001-memrchr-Use-_ISOC11_SOURCE-only-with-glibc.patch deleted file mode 100644 index 8f18f48720..0000000000 --- a/meta-oe/recipes-core/safec/safec/0001-memrchr-Use-_ISOC11_SOURCE-only-with-glibc.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | From 57456b5d034c8965b11eceed1bf861c98a18c324 Mon Sep 17 00:00:00 2001 | ||
2 | From: "jenkins@kwaj" <jenkins@kwaj> | ||
3 | Date: Wed, 11 Sep 2019 13:43:45 -0700 | ||
4 | Subject: [PATCH] memrchr: Use _ISOC11_SOURCE only with glibc | ||
5 | |||
6 | this is a glibc feature test macro which is not available | ||
7 | on other libraries e.g. musl | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | src/extmem/memrchr_s.c | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/src/extmem/memrchr_s.c b/src/extmem/memrchr_s.c | ||
16 | index 8d10a7b9..e73d3579 100644 | ||
17 | --- a/src/extmem/memrchr_s.c | ||
18 | +++ b/src/extmem/memrchr_s.c | ||
19 | @@ -36,7 +36,7 @@ | ||
20 | #endif | ||
21 | |||
22 | #ifdef HAVE_MEMRCHR | ||
23 | -#ifndef _ISOC11_SOURCE | ||
24 | +#if defined (__GLIBC__) && !defined(_ISOC11_SOURCE) | ||
25 | extern void *memrchr(const void *, int, size_t); | ||
26 | #endif | ||
27 | #endif | ||
28 | -- | ||
29 | 2.17.1 | ||
30 | |||
diff --git a/meta-oe/recipes-core/safec/safec_3.5.bb b/meta-oe/recipes-core/safec/safec_3.5.1.bb index 94cdb3a3c3..91d8fc65a0 100644 --- a/meta-oe/recipes-core/safec/safec_3.5.bb +++ b/meta-oe/recipes-core/safec/safec_3.5.1.bb | |||
@@ -7,14 +7,12 @@ SECTION = "lib" | |||
7 | inherit autotools pkgconfig | 7 | inherit autotools pkgconfig |
8 | 8 | ||
9 | S = "${WORKDIR}/git" | 9 | S = "${WORKDIR}/git" |
10 | SRCREV = "a99a052a56da409638c9fe7e096a5ae6661ca7cb" | 10 | # v08112019 |
11 | SRCREV = "ad76c7b1dbd0403b0c9decf54164fcce271c590f" | ||
11 | SRC_URI = "git://github.com/rurban/safeclib.git \ | 12 | SRC_URI = "git://github.com/rurban/safeclib.git \ |
12 | file://0001-memrchr-Use-_ISOC11_SOURCE-only-with-glibc.patch \ | ||
13 | " | 13 | " |
14 | 14 | ||
15 | CPPFLAGS_append_libc-musl = " -D_GNU_SOURCE" | 15 | COMPATIBLE_HOST = '(x86_64|i.86|powerpc|powerpc64|arm|aarch64|mips).*-linux' |
16 | |||
17 | COMPATIBLE_HOST = '(x86_64|i.86|powerpc|powerpc64|arm|aarch64).*-linux' | ||
18 | 16 | ||
19 | PACKAGES =+ "${PN}-check" | 17 | PACKAGES =+ "${PN}-check" |
20 | 18 | ||