aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2019-09-11 13:49:43 -0700
committerKhem Raj <raj.khem@gmail.com>2019-09-11 13:51:15 -0700
commit2c97f18706be3d62133b8bb77ad24464b6d5e6a5 (patch)
treee4b9e0d3d9dd5641b20c4717643a596b14be07a1
parent45e75e15e943612e731f39f9f75317c7a615e893 (diff)
downloadmeta-openembedded-contrib-2c97f18706be3d62133b8bb77ad24464b6d5e6a5.tar.gz
safec: Upgrade to 3.5 release
Add a patch to fix build on musl Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-core/safec/safec/0001-memrchr-Use-_ISOC11_SOURCE-only-with-glibc.patch30
-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 @@
+From 57456b5d034c8965b11eceed1bf861c98a18c324 Mon Sep 17 00:00:00 2001
+From: "jenkins@kwaj" <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 <raj.khem@gmail.com>
+---
+ 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.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"
inherit autotools pkgconfig
S = "${WORKDIR}/git"
-SRCREV = "62e6b2df55084316d027165d286e46beb40513dc"
-SRC_URI = "git://github.com/rurban/safeclib.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"