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.bb (renamed from meta-oe/recipes-core/safec/safec_3.4.bb) | 6 |
2 files changed, 34 insertions, 2 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 new file mode 100644 index 0000000000..8f18f48720 --- /dev/null +++ b/meta-oe/recipes-core/safec/safec/0001-memrchr-Use-_ISOC11_SOURCE-only-with-glibc.patch | |||
| @@ -0,0 +1,30 @@ | |||
| 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.4.bb b/meta-oe/recipes-core/safec/safec_3.5.bb index cc1fbcb735..c9ace3b0b8 100644 --- a/meta-oe/recipes-core/safec/safec_3.4.bb +++ b/meta-oe/recipes-core/safec/safec_3.5.bb | |||
| @@ -7,8 +7,10 @@ SECTION = "lib" | |||
| 7 | inherit autotools pkgconfig | 7 | inherit autotools pkgconfig |
| 8 | 8 | ||
| 9 | S = "${WORKDIR}/git" | 9 | S = "${WORKDIR}/git" |
| 10 | SRCREV = "62e6b2df55084316d027165d286e46beb40513dc" | 10 | SRCREV = "a99a052a56da409638c9fe7e096a5ae6661ca7cb" |
| 11 | SRC_URI = "git://github.com/rurban/safeclib.git" | 11 | SRC_URI = "git://github.com/rurban/safeclib.git \ |
| 12 | file://0001-memrchr-Use-_ISOC11_SOURCE-only-with-glibc.patch \ | ||
| 13 | " | ||
| 12 | 14 | ||
| 13 | CPPFLAGS_append_libc-musl = " -D_GNU_SOURCE" | 15 | CPPFLAGS_append_libc-musl = " -D_GNU_SOURCE" |
| 14 | 16 | ||
