mirror of
https://git.yoctoproject.org/poky
synced 2026-09-15 06:49:33 +02:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
3c24505d16
commit
73fc26cfcd
@@ -15,17 +15,17 @@ Upstream-Status: Inappropriate [musl specific]
|
|||||||
3 files changed, 3 deletions(-)
|
3 files changed, 3 deletions(-)
|
||||||
|
|
||||||
diff --git a/man/Makefile.am b/man/Makefile.am
|
diff --git a/man/Makefile.am b/man/Makefile.am
|
||||||
index e4d6e4a..c701d94 100644
|
index 28192c0..a22787d 100644
|
||||||
--- a/man/Makefile.am
|
--- a/man/Makefile.am
|
||||||
+++ b/man/Makefile.am
|
+++ b/man/Makefile.am
|
||||||
@@ -29,7 +29,6 @@ dist_man_MANS = \
|
@@ -168,7 +168,6 @@ dist_man_MANS = \
|
||||||
flopen.3 \
|
fmtcheck.3bsd \
|
||||||
fmtcheck.3 \
|
fparseln.3bsd \
|
||||||
fparseln.3 \
|
fpurge.3bsd \
|
||||||
- funopen.3bsd \
|
- funopen.3bsd \
|
||||||
getbsize.3 \
|
getbsize.3bsd \
|
||||||
getmode.3 \
|
getmode.3bsd \
|
||||||
getpeereid.3 \
|
getpeereid.3bsd \
|
||||||
diff --git a/src/Makefile.am b/src/Makefile.am
|
diff --git a/src/Makefile.am b/src/Makefile.am
|
||||||
index ad83dbf..13225a3 100644
|
index ad83dbf..13225a3 100644
|
||||||
--- a/src/Makefile.am
|
--- a/src/Makefile.am
|
||||||
@@ -39,7 +39,7 @@ index ad83dbf..13225a3 100644
|
|||||||
getpeereid.c \
|
getpeereid.c \
|
||||||
hash/md5.c \
|
hash/md5.c \
|
||||||
diff --git a/test/Makefile.am b/test/Makefile.am
|
diff --git a/test/Makefile.am b/test/Makefile.am
|
||||||
index a75c8ff..e3a1d41 100644
|
index d86539a..b32ed2e 100644
|
||||||
--- a/test/Makefile.am
|
--- a/test/Makefile.am
|
||||||
+++ b/test/Makefile.am
|
+++ b/test/Makefile.am
|
||||||
@@ -36,7 +36,6 @@ check_PROGRAMS = \
|
@@ -36,7 +36,6 @@ check_PROGRAMS = \
|
||||||
@@ -50,6 +50,3 @@ index a75c8ff..e3a1d41 100644
|
|||||||
fparseln \
|
fparseln \
|
||||||
fpurge \
|
fpurge \
|
||||||
md5 \
|
md5 \
|
||||||
--
|
|
||||||
2.10.2
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,130 +0,0 @@
|
|||||||
From a1b93c25311834f2f411e9bfe2e616899ba2122d Mon Sep 17 00:00:00 2001
|
|
||||||
From: Khem Raj <raj.khem@gmail.com>
|
|
||||||
Date: Sun, 6 Nov 2016 10:23:55 -0800
|
|
||||||
Subject: [PATCH 3/3] Fix build breaks due to missing a.out.h
|
|
||||||
|
|
||||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
||||||
---
|
|
||||||
Upstream-Status: Pending
|
|
||||||
|
|
||||||
include/bsd/nlist.h | 1 -
|
|
||||||
include/bsd/nlist.h => src/local-aout.h | 47 ++++++++++++++++++++++-----------
|
|
||||||
src/nlist.c | 9 +++++++
|
|
||||||
3 files changed, 41 insertions(+), 16 deletions(-)
|
|
||||||
copy include/bsd/nlist.h => src/local-aout.h (63%)
|
|
||||||
|
|
||||||
diff --git a/include/bsd/nlist.h b/include/bsd/nlist.h
|
|
||||||
index 0389ab7..9c7e3d8 100644
|
|
||||||
--- a/include/bsd/nlist.h
|
|
||||||
+++ b/include/bsd/nlist.h
|
|
||||||
@@ -28,7 +28,6 @@
|
|
||||||
#define LIBBSD_NLIST_H
|
|
||||||
|
|
||||||
#include <sys/cdefs.h>
|
|
||||||
-#include <a.out.h>
|
|
||||||
|
|
||||||
/* __BEGIN_DECLS */
|
|
||||||
#ifdef __cplusplus
|
|
||||||
diff --git a/include/bsd/nlist.h b/src/local-aout.h
|
|
||||||
similarity index 63%
|
|
||||||
copy from include/bsd/nlist.h
|
|
||||||
copy to src/local-aout.h
|
|
||||||
index 0389ab7..2adb93e 100644
|
|
||||||
--- a/include/bsd/nlist.h
|
|
||||||
+++ b/src/local-aout.h
|
|
||||||
@@ -1,5 +1,5 @@
|
|
||||||
/*
|
|
||||||
- * Copyright © 2009 Guillem Jover <guillem@hadrons.org>
|
|
||||||
+ * Copyright © 2016 Khem Raj <raj.khem@gmail.com>
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions
|
|
||||||
@@ -24,20 +24,37 @@
|
|
||||||
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
-#ifndef LIBBSD_NLIST_H
|
|
||||||
-#define LIBBSD_NLIST_H
|
|
||||||
+#ifndef LIBBSD_LOCAL_AOUT_H
|
|
||||||
+#define LIBBSD_LOCAL_AOUT_H
|
|
||||||
|
|
||||||
-#include <sys/cdefs.h>
|
|
||||||
-#include <a.out.h>
|
|
||||||
+#define N_UNDF 0
|
|
||||||
+#define N_ABS 2
|
|
||||||
+#define N_TEXT 4
|
|
||||||
+#define N_DATA 6
|
|
||||||
+#define N_BSS 8
|
|
||||||
+#define N_FN 15
|
|
||||||
+#define N_EXT 1
|
|
||||||
+#define N_TYPE 036
|
|
||||||
+#define N_STAB 0340
|
|
||||||
+#define N_INDR 0xa
|
|
||||||
+#define N_SETA 0x14 /* Absolute set element symbol. */
|
|
||||||
+#define N_SETT 0x16 /* Text set element symbol. */
|
|
||||||
+#define N_SETD 0x18 /* Data set element symbol. */
|
|
||||||
+#define N_SETB 0x1A /* Bss set element symbol. */
|
|
||||||
+#define N_SETV 0x1C /* Pointer to set vector in data area. */
|
|
||||||
|
|
||||||
-/* __BEGIN_DECLS */
|
|
||||||
-#ifdef __cplusplus
|
|
||||||
-extern "C" {
|
|
||||||
-#endif
|
|
||||||
-extern int nlist(const char *filename, struct nlist *list);
|
|
||||||
-#ifdef __cplusplus
|
|
||||||
-}
|
|
||||||
-#endif
|
|
||||||
-/* __END_DECLS */
|
|
||||||
+struct nlist
|
|
||||||
+{
|
|
||||||
+ union
|
|
||||||
+ {
|
|
||||||
+ char *n_name;
|
|
||||||
+ struct nlist *n_next;
|
|
||||||
+ long n_strx;
|
|
||||||
+ } n_un;
|
|
||||||
+ unsigned char n_type;
|
|
||||||
+ char n_other;
|
|
||||||
+ short n_desc;
|
|
||||||
+ unsigned long n_value;
|
|
||||||
+};
|
|
||||||
|
|
||||||
-#endif
|
|
||||||
+#endif /* LIBBSD_LOCAL_AOUT_H */
|
|
||||||
diff --git a/src/nlist.c b/src/nlist.c
|
|
||||||
index 0cffe55..625d310 100644
|
|
||||||
--- a/src/nlist.c
|
|
||||||
+++ b/src/nlist.c
|
|
||||||
@@ -40,7 +40,11 @@ static char sccsid[] = "@(#)nlist.c 8.1 (Berkeley) 6/4/93";
|
|
||||||
|
|
||||||
#include <errno.h>
|
|
||||||
#include <fcntl.h>
|
|
||||||
+#ifdef __GLIBC__
|
|
||||||
#include <a.out.h>
|
|
||||||
+#else
|
|
||||||
+#define __NO_A_OUT_SUPPORT
|
|
||||||
+#endif
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
@@ -48,12 +52,17 @@ static char sccsid[] = "@(#)nlist.c 8.1 (Berkeley) 6/4/93";
|
|
||||||
#if !defined(__NO_A_OUT_SUPPORT)
|
|
||||||
#define _NLIST_DO_AOUT
|
|
||||||
#endif
|
|
||||||
+
|
|
||||||
#define _NLIST_DO_ELF
|
|
||||||
|
|
||||||
#ifdef _NLIST_DO_ELF
|
|
||||||
#include "local-elf.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+#ifdef _NLIST_DO_ELF
|
|
||||||
+#include "local-aout.h"
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
#define SIZE_T_MAX 0xffffffffU
|
|
||||||
|
|
||||||
#ifdef _NLIST_DO_AOUT
|
|
||||||
--
|
|
||||||
2.10.2
|
|
||||||
|
|
||||||
@@ -30,7 +30,7 @@ HOMEPAGE = "http://libbsd.freedesktop.org/wiki/"
|
|||||||
# License: public-domain
|
# License: public-domain
|
||||||
# License: public-domain-Colin-Plumb
|
# License: public-domain-Colin-Plumb
|
||||||
LICENSE = "BSD-4-Clause & ISC & PD"
|
LICENSE = "BSD-4-Clause & ISC & PD"
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=0b9c89d861915b86655b96e5e32fa2aa"
|
LIC_FILES_CHKSUM = "file://COPYING;md5=08fc4e66be4526715dab09c5fba5e9e8"
|
||||||
SECTION = "libs"
|
SECTION = "libs"
|
||||||
|
|
||||||
SRC_URI = " \
|
SRC_URI = " \
|
||||||
@@ -40,11 +40,10 @@ SRC_URI = " \
|
|||||||
SRC_URI_append_libc-musl = " \
|
SRC_URI_append_libc-musl = " \
|
||||||
file://0001-Replace-__BEGIN_DECLS-and-__END_DECLS.patch \
|
file://0001-Replace-__BEGIN_DECLS-and-__END_DECLS.patch \
|
||||||
file://0002-Remove-funopen.patch \
|
file://0002-Remove-funopen.patch \
|
||||||
file://0003-Fix-build-breaks-due-to-missing-a.out.h.patch \
|
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI[md5sum] = "e935c1bb6cc98a4a43cb1da22795493a"
|
SRC_URI[md5sum] = "f1a0dc285f5d21ea40ef5bfc9b647346"
|
||||||
SRC_URI[sha256sum] = "934b634f4dfd865b6482650b8f522c70ae65c463529de8be907b53c89c3a34a8"
|
SRC_URI[sha256sum] = "7647d024f41389305272c263da933a6f2a978213c1801592f47e68d83ac05b28"
|
||||||
|
|
||||||
inherit autotools pkgconfig
|
inherit autotools pkgconfig
|
||||||
|
|
||||||
Reference in New Issue
Block a user