diff options
Diffstat (limited to 'meta/recipes-support/libbsd')
-rw-r--r-- | meta/recipes-support/libbsd/libbsd/0001-flopen-Add-missing-fcntl.h-include.patch | 46 | ||||
-rw-r--r-- | meta/recipes-support/libbsd/libbsd_0.12.2.bb (renamed from meta/recipes-support/libbsd/libbsd_0.9.1.bb) | 27 |
2 files changed, 15 insertions, 58 deletions
diff --git a/meta/recipes-support/libbsd/libbsd/0001-flopen-Add-missing-fcntl.h-include.patch b/meta/recipes-support/libbsd/libbsd/0001-flopen-Add-missing-fcntl.h-include.patch deleted file mode 100644 index 8abb876c7b..0000000000 --- a/meta/recipes-support/libbsd/libbsd/0001-flopen-Add-missing-fcntl.h-include.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 13c32916b4baab58d93940d57fea9ff0777f1931 Mon Sep 17 00:00:00 2001 -From: Baruch Siach <baruch@tkos.co.il> -Date: Tue, 5 Jun 2018 19:21:46 +0300 -Subject: [PATCH] flopen: Add missing <fcntl.h> include -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Commit 993828d84ee (Add flopenat() function from FreeBSD) dropped the -fcntl.h header. This breaks the build with musl libc: - -flopen.c: In function ‘vflopenat’: -flopen.c:60:14: error: ‘O_CREAT’ undeclared (first use in this function) - if (flags & O_CREAT) { - ^~~~~~~ - -Restore the fcntl.h header include to fix the build. - -Fixes: commit 993828d84eed0468c6c15b2818e534e6b134b8e4 -Submitted-also-by: parazyd <parazyd@dyne.org> -Signed-off-by: Baruch Siach <baruch@tkos.co.il> -Signed-off-by: Guillem Jover <guillem@hadrons.org> - -Upstream-Status: Backport -[https://gitlab.freedesktop.org/libbsd/libbsd/commit/13c32916b4baab58d93940d57fea9ff0777f1931] - -Signed-off-by: Yi Zhao <yi.zhao@windriver.com> ---- - src/flopen.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/flopen.c b/src/flopen.c -index b9972c9..ff20d07 100644 ---- a/src/flopen.c -+++ b/src/flopen.c -@@ -32,6 +32,7 @@ - #include <sys/stat.h> - - #include <errno.h> -+#include <fcntl.h> - #include <stdarg.h> - #include <unistd.h> - --- -2.7.4 - diff --git a/meta/recipes-support/libbsd/libbsd_0.9.1.bb b/meta/recipes-support/libbsd/libbsd_0.12.2.bb index 2b75cdf956..7d5e88f293 100644 --- a/meta/recipes-support/libbsd/libbsd_0.9.1.bb +++ b/meta/recipes-support/libbsd/libbsd_0.12.2.bb @@ -1,13 +1,10 @@ -# Copyright (C) 2013 Khem Raj <raj.khem@gmail.com> -# Released under the MIT license (see COPYING.MIT for the terms) - SUMMARY = "Library of utility functions from BSD systems" DESCRIPTION = "This library provides useful functions commonly found on BSD systems, \ and lacking on others like GNU systems, thus making it easier to port \ projects with strong BSD origins, without needing to embed the same \ code over and over again on each project." -HOMEPAGE = "http://libbsd.freedesktop.org/wiki/" +HOMEPAGE = "https://libbsd.freedesktop.org/wiki/" # There seems to be more licenses used in the code, I don't think we want to list them all here, complete list: # OE @ ~/projects/libbsd $ grep ^License: COPYING | sort -u # License: BSD-2-clause @@ -27,18 +24,24 @@ HOMEPAGE = "http://libbsd.freedesktop.org/wiki/" # License: ISC-Original # License: public-domain # License: public-domain-Colin-Plumb -LICENSE = "BSD-4-Clause & ISC & PD" -LIC_FILES_CHKSUM = "file://COPYING;md5=b552602fda69e34c753d26de383f33c5" +LICENSE = "BSD-3-Clause & BSD-4-Clause & ISC & PD" +LICENSE:${PN} = "BSD-3-Clause & ISC & PD" +LICENSE:${PN}-dbg = "BSD-3-Clause & ISC & PD" +LICENSE:${PN}-dev = "BSD-3-Clause & ISC & PD" +LICENSE:${PN}-doc = "BSD-3-Clause & BSD-4-Clause & ISC & PD" +LICENSE:${PN}-locale = "BSD-3-Clause & ISC & PD" +LICENSE:${PN}-src = "BSD-3-Clause & ISC & PD" +LICENSE:${PN}-staticdev = "BSD-3-Clause & ISC & PD" + +LIC_FILES_CHKSUM = "file://COPYING;md5=9b087a0981a1fcad42efbba6d4925a0f" SECTION = "libs" -SRC_URI = " \ - http://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ - file://0001-flopen-Add-missing-fcntl.h-include.patch \ -" +SRC_URI = "https://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "a74b80c4143afa032c90226a4518fffe" -SRC_URI[sha256sum] = "56d835742327d69faccd16955a60b6dcf30684a8da518c4eca0ac713b9e0a7a4" +SRC_URI[sha256sum] = "b88cc9163d0c652aaf39a99991d974ddba1c3a9711db8f1b5838af2a14731014" inherit autotools pkgconfig +DEPENDS += "libmd" + BBCLASSEXTEND = "native nativesdk" |