From: Rosen Penev Date: Thu, 20 Feb 2020 03:42:35 +0000 (-0800) Subject: libbsd: update to 0.10.0 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=499ebb791fcc83047418f68316424202e5362fc7;p=openwrt%2Fstaging%2Fjogo.git libbsd: update to 0.10.0 Removed all upstream patches. Added PKG_BUILD_PARALLEL for faster compilation. Small Makefile rearrangements for consistency between packages. Signed-off-by: Rosen Penev --- diff --git a/package/libs/libbsd/Makefile b/package/libs/libbsd/Makefile index 63b9ceafc3..26e05f79a1 100644 --- a/package/libs/libbsd/Makefile +++ b/package/libs/libbsd/Makefile @@ -1,19 +1,20 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libbsd -PKG_VERSION:=0.8.7 -PKG_RELEASE:=3 +PKG_VERSION:=0.10.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -PKG_HASH:=f548f10e5af5a08b1e22889ce84315b1ebe41505b015c9596bad03fd13a12b31 PKG_SOURCE_URL:=https://libbsd.freedesktop.org/releases +PKG_HASH:=34b8adc726883d0e85b3118fa13605e179a62b31ba51f676136ecb2d0bc1a887 PKG_LICENSE:=BSD-4-Clause PKG_LICENSE_FILES:=COPYING -include $(INCLUDE_DIR)/package.mk - PKG_INSTALL:=1 +PKG_BUILD_PARALLEL:=1 + +include $(INCLUDE_DIR)/package.mk define Package/libbsd SECTION:=libs diff --git a/package/libs/libbsd/patches/001-handle-systems-missing-sys_cdefs.h.patch b/package/libs/libbsd/patches/001-handle-systems-missing-sys_cdefs.h.patch deleted file mode 100644 index 108e967722..0000000000 --- a/package/libs/libbsd/patches/001-handle-systems-missing-sys_cdefs.h.patch +++ /dev/null @@ -1,195 +0,0 @@ -From 11ec8f1e5dfa1c10e0c9fb94879b6f5b96ba52dd Mon Sep 17 00:00:00 2001 -From: Guillem Jover -Date: Tue, 6 Mar 2018 01:41:35 +0100 -Subject: Handle systems missing - -This is a non-portable header, and we cannot expect it to be provided by -the system libc (e.g. musl). We just need and rely on declaration that -we have defined ourselves in our own . So we switch to -only ever assume that. - -Fixes: https://bugs.freedesktop.org/105281 ---- - include/bsd/libutil.h | 4 ++++ - include/bsd/md5.h | 4 ++++ - include/bsd/nlist.h | 4 ++++ - include/bsd/readpassphrase.h | 4 ++++ - include/bsd/stdlib.h | 4 ++++ - include/bsd/string.h | 4 ++++ - include/bsd/stringlist.h | 5 +++++ - include/bsd/sys/queue.h | 4 ++++ - include/bsd/sys/tree.h | 4 ++++ - include/bsd/timeconv.h | 4 ++++ - include/bsd/vis.h | 4 ++++ - include/bsd/wchar.h | 4 ++++ - 12 files changed, 49 insertions(+) - ---- a/include/bsd/libutil.h -+++ b/include/bsd/libutil.h -@@ -40,7 +40,11 @@ - #define LIBBSD_LIBUTIL_H - - #include -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - #include - #include - #include ---- a/include/bsd/md5.h -+++ b/include/bsd/md5.h -@@ -27,7 +27,11 @@ typedef struct MD5Context { - uint8_t buffer[MD5_BLOCK_LENGTH]; /* input buffer */ - } MD5_CTX; - -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - #include - - __BEGIN_DECLS ---- a/include/bsd/nlist.h -+++ b/include/bsd/nlist.h -@@ -27,7 +27,11 @@ - #ifndef LIBBSD_NLIST_H - #define LIBBSD_NLIST_H - -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - - struct nlist { - union { ---- a/include/bsd/readpassphrase.h -+++ b/include/bsd/readpassphrase.h -@@ -31,7 +31,11 @@ - #define RPP_SEVENBIT 0x10 /* Strip the high bit from input. */ - #define RPP_STDIN 0x20 /* Read from stdin, not /dev/tty */ - -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - #include - - __BEGIN_DECLS ---- a/include/bsd/stdlib.h -+++ b/include/bsd/stdlib.h -@@ -42,7 +42,11 @@ - #ifndef LIBBSD_STDLIB_H - #define LIBBSD_STDLIB_H - -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - #include - #include - ---- a/include/bsd/string.h -+++ b/include/bsd/string.h -@@ -33,7 +33,11 @@ - #ifndef LIBBSD_STRING_H - #define LIBBSD_STRING_H - -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - #include - - __BEGIN_DECLS ---- a/include/bsd/stringlist.h -+++ b/include/bsd/stringlist.h -@@ -31,7 +31,12 @@ - - #ifndef LIBBSD_STRINGLIST_H - #define LIBBSD_STRINGLIST_H -+ -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - #include - - /* ---- a/include/bsd/sys/queue.h -+++ b/include/bsd/sys/queue.h -@@ -33,7 +33,11 @@ - #ifndef LIBBSD_SYS_QUEUE_H - #define LIBBSD_SYS_QUEUE_H - -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - - /* - * This file defines four types of data structures: singly-linked lists, ---- a/include/bsd/sys/tree.h -+++ b/include/bsd/sys/tree.h -@@ -30,7 +30,11 @@ - #ifndef LIBBSD_SYS_TREE_H - #define LIBBSD_SYS_TREE_H - -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - - /* - * This file defines data structures for different types of trees: ---- a/include/bsd/timeconv.h -+++ b/include/bsd/timeconv.h -@@ -41,7 +41,11 @@ - #ifndef LIBBSD_TIMECONV_H - #define LIBBSD_TIMECONV_H - -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - #include - #include - ---- a/include/bsd/vis.h -+++ b/include/bsd/vis.h -@@ -72,7 +72,11 @@ - */ - #define UNVIS_END 1 /* no more characters */ - -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - - __BEGIN_DECLS - char *vis(char *, int, int, int); ---- a/include/bsd/wchar.h -+++ b/include/bsd/wchar.h -@@ -40,7 +40,11 @@ - #define LIBBSD_WCHAR_H - - #include -+#ifdef LIBBSD_OVERLAY - #include -+#else -+#include -+#endif - #include - - __BEGIN_DECLS diff --git a/package/libs/libbsd/patches/002-fix_function_declaration_protection_for_glibc_already_providing_them.patch b/package/libs/libbsd/patches/002-fix_function_declaration_protection_for_glibc_already_providing_them.patch deleted file mode 100644 index 3ce1d654c9..0000000000 --- a/package/libs/libbsd/patches/002-fix_function_declaration_protection_for_glibc_already_providing_them.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 1f8a3f7bccfc84b195218ad0086ebd57049c3490 Mon Sep 17 00:00:00 2001 -From: Guillem Jover -Date: Tue, 6 Mar 2018 01:39:45 +0100 -Subject: Fix function declaration protection for glibc already providing them -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -On non-glibc based systems we cannot unconditionally use the -__GLIBC_PREREQ macro as it gets expanded before evaluation. Instead, -if it is undefined, define it to 0. - -We should also always declare these functions on non-glibc based -systems. And on systems with a new enough glibc, which provides these -functions, we should still provide the declarations if _GNU_SOURCE -is *not* defined. - -Reported-by: Jörg Krause ---- - include/bsd/stdlib.h | 3 ++- - include/bsd/string.h | 3 ++- - include/bsd/sys/cdefs.h | 8 ++++++++ - 3 files changed, 12 insertions(+), 2 deletions(-) - ---- a/include/bsd/stdlib.h -+++ b/include/bsd/stdlib.h -@@ -71,7 +71,8 @@ int sradixsort(const unsigned char **bas - const unsigned char *table, unsigned endbyte); - - void *reallocf(void *ptr, size_t size); --#if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 26) -+#if !defined(__GLIBC__) || \ -+ (defined(__GLIBC__) && (!__GLIBC_PREREQ(2, 26) || !defined(_GNU_SOURCE))) - void *reallocarray(void *ptr, size_t nmemb, size_t size); - #endif - ---- a/include/bsd/string.h -+++ b/include/bsd/string.h -@@ -46,7 +46,8 @@ size_t strlcat(char *dst, const char *sr - char *strnstr(const char *str, const char *find, size_t str_len); - void strmode(mode_t mode, char *str); - --#if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 25) -+#if !defined(__GLIBC__) || \ -+ (defined(__GLIBC__) && (!__GLIBC_PREREQ(2, 25) || !defined(_GNU_SOURCE))) - void explicit_bzero(void *buf, size_t len); - #endif - __END_DECLS ---- a/include/bsd/sys/cdefs.h -+++ b/include/bsd/sys/cdefs.h -@@ -59,6 +59,14 @@ - #endif - - /* -+ * On non-glibc based systems, we cannot unconditionally use the -+ * __GLIBC_PREREQ macro as it gets expanded before evaluation. -+ */ -+#ifndef __GLIBC_PREREQ -+#define __GLIBC_PREREQ(maj, min) 0 -+#endif -+ -+/* - * Some kFreeBSD headers expect those macros to be set for sanity checks. - */ - #ifndef _SYS_CDEFS_H_ diff --git a/package/libs/libbsd/patches/010-fix-arc.patch b/package/libs/libbsd/patches/010-fix-arc.patch deleted file mode 100644 index 64948c6d67..0000000000 --- a/package/libs/libbsd/patches/010-fix-arc.patch +++ /dev/null @@ -1,30 +0,0 @@ -From f60b6777cc2047f9845de2c88cf092b045c160c0 Mon Sep 17 00:00:00 2001 -From: Rosen Penev -Date: Fri, 17 May 2019 01:44:56 +0000 -Subject: [PATCH] local-elf: Add ARC support - -Signed-off-by: Rosen Penev ---- - src/local-elf.h | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/src/local-elf.h b/src/local-elf.h -index 83ca253..b90baf3 100644 ---- a/src/local-elf.h -+++ b/src/local-elf.h -@@ -53,6 +53,12 @@ - #endif - #define ELF_TARG_DATA ELFDATA2LSB - -+#elif defined (__arc__) -+ -+#define ELF_TARG_MACH EM_ARC -+#define ELF_TARG_CLASS ELFCLASS32 -+#define ELF_TARG_DATA ELFDATA2LSB -+ - #elif defined(__arm__) - - #define ELF_TARG_MACH EM_ARM --- -2.18.1 -