From 2c97f18706be3d62133b8bb77ad24464b6d5e6a5 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 11 Sep 2019 13:49:43 -0700 Subject: safec: Upgrade to 3.5 release Add a patch to fix build on musl Signed-off-by: Khem Raj --- ...emrchr-Use-_ISOC11_SOURCE-only-with-glibc.patch | 30 ++++++++++++++++++++++ meta-oe/recipes-core/safec/safec_3.4.bb | 17 ------------ meta-oe/recipes-core/safec/safec_3.5.bb | 19 ++++++++++++++ 3 files changed, 49 insertions(+), 17 deletions(-) create mode 100644 meta-oe/recipes-core/safec/safec/0001-memrchr-Use-_ISOC11_SOURCE-only-with-glibc.patch delete mode 100644 meta-oe/recipes-core/safec/safec_3.4.bb create mode 100644 meta-oe/recipes-core/safec/safec_3.5.bb 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 @@ +From 57456b5d034c8965b11eceed1bf861c98a18c324 Mon Sep 17 00:00:00 2001 +From: "jenkins@kwaj" +Date: Wed, 11 Sep 2019 13:43:45 -0700 +Subject: [PATCH] memrchr: Use _ISOC11_SOURCE only with glibc + +this is a glibc feature test macro which is not available +on other libraries e.g. musl + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + src/extmem/memrchr_s.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/extmem/memrchr_s.c b/src/extmem/memrchr_s.c +index 8d10a7b9..e73d3579 100644 +--- a/src/extmem/memrchr_s.c ++++ b/src/extmem/memrchr_s.c +@@ -36,7 +36,7 @@ + #endif + + #ifdef HAVE_MEMRCHR +-#ifndef _ISOC11_SOURCE ++#if defined (__GLIBC__) && !defined(_ISOC11_SOURCE) + extern void *memrchr(const void *, int, size_t); + #endif + #endif +-- +2.17.1 + diff --git a/meta-oe/recipes-core/safec/safec_3.4.bb b/meta-oe/recipes-core/safec/safec_3.4.bb deleted file mode 100644 index cc1fbcb735..0000000000 --- a/meta-oe/recipes-core/safec/safec_3.4.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Safe C Library" - -LICENSE = "safec" -LIC_FILES_CHKSUM = "file://COPYING;md5=6d0eb7dfc57806a006fcbc4e389cf164" -SECTION = "lib" - -inherit autotools pkgconfig - -S = "${WORKDIR}/git" -SRCREV = "62e6b2df55084316d027165d286e46beb40513dc" -SRC_URI = "git://github.com/rurban/safeclib.git" - -CPPFLAGS_append_libc-musl = " -D_GNU_SOURCE" - -COMPATIBLE_HOST = '(x86_64|i.86|powerpc|powerpc64|arm).*-linux' - -RDEPENDS_${PN} = "perl" diff --git a/meta-oe/recipes-core/safec/safec_3.5.bb b/meta-oe/recipes-core/safec/safec_3.5.bb new file mode 100644 index 0000000000..c9ace3b0b8 --- /dev/null +++ b/meta-oe/recipes-core/safec/safec_3.5.bb @@ -0,0 +1,19 @@ +SUMMARY = "Safe C Library" + +LICENSE = "safec" +LIC_FILES_CHKSUM = "file://COPYING;md5=6d0eb7dfc57806a006fcbc4e389cf164" +SECTION = "lib" + +inherit autotools pkgconfig + +S = "${WORKDIR}/git" +SRCREV = "a99a052a56da409638c9fe7e096a5ae6661ca7cb" +SRC_URI = "git://github.com/rurban/safeclib.git \ + file://0001-memrchr-Use-_ISOC11_SOURCE-only-with-glibc.patch \ +" + +CPPFLAGS_append_libc-musl = " -D_GNU_SOURCE" + +COMPATIBLE_HOST = '(x86_64|i.86|powerpc|powerpc64|arm).*-linux' + +RDEPENDS_${PN} = "perl" -- cgit v1.2.3-54-g00ecf