summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2017-07-11 06:38:36 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-07-17 14:01:39 +0100
commit73fc26cfcd51575d24f13620c544edd8ec06994a (patch)
tree79041dd9d00ad3430e212d1edc594ab8805b7305
parent3c24505d16f5db91194fc7cd6ae77ff27e1dc36f (diff)
downloadpoky-73fc26cfcd51575d24f13620c544edd8ec06994a.tar.gz
libbsd: 0.8.3 -> 0.8.5
* The LIC_FILES_CHKSUM is changed becauses the files updated the date, and added a BSD-3-clause-John-Birrell for man/timeradd.3bsd, this license is already there for other files. * Update 0002-Remove-funopen.patch * Remove 0003-Fix-build-breaks-due-to-missing-a.out.h.patch, the a.out code is gone in the source, so this patch is not needed any more. (From OE-Core rev: 1be785e420c838080ce5dc608192794e46961582) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/libbsd/libbsd/0002-Remove-funopen.patch21
-rw-r--r--meta/recipes-support/libbsd/libbsd/0003-Fix-build-breaks-due-to-missing-a.out.h.patch130
-rw-r--r--meta/recipes-support/libbsd/libbsd_0.8.5.bb (renamed from meta/recipes-support/libbsd/libbsd_0.8.3.bb)7
3 files changed, 12 insertions, 146 deletions
diff --git a/meta/recipes-support/libbsd/libbsd/0002-Remove-funopen.patch b/meta/recipes-support/libbsd/libbsd/0002-Remove-funopen.patch
index 83ce7c8dd0..60da15eb83 100644
--- a/meta/recipes-support/libbsd/libbsd/0002-Remove-funopen.patch
+++ b/meta/recipes-support/libbsd/libbsd/0002-Remove-funopen.patch
@@ -15,17 +15,17 @@ Upstream-Status: Inappropriate [musl specific]
15 3 files changed, 3 deletions(-) 15 3 files changed, 3 deletions(-)
16 16
17diff --git a/man/Makefile.am b/man/Makefile.am 17diff --git a/man/Makefile.am b/man/Makefile.am
18index e4d6e4a..c701d94 100644 18index 28192c0..a22787d 100644
19--- a/man/Makefile.am 19--- a/man/Makefile.am
20+++ b/man/Makefile.am 20+++ b/man/Makefile.am
21@@ -29,7 +29,6 @@ dist_man_MANS = \ 21@@ -168,7 +168,6 @@ dist_man_MANS = \
22 flopen.3 \ 22 fmtcheck.3bsd \
23 fmtcheck.3 \ 23 fparseln.3bsd \
24 fparseln.3 \ 24 fpurge.3bsd \
25- funopen.3bsd \ 25- funopen.3bsd \
26 getbsize.3 \ 26 getbsize.3bsd \
27 getmode.3 \ 27 getmode.3bsd \
28 getpeereid.3 \ 28 getpeereid.3bsd \
29diff --git a/src/Makefile.am b/src/Makefile.am 29diff --git a/src/Makefile.am b/src/Makefile.am
30index ad83dbf..13225a3 100644 30index ad83dbf..13225a3 100644
31--- a/src/Makefile.am 31--- a/src/Makefile.am
@@ -39,7 +39,7 @@ index ad83dbf..13225a3 100644
39 getpeereid.c \ 39 getpeereid.c \
40 hash/md5.c \ 40 hash/md5.c \
41diff --git a/test/Makefile.am b/test/Makefile.am 41diff --git a/test/Makefile.am b/test/Makefile.am
42index a75c8ff..e3a1d41 100644 42index d86539a..b32ed2e 100644
43--- a/test/Makefile.am 43--- a/test/Makefile.am
44+++ b/test/Makefile.am 44+++ b/test/Makefile.am
45@@ -36,7 +36,6 @@ check_PROGRAMS = \ 45@@ -36,7 +36,6 @@ check_PROGRAMS = \
@@ -50,6 +50,3 @@ index a75c8ff..e3a1d41 100644
50 fparseln \ 50 fparseln \
51 fpurge \ 51 fpurge \
52 md5 \ 52 md5 \
53--
542.10.2
55
diff --git a/meta/recipes-support/libbsd/libbsd/0003-Fix-build-breaks-due-to-missing-a.out.h.patch b/meta/recipes-support/libbsd/libbsd/0003-Fix-build-breaks-due-to-missing-a.out.h.patch
deleted file mode 100644
index 176d940fc4..0000000000
--- a/meta/recipes-support/libbsd/libbsd/0003-Fix-build-breaks-due-to-missing-a.out.h.patch
+++ /dev/null
@@ -1,130 +0,0 @@
1From a1b93c25311834f2f411e9bfe2e616899ba2122d Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 6 Nov 2016 10:23:55 -0800
4Subject: [PATCH 3/3] Fix build breaks due to missing a.out.h
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7---
8Upstream-Status: Pending
9
10 include/bsd/nlist.h | 1 -
11 include/bsd/nlist.h => src/local-aout.h | 47 ++++++++++++++++++++++-----------
12 src/nlist.c | 9 +++++++
13 3 files changed, 41 insertions(+), 16 deletions(-)
14 copy include/bsd/nlist.h => src/local-aout.h (63%)
15
16diff --git a/include/bsd/nlist.h b/include/bsd/nlist.h
17index 0389ab7..9c7e3d8 100644
18--- a/include/bsd/nlist.h
19+++ b/include/bsd/nlist.h
20@@ -28,7 +28,6 @@
21 #define LIBBSD_NLIST_H
22
23 #include <sys/cdefs.h>
24-#include <a.out.h>
25
26 /* __BEGIN_DECLS */
27 #ifdef __cplusplus
28diff --git a/include/bsd/nlist.h b/src/local-aout.h
29similarity index 63%
30copy from include/bsd/nlist.h
31copy to src/local-aout.h
32index 0389ab7..2adb93e 100644
33--- a/include/bsd/nlist.h
34+++ b/src/local-aout.h
35@@ -1,5 +1,5 @@
36 /*
37- * Copyright © 2009 Guillem Jover <guillem@hadrons.org>
38+ * Copyright © 2016 Khem Raj <raj.khem@gmail.com>
39 *
40 * Redistribution and use in source and binary forms, with or without
41 * modification, are permitted provided that the following conditions
42@@ -24,20 +24,37 @@
43 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
44 */
45
46-#ifndef LIBBSD_NLIST_H
47-#define LIBBSD_NLIST_H
48+#ifndef LIBBSD_LOCAL_AOUT_H
49+#define LIBBSD_LOCAL_AOUT_H
50
51-#include <sys/cdefs.h>
52-#include <a.out.h>
53+#define N_UNDF 0
54+#define N_ABS 2
55+#define N_TEXT 4
56+#define N_DATA 6
57+#define N_BSS 8
58+#define N_FN 15
59+#define N_EXT 1
60+#define N_TYPE 036
61+#define N_STAB 0340
62+#define N_INDR 0xa
63+#define N_SETA 0x14 /* Absolute set element symbol. */
64+#define N_SETT 0x16 /* Text set element symbol. */
65+#define N_SETD 0x18 /* Data set element symbol. */
66+#define N_SETB 0x1A /* Bss set element symbol. */
67+#define N_SETV 0x1C /* Pointer to set vector in data area. */
68
69-/* __BEGIN_DECLS */
70-#ifdef __cplusplus
71-extern "C" {
72-#endif
73-extern int nlist(const char *filename, struct nlist *list);
74-#ifdef __cplusplus
75-}
76-#endif
77-/* __END_DECLS */
78+struct nlist
79+{
80+ union
81+ {
82+ char *n_name;
83+ struct nlist *n_next;
84+ long n_strx;
85+ } n_un;
86+ unsigned char n_type;
87+ char n_other;
88+ short n_desc;
89+ unsigned long n_value;
90+};
91
92-#endif
93+#endif /* LIBBSD_LOCAL_AOUT_H */
94diff --git a/src/nlist.c b/src/nlist.c
95index 0cffe55..625d310 100644
96--- a/src/nlist.c
97+++ b/src/nlist.c
98@@ -40,7 +40,11 @@ static char sccsid[] = "@(#)nlist.c 8.1 (Berkeley) 6/4/93";
99
100 #include <errno.h>
101 #include <fcntl.h>
102+#ifdef __GLIBC__
103 #include <a.out.h>
104+#else
105+#define __NO_A_OUT_SUPPORT
106+#endif
107 #include <stdio.h>
108 #include <string.h>
109 #include <unistd.h>
110@@ -48,12 +52,17 @@ static char sccsid[] = "@(#)nlist.c 8.1 (Berkeley) 6/4/93";
111 #if !defined(__NO_A_OUT_SUPPORT)
112 #define _NLIST_DO_AOUT
113 #endif
114+
115 #define _NLIST_DO_ELF
116
117 #ifdef _NLIST_DO_ELF
118 #include "local-elf.h"
119 #endif
120
121+#ifdef _NLIST_DO_ELF
122+#include "local-aout.h"
123+#endif
124+
125 #define SIZE_T_MAX 0xffffffffU
126
127 #ifdef _NLIST_DO_AOUT
128--
1292.10.2
130
diff --git a/meta/recipes-support/libbsd/libbsd_0.8.3.bb b/meta/recipes-support/libbsd/libbsd_0.8.5.bb
index e85ee2153d..6a6b669d0c 100644
--- a/meta/recipes-support/libbsd/libbsd_0.8.3.bb
+++ b/meta/recipes-support/libbsd/libbsd_0.8.5.bb
@@ -30,7 +30,7 @@ HOMEPAGE = "http://libbsd.freedesktop.org/wiki/"
30# License: public-domain 30# License: public-domain
31# License: public-domain-Colin-Plumb 31# License: public-domain-Colin-Plumb
32LICENSE = "BSD-4-Clause & ISC & PD" 32LICENSE = "BSD-4-Clause & ISC & PD"
33LIC_FILES_CHKSUM = "file://COPYING;md5=0b9c89d861915b86655b96e5e32fa2aa" 33LIC_FILES_CHKSUM = "file://COPYING;md5=08fc4e66be4526715dab09c5fba5e9e8"
34SECTION = "libs" 34SECTION = "libs"
35 35
36SRC_URI = " \ 36SRC_URI = " \
@@ -40,11 +40,10 @@ SRC_URI = " \
40SRC_URI_append_libc-musl = " \ 40SRC_URI_append_libc-musl = " \
41 file://0001-Replace-__BEGIN_DECLS-and-__END_DECLS.patch \ 41 file://0001-Replace-__BEGIN_DECLS-and-__END_DECLS.patch \
42 file://0002-Remove-funopen.patch \ 42 file://0002-Remove-funopen.patch \
43 file://0003-Fix-build-breaks-due-to-missing-a.out.h.patch \
44" 43"
45 44
46SRC_URI[md5sum] = "e935c1bb6cc98a4a43cb1da22795493a" 45SRC_URI[md5sum] = "f1a0dc285f5d21ea40ef5bfc9b647346"
47SRC_URI[sha256sum] = "934b634f4dfd865b6482650b8f522c70ae65c463529de8be907b53c89c3a34a8" 46SRC_URI[sha256sum] = "7647d024f41389305272c263da933a6f2a978213c1801592f47e68d83ac05b28"
48 47
49inherit autotools pkgconfig 48inherit autotools pkgconfig
50 49