summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2018-04-28 00:34:42 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-09 10:47:50 +0100
commit668aba5a363bf382b20cc069278c0b7a17268612 (patch)
tree91345b21dc10f9c9367f9056add307c6ec9991fb
parent6ef11123ef775676c4708a1b2ca162426b9791c3 (diff)
downloadpoky-668aba5a363bf382b20cc069278c0b7a17268612.tar.gz
libnsl: Upgrade to tip beyond 1.2.0 release
(From OE-Core rev: 0d387fe24f62c1c9fa1749de67c718255af59fc6) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/libnsl/libnsl2/0001-include-sys-cdefs.h-explicitly.patch68
-rw-r--r--meta/recipes-extended/libnsl/libnsl2/0001-nis_call.c-Include-stdint.h-for-uintptr_t-definition.patch27
-rw-r--r--meta/recipes-extended/libnsl/libnsl2/0002-Define-glibc-specific-macros.patch57
-rw-r--r--meta/recipes-extended/libnsl/libnsl2_git.bb8
4 files changed, 2 insertions, 158 deletions
diff --git a/meta/recipes-extended/libnsl/libnsl2/0001-include-sys-cdefs.h-explicitly.patch b/meta/recipes-extended/libnsl/libnsl2/0001-include-sys-cdefs.h-explicitly.patch
deleted file mode 100644
index bd647ac55e..0000000000
--- a/meta/recipes-extended/libnsl/libnsl2/0001-include-sys-cdefs.h-explicitly.patch
+++ /dev/null
@@ -1,68 +0,0 @@
1From 508a0ff690dfebc17c4f55a5f81824ed549bed66 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 18 Apr 2017 09:13:33 -0700
4Subject: [PATCH 1/2] include sys/cdefs.h explicitly
5
6glibc includes this header indirectly but not musl
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10Upstream-Status: Pending
11
12 src/rpcsvc/nis.h | 1 +
13 src/rpcsvc/nislib.h | 1 +
14 src/rpcsvc/ypclnt.h | 1 +
15 src/rpcsvc/ypupd.h | 1 +
16 4 files changed, 4 insertions(+)
17
18diff --git a/src/rpcsvc/nis.h b/src/rpcsvc/nis.h
19index 933c4d9..88cbca0 100644
20--- a/src/rpcsvc/nis.h
21+++ b/src/rpcsvc/nis.h
22@@ -32,6 +32,7 @@
23 #ifndef _RPCSVC_NIS_H
24 #define _RPCSVC_NIS_H 1
25
26+#include <sys/cdefs.h>
27 #include <features.h>
28 #include <rpc/rpc.h>
29 #include <rpcsvc/nis_tags.h>
30diff --git a/src/rpcsvc/nislib.h b/src/rpcsvc/nislib.h
31index a59c19b..a53fab3 100644
32--- a/src/rpcsvc/nislib.h
33+++ b/src/rpcsvc/nislib.h
34@@ -19,6 +19,7 @@
35 #ifndef __RPCSVC_NISLIB_H__
36 #define __RPCSVC_NISLIB_H__
37
38+#include <sys/cdefs.h>
39 #include <features.h>
40
41 __BEGIN_DECLS
42diff --git a/src/rpcsvc/ypclnt.h b/src/rpcsvc/ypclnt.h
43index fe43fd4..a686b61 100644
44--- a/src/rpcsvc/ypclnt.h
45+++ b/src/rpcsvc/ypclnt.h
46@@ -20,6 +20,7 @@
47 #ifndef __RPCSVC_YPCLNT_H__
48 #define __RPCSVC_YPCLNT_H__
49
50+#include <sys/cdefs.h>
51 #include <features.h>
52
53 /* Some defines */
54diff --git a/src/rpcsvc/ypupd.h b/src/rpcsvc/ypupd.h
55index d07fd4d..2c57301 100644
56--- a/src/rpcsvc/ypupd.h
57+++ b/src/rpcsvc/ypupd.h
58@@ -33,6 +33,7 @@
59 #ifndef __RPCSVC_YPUPD_H__
60 #define __RPCSVC_YPUPD_H__
61
62+#include <sys/cdefs.h>
63 #include <features.h>
64
65 #include <rpc/rpc.h>
66--
672.12.2
68
diff --git a/meta/recipes-extended/libnsl/libnsl2/0001-nis_call.c-Include-stdint.h-for-uintptr_t-definition.patch b/meta/recipes-extended/libnsl/libnsl2/0001-nis_call.c-Include-stdint.h-for-uintptr_t-definition.patch
deleted file mode 100644
index e9ae517107..0000000000
--- a/meta/recipes-extended/libnsl/libnsl2/0001-nis_call.c-Include-stdint.h-for-uintptr_t-definition.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1From d71cbeb3b76e54778a4d5eec6d387cce653537ca Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 9 Jun 2017 09:49:35 -0700
4Subject: [PATCH] nis_call.c: Include stdint.h for uintptr_t definition
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7---
8Upstream-Status: Pending
9
10 src/nisplus/nis_call.c | 1 +
11 1 file changed, 1 insertion(+)
12
13diff --git a/src/nisplus/nis_call.c b/src/nisplus/nis_call.c
14index 1a2b90c..1dc982d 100644
15--- a/src/nisplus/nis_call.c
16+++ b/src/nisplus/nis_call.c
17@@ -23,6 +23,7 @@
18 #include <errno.h>
19 #include <fcntl.h>
20 #include <string.h>
21+#include <stdint.h>
22 #include <libintl.h>
23 #include <rpc/rpc.h>
24 #include <rpc/auth.h>
25--
262.13.1
27
diff --git a/meta/recipes-extended/libnsl/libnsl2/0002-Define-glibc-specific-macros.patch b/meta/recipes-extended/libnsl/libnsl2/0002-Define-glibc-specific-macros.patch
deleted file mode 100644
index 75fda4b0f0..0000000000
--- a/meta/recipes-extended/libnsl/libnsl2/0002-Define-glibc-specific-macros.patch
+++ /dev/null
@@ -1,57 +0,0 @@
1From 60282514ea01af004d7f9e66dd3929223b7d2e7b Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 18 Apr 2017 09:16:12 -0700
4Subject: [PATCH 2/2] Define glibc specific macros
5
6Check and define
7rawmemchr, __asprintf, __mempcpy, __strtok_r
8__always_inline, TEMP_FAILURE_RETRY
9
10if not existing. Helps compiling with musl
11
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13---
14Upstream-Status: Pending
15
16diff --git a/src/rpcsvc/nis.h b/src/rpcsvc/nis.h
17index 88cbca0..23fc20c 100644
18--- a/src/rpcsvc/nis.h
19+++ b/src/rpcsvc/nis.h
20@@ -57,6 +57,34 @@ __BEGIN_DECLS
21 * <kukuk@suse.de>
22 */
23
24+#ifndef rawmemchr
25+#define rawmemchr(s,c) memchr((s),(size_t)-1,(c))
26+#endif
27+
28+#ifndef __asprintf
29+#define __asprintf asprintf
30+#endif
31+
32+#ifndef __mempcpy
33+#define __mempcpy mempcpy
34+#endif
35+
36+#ifndef __strtok_r
37+#define __strtok_r strtok_r
38+#endif
39+
40+#ifndef __always_inline
41+#define __always_inline __attribute__((__always_inline__))
42+#endif
43+
44+#ifndef TEMP_FAILURE_RETRY
45+#define TEMP_FAILURE_RETRY(exp) ({ \
46+typeof (exp) _rc; \
47+ do { \
48+ _rc = (exp); \
49+ } while (_rc == -1 && errno == EINTR); \
50+ _rc; })
51+#endif
52
53 #ifndef __nis_object_h
54 #define __nis_object_h
55--
562.12.2
57
diff --git a/meta/recipes-extended/libnsl/libnsl2_git.bb b/meta/recipes-extended/libnsl/libnsl2_git.bb
index a539148caf..c6ba80c943 100644
--- a/meta/recipes-extended/libnsl/libnsl2_git.bb
+++ b/meta/recipes-extended/libnsl/libnsl2_git.bb
@@ -9,16 +9,12 @@ LICENSE = "LGPL-2.1"
9LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" 9LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
10SECTION = "libs" 10SECTION = "libs"
11DEPENDS = "libtirpc" 11DEPENDS = "libtirpc"
12DEPENDS_append_libc-musl = " bsd-headers"
13 12
14PV = "1.0.5+git${SRCPV}" 13PV = "1.2.0+git${SRCPV}"
15 14
16SRCREV = "dfa2f313524aff9243c4d8ce1bace73786478356" 15SRCREV = "37c5ffe3038d42e9fa9ed232ad2cbca4d8f14681"
17 16
18SRC_URI = "git://github.com/thkukuk/libnsl \ 17SRC_URI = "git://github.com/thkukuk/libnsl \
19 file://0001-include-sys-cdefs.h-explicitly.patch \
20 file://0002-Define-glibc-specific-macros.patch \
21 file://0001-nis_call.c-Include-stdint.h-for-uintptr_t-definition.patch \
22 " 18 "
23 19
24S = "${WORKDIR}/git" 20S = "${WORKDIR}/git"