summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/libbsd
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2018-02-02 10:16:09 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-02-06 11:06:28 +0000
commit85ddc66f3d5fecdfa8f95a68474cf33f5db0c795 (patch)
tree09aec7232fa8587bfa79320640aec9cd46f9b0ba /meta/recipes-support/libbsd
parentd75fc2b87817fc0203be7debc79b1136aa0a727d (diff)
downloadpoky-85ddc66f3d5fecdfa8f95a68474cf33f5db0c795.tar.gz
libbsd: update to 0.8.7
Drop 0001-Fix-for-older-GCCs-not-supporting-__has_include.patch as it had been merged upstream. Rebase 0001-Replace-__BEGIN_DECLS-and-__END_DECLS.patch. (From OE-Core rev: 28ccf3a73f5dabf658c8dae5d9eabcb482d7f0bb) Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/libbsd')
-rw-r--r--meta/recipes-support/libbsd/libbsd/0001-Fix-for-older-GCCs-not-supporting-__has_include.patch31
-rw-r--r--meta/recipes-support/libbsd/libbsd/0001-Replace-__BEGIN_DECLS-and-__END_DECLS.patch65
-rw-r--r--meta/recipes-support/libbsd/libbsd_0.8.7.bb (renamed from meta/recipes-support/libbsd/libbsd_0.8.6.bb)5
3 files changed, 41 insertions, 60 deletions
diff --git a/meta/recipes-support/libbsd/libbsd/0001-Fix-for-older-GCCs-not-supporting-__has_include.patch b/meta/recipes-support/libbsd/libbsd/0001-Fix-for-older-GCCs-not-supporting-__has_include.patch
deleted file mode 100644
index d13732bdaf..0000000000
--- a/meta/recipes-support/libbsd/libbsd/0001-Fix-for-older-GCCs-not-supporting-__has_include.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From 2fbf47ce9b64f4e07be223bc2870348a68f19d86 Mon Sep 17 00:00:00 2001
2From: Adam Lackorzynski <adam@l4re.org>
3Date: Sat, 21 Oct 2017 23:08:31 +0200
4Subject: [PATCH] Fix for older GCCs not supporting __has_include*
5
6Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=103396]
7Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
8---
9 include/bsd/sys/cdefs.h | 4 ++--
10 1 file changed, 2 insertions(+), 2 deletions(-)
11
12diff --git a/include/bsd/sys/cdefs.h b/include/bsd/sys/cdefs.h
13index 044f221..b4c8f30 100644
14--- a/include/bsd/sys/cdefs.h
15+++ b/include/bsd/sys/cdefs.h
16@@ -25,10 +25,10 @@
17 */
18
19 #ifndef __has_include
20-#define __has_include 1
21+#define __has_include(x) 1
22 #endif
23 #ifndef __has_include_next
24-#define __has_include_next 1
25+#define __has_include_next(x) 1
26 #endif
27
28 #ifdef LIBBSD_OVERLAY
29--
302.12.0
31
diff --git a/meta/recipes-support/libbsd/libbsd/0001-Replace-__BEGIN_DECLS-and-__END_DECLS.patch b/meta/recipes-support/libbsd/libbsd/0001-Replace-__BEGIN_DECLS-and-__END_DECLS.patch
index e97e30e846..54617b506b 100644
--- a/meta/recipes-support/libbsd/libbsd/0001-Replace-__BEGIN_DECLS-and-__END_DECLS.patch
+++ b/meta/recipes-support/libbsd/libbsd/0001-Replace-__BEGIN_DECLS-and-__END_DECLS.patch
@@ -4,6 +4,7 @@ Date: Sun, 6 Nov 2016 09:39:31 -0800
4Subject: [PATCH 1/3] Replace __BEGIN_DECLS and __END_DECLS 4Subject: [PATCH 1/3] Replace __BEGIN_DECLS and __END_DECLS
5 5
6Signed-off-by: Khem Raj <raj.khem@gmail.com> 6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
7--- 8---
8Upstream-Status: Pending 9Upstream-Status: Pending
9 10
@@ -13,14 +14,14 @@ Upstream-Status: Pending
13 include/bsd/nlist.h | 10 ++++++++-- 14 include/bsd/nlist.h | 10 ++++++++--
14 include/bsd/readpassphrase.h | 10 ++++++++-- 15 include/bsd/readpassphrase.h | 10 ++++++++--
15 include/bsd/stdio.h | 10 ++++++++-- 16 include/bsd/stdio.h | 10 ++++++++--
16 include/bsd/stdlib.h | 10 ++++++++-- 17 include/bsd/stdlib.h | 12 +++++++++---
17 include/bsd/string.h | 10 ++++++++-- 18 include/bsd/string.h | 12 +++++++++---
18 include/bsd/stringlist.h | 10 ++++++++-- 19 include/bsd/stringlist.h | 10 ++++++++--
19 include/bsd/unistd.h | 10 ++++++++-- 20 include/bsd/unistd.h | 10 ++++++++--
20 include/bsd/vis.h | 10 ++++++++-- 21 include/bsd/vis.h | 10 ++++++++--
21 include/bsd/wchar.h | 10 ++++++++-- 22 include/bsd/wchar.h | 10 ++++++++--
22 src/hash/sha512.h | 10 ++++++++-- 23 src/hash/sha512.h | 10 ++++++++--
23 13 files changed, 104 insertions(+), 26 deletions(-) 24 13 files changed, 106 insertions(+), 28 deletions(-)
24 25
25diff --git a/include/bsd/err.h b/include/bsd/err.h 26diff --git a/include/bsd/err.h b/include/bsd/err.h
26index 12fd051..43dfc32 100644 27index 12fd051..43dfc32 100644
@@ -50,7 +51,7 @@ index 12fd051..43dfc32 100644
50 51
51 #endif 52 #endif
52diff --git a/include/bsd/libutil.h b/include/bsd/libutil.h 53diff --git a/include/bsd/libutil.h b/include/bsd/libutil.h
53index ebb6160..28b919d 100644 54index 45b3b15..9c936e5 100644
54--- a/include/bsd/libutil.h 55--- a/include/bsd/libutil.h
55+++ b/include/bsd/libutil.h 56+++ b/include/bsd/libutil.h
56@@ -53,7 +53,10 @@ struct pidfh { 57@@ -53,7 +53,10 @@ struct pidfh {
@@ -78,7 +79,7 @@ index ebb6160..28b919d 100644
78 /* humanize_number(3) */ 79 /* humanize_number(3) */
79 #define HN_DECIMAL 0x01 80 #define HN_DECIMAL 0x01
80diff --git a/include/bsd/md5.h b/include/bsd/md5.h 81diff --git a/include/bsd/md5.h b/include/bsd/md5.h
81index 9a75fad..3531fd6 100644 82index 5f3ae46..5d80e5c 100644
82--- a/include/bsd/md5.h 83--- a/include/bsd/md5.h
83+++ b/include/bsd/md5.h 84+++ b/include/bsd/md5.h
84@@ -30,7 +30,10 @@ typedef struct MD5Context { 85@@ -30,7 +30,10 @@ typedef struct MD5Context {
@@ -103,14 +104,14 @@ index 9a75fad..3531fd6 100644
103+#endif 104+#endif
104+/* __END_DECLS */ 105+/* __END_DECLS */
105 106
106 #endif /* _MD5_H_ */ 107 #endif /* LIBBSD_MD5_H */
107diff --git a/include/bsd/nlist.h b/include/bsd/nlist.h 108diff --git a/include/bsd/nlist.h b/include/bsd/nlist.h
108index 2730237..0389ab7 100644 109index cb297e8..e63bbbd 100644
109--- a/include/bsd/nlist.h 110--- a/include/bsd/nlist.h
110+++ b/include/bsd/nlist.h 111+++ b/include/bsd/nlist.h
111@@ -30,8 +30,14 @@ 112@@ -88,8 +88,14 @@ struct nlist {
112 #include <sys/cdefs.h> 113
113 #include <a.out.h> 114 #define N_FORMAT "%08x" /* namelist value format; XXX */
114 115
115-__BEGIN_DECLS 116-__BEGIN_DECLS
116+/* __BEGIN_DECLS */ 117+/* __BEGIN_DECLS */
@@ -126,7 +127,7 @@ index 2730237..0389ab7 100644
126 127
127 #endif 128 #endif
128diff --git a/include/bsd/readpassphrase.h b/include/bsd/readpassphrase.h 129diff --git a/include/bsd/readpassphrase.h b/include/bsd/readpassphrase.h
129index e1dacc3..76e0d33 100644 130index 14744b8..fa73361 100644
130--- a/include/bsd/readpassphrase.h 131--- a/include/bsd/readpassphrase.h
131+++ b/include/bsd/readpassphrase.h 132+++ b/include/bsd/readpassphrase.h
132@@ -34,8 +34,14 @@ 133@@ -34,8 +34,14 @@
@@ -145,13 +146,13 @@ index e1dacc3..76e0d33 100644
145+#endif 146+#endif
146+/* __END_DECLS */ 147+/* __END_DECLS */
147 148
148 #endif /* !_READPASSPHRASE_H_ */ 149 #endif /* !LIBBSD_READPASSPHRASE_H */
149diff --git a/include/bsd/stdio.h b/include/bsd/stdio.h 150diff --git a/include/bsd/stdio.h b/include/bsd/stdio.h
150index 7697425..b5b3efd 100644 151index 4b69983..18645b7 100644
151--- a/include/bsd/stdio.h 152--- a/include/bsd/stdio.h
152+++ b/include/bsd/stdio.h 153+++ b/include/bsd/stdio.h
153@@ -41,7 +41,10 @@ 154@@ -45,7 +45,10 @@
154 #include <sys/cdefs.h> 155 #endif
155 #include <sys/types.h> 156 #include <sys/types.h>
156 157
157-__BEGIN_DECLS 158-__BEGIN_DECLS
@@ -162,7 +163,7 @@ index 7697425..b5b3efd 100644
162 const char *fmtcheck(const char *, const char *); 163 const char *fmtcheck(const char *, const char *);
163 164
164 /* XXX: The function requires cooperation from the system libc to store the 165 /* XXX: The function requires cooperation from the system libc to store the
165@@ -69,7 +72,10 @@ FILE *funopen(const void *cookie, 166@@ -73,7 +76,10 @@ FILE *funopen(const void *cookie,
166 #define fwopen(cookie, fn) funopen(cookie, NULL, fn, NULL, NULL) 167 #define fwopen(cookie, fn) funopen(cookie, NULL, fn, NULL, NULL)
167 168
168 int fpurge(FILE *fp); 169 int fpurge(FILE *fp);
@@ -175,7 +176,7 @@ index 7697425..b5b3efd 100644
175 #endif 176 #endif
176 #endif 177 #endif
177diff --git a/include/bsd/stdlib.h b/include/bsd/stdlib.h 178diff --git a/include/bsd/stdlib.h b/include/bsd/stdlib.h
178index 0604cad..b9f0515 100644 179index ebc9638..c4b54b6 100644
179--- a/include/bsd/stdlib.h 180--- a/include/bsd/stdlib.h
180+++ b/include/bsd/stdlib.h 181+++ b/include/bsd/stdlib.h
181@@ -46,7 +46,10 @@ 182@@ -46,7 +46,10 @@
@@ -189,8 +190,17 @@ index 0604cad..b9f0515 100644
189+#endif 190+#endif
190 uint32_t arc4random(void); 191 uint32_t arc4random(void);
191 void arc4random_stir(void); 192 void arc4random_stir(void);
192 void arc4random_addrandom(u_char *dat, int datlen); 193 void arc4random_addrandom(unsigned char *dat, int datlen);
193@@ -73,6 +76,9 @@ long long strtonum(const char *nptr, long long minval, long long maxval, 194@@ -67,7 +70,7 @@ int sradixsort(const unsigned char **base, int nmemb,
195 const unsigned char *table, unsigned endbyte);
196
197 void *reallocf(void *ptr, size_t size);
198-#if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 26)
199+#if defined(_GNU_SOURCE) && defined(__GLIBC__)
200 void *reallocarray(void *ptr, size_t nmemb, size_t size);
201 #endif
202
203@@ -75,6 +78,9 @@ long long strtonum(const char *nptr, long long minval, long long maxval,
194 const char **errstr); 204 const char **errstr);
195 205
196 char *getbsize(int *headerlenp, long *blocksizep); 206 char *getbsize(int *headerlenp, long *blocksizep);
@@ -202,10 +212,10 @@ index 0604cad..b9f0515 100644
202 212
203 #endif 213 #endif
204diff --git a/include/bsd/string.h b/include/bsd/string.h 214diff --git a/include/bsd/string.h b/include/bsd/string.h
205index ee2f953..fbf8c54 100644 215index 6798bf6..fa1193f 100644
206--- a/include/bsd/string.h 216--- a/include/bsd/string.h
207+++ b/include/bsd/string.h 217+++ b/include/bsd/string.h
208@@ -36,13 +36,19 @@ 218@@ -36,15 +36,21 @@
209 #include <sys/cdefs.h> 219 #include <sys/cdefs.h>
210 #include <sys/types.h> 220 #include <sys/types.h>
211 221
@@ -219,7 +229,10 @@ index ee2f953..fbf8c54 100644
219 char *strnstr(const char *str, const char *find, size_t str_len); 229 char *strnstr(const char *str, const char *find, size_t str_len);
220 void strmode(mode_t mode, char *str); 230 void strmode(mode_t mode, char *str);
221 231
232-#if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 25)
233+#if defined(_GNU_SOURCE) && defined(__GLIBC__)
222 void explicit_bzero(void *buf, size_t len); 234 void explicit_bzero(void *buf, size_t len);
235 #endif
223-__END_DECLS 236-__END_DECLS
224+#ifdef __cplusplus 237+#ifdef __cplusplus
225+} 238+}
@@ -228,7 +241,7 @@ index ee2f953..fbf8c54 100644
228 241
229 #endif 242 #endif
230diff --git a/include/bsd/stringlist.h b/include/bsd/stringlist.h 243diff --git a/include/bsd/stringlist.h b/include/bsd/stringlist.h
231index e3c42e9..40d0a52 100644 244index ff30cac..4600f6b 100644
232--- a/include/bsd/stringlist.h 245--- a/include/bsd/stringlist.h
233+++ b/include/bsd/stringlist.h 246+++ b/include/bsd/stringlist.h
234@@ -43,12 +43,18 @@ typedef struct _stringlist { 247@@ -43,12 +43,18 @@ typedef struct _stringlist {
@@ -251,7 +264,7 @@ index e3c42e9..40d0a52 100644
251+#endif 264+#endif
252+/* __END_DECLS */ 265+/* __END_DECLS */
253 266
254 #endif /* _STRINGLIST_H */ 267 #endif /* LIBBSD_STRINGLIST_H */
255diff --git a/include/bsd/unistd.h b/include/bsd/unistd.h 268diff --git a/include/bsd/unistd.h b/include/bsd/unistd.h
256index 1f9c5f8..5b2f4c7 100644 269index 1f9c5f8..5b2f4c7 100644
257--- a/include/bsd/unistd.h 270--- a/include/bsd/unistd.h
@@ -280,7 +293,7 @@ index 1f9c5f8..5b2f4c7 100644
280 293
281 #endif 294 #endif
282diff --git a/include/bsd/vis.h b/include/bsd/vis.h 295diff --git a/include/bsd/vis.h b/include/bsd/vis.h
283index 835d2d6..63c951e 100644 296index 970dfdd..621d3c6 100644
284--- a/include/bsd/vis.h 297--- a/include/bsd/vis.h
285+++ b/include/bsd/vis.h 298+++ b/include/bsd/vis.h
286@@ -74,7 +74,10 @@ 299@@ -74,7 +74,10 @@
@@ -305,7 +318,7 @@ index 835d2d6..63c951e 100644
305+#endif 318+#endif
306+/* __END_DECLS */ 319+/* __END_DECLS */
307 320
308 #endif /* !_VIS_H_ */ 321 #endif /* !LIBBSD_VIS_H */
309diff --git a/include/bsd/wchar.h b/include/bsd/wchar.h 322diff --git a/include/bsd/wchar.h b/include/bsd/wchar.h
310index 33a500e..aa70742 100644 323index 33a500e..aa70742 100644
311--- a/include/bsd/wchar.h 324--- a/include/bsd/wchar.h
@@ -359,5 +372,5 @@ index 4f368a1..27ddc24 100644
359 372
360 #endif /* !_SHA512_H_ */ 373 #endif /* !_SHA512_H_ */
361-- 374--
3622.10.2 3751.9.1
363 376
diff --git a/meta/recipes-support/libbsd/libbsd_0.8.6.bb b/meta/recipes-support/libbsd/libbsd_0.8.7.bb
index c88517f5b5..552a85c4da 100644
--- a/meta/recipes-support/libbsd/libbsd_0.8.6.bb
+++ b/meta/recipes-support/libbsd/libbsd_0.8.7.bb
@@ -36,15 +36,14 @@ SECTION = "libs"
36SRC_URI = " \ 36SRC_URI = " \
37 http://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ 37 http://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
38 file://0001-src-libbsd-overlay.pc.in-Set-Cflags-to-use-I-instead.patch \ 38 file://0001-src-libbsd-overlay.pc.in-Set-Cflags-to-use-I-instead.patch \
39 file://0001-Fix-for-older-GCCs-not-supporting-__has_include.patch \
40" 39"
41SRC_URI_append_libc-musl = " \ 40SRC_URI_append_libc-musl = " \
42 file://0001-Replace-__BEGIN_DECLS-and-__END_DECLS.patch \ 41 file://0001-Replace-__BEGIN_DECLS-and-__END_DECLS.patch \
43 file://0002-Remove-funopen.patch \ 42 file://0002-Remove-funopen.patch \
44" 43"
45 44
46SRC_URI[md5sum] = "4ab7bec639af17d0aacb50222b479110" 45SRC_URI[md5sum] = "d9e6980fbfe44f94fd92b89a33cce67d"
47SRC_URI[sha256sum] = "467fbf9df1f49af11f7f686691057c8c0a7613ae5a870577bef9155de39f9687" 46SRC_URI[sha256sum] = "f548f10e5af5a08b1e22889ce84315b1ebe41505b015c9596bad03fd13a12b31"
48 47
49inherit autotools pkgconfig 48inherit autotools pkgconfig
50 49