diff options
| -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.10.0.bb (renamed from meta/recipes-support/libbsd/libbsd_0.9.1.bb) | 11 |
2 files changed, 4 insertions, 53 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 @@ | |||
| 1 | From 13c32916b4baab58d93940d57fea9ff0777f1931 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Baruch Siach <baruch@tkos.co.il> | ||
| 3 | Date: Tue, 5 Jun 2018 19:21:46 +0300 | ||
| 4 | Subject: [PATCH] flopen: Add missing <fcntl.h> include | ||
| 5 | MIME-Version: 1.0 | ||
| 6 | Content-Type: text/plain; charset=UTF-8 | ||
| 7 | Content-Transfer-Encoding: 8bit | ||
| 8 | |||
| 9 | Commit 993828d84ee (Add flopenat() function from FreeBSD) dropped the | ||
| 10 | fcntl.h header. This breaks the build with musl libc: | ||
| 11 | |||
| 12 | flopen.c: In function ‘vflopenat’: | ||
| 13 | flopen.c:60:14: error: ‘O_CREAT’ undeclared (first use in this function) | ||
| 14 | if (flags & O_CREAT) { | ||
| 15 | ^~~~~~~ | ||
| 16 | |||
| 17 | Restore the fcntl.h header include to fix the build. | ||
| 18 | |||
| 19 | Fixes: commit 993828d84eed0468c6c15b2818e534e6b134b8e4 | ||
| 20 | Submitted-also-by: parazyd <parazyd@dyne.org> | ||
| 21 | Signed-off-by: Baruch Siach <baruch@tkos.co.il> | ||
| 22 | Signed-off-by: Guillem Jover <guillem@hadrons.org> | ||
| 23 | |||
| 24 | Upstream-Status: Backport | ||
| 25 | [https://gitlab.freedesktop.org/libbsd/libbsd/commit/13c32916b4baab58d93940d57fea9ff0777f1931] | ||
| 26 | |||
| 27 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | ||
| 28 | --- | ||
| 29 | src/flopen.c | 1 + | ||
| 30 | 1 file changed, 1 insertion(+) | ||
| 31 | |||
| 32 | diff --git a/src/flopen.c b/src/flopen.c | ||
| 33 | index b9972c9..ff20d07 100644 | ||
| 34 | --- a/src/flopen.c | ||
| 35 | +++ b/src/flopen.c | ||
| 36 | @@ -32,6 +32,7 @@ | ||
| 37 | #include <sys/stat.h> | ||
| 38 | |||
| 39 | #include <errno.h> | ||
| 40 | +#include <fcntl.h> | ||
| 41 | #include <stdarg.h> | ||
| 42 | #include <unistd.h> | ||
| 43 | |||
| 44 | -- | ||
| 45 | 2.7.4 | ||
| 46 | |||
diff --git a/meta/recipes-support/libbsd/libbsd_0.9.1.bb b/meta/recipes-support/libbsd/libbsd_0.10.0.bb index 2b75cdf956..eaf244a3b7 100644 --- a/meta/recipes-support/libbsd/libbsd_0.9.1.bb +++ b/meta/recipes-support/libbsd/libbsd_0.10.0.bb | |||
| @@ -28,16 +28,13 @@ HOMEPAGE = "http://libbsd.freedesktop.org/wiki/" | |||
| 28 | # License: public-domain | 28 | # License: public-domain |
| 29 | # License: public-domain-Colin-Plumb | 29 | # License: public-domain-Colin-Plumb |
| 30 | LICENSE = "BSD-4-Clause & ISC & PD" | 30 | LICENSE = "BSD-4-Clause & ISC & PD" |
| 31 | LIC_FILES_CHKSUM = "file://COPYING;md5=b552602fda69e34c753d26de383f33c5" | 31 | LIC_FILES_CHKSUM = "file://COPYING;md5=2120be0173469a06ed185b688e0e1ae0" |
| 32 | SECTION = "libs" | 32 | SECTION = "libs" |
| 33 | 33 | ||
| 34 | SRC_URI = " \ | 34 | SRC_URI = "http://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz" |
| 35 | http://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ | ||
| 36 | file://0001-flopen-Add-missing-fcntl.h-include.patch \ | ||
| 37 | " | ||
| 38 | 35 | ||
| 39 | SRC_URI[md5sum] = "a74b80c4143afa032c90226a4518fffe" | 36 | SRC_URI[md5sum] = "ead96d240d02faa5b921c0aa50c812b5" |
| 40 | SRC_URI[sha256sum] = "56d835742327d69faccd16955a60b6dcf30684a8da518c4eca0ac713b9e0a7a4" | 37 | SRC_URI[sha256sum] = "34b8adc726883d0e85b3118fa13605e179a62b31ba51f676136ecb2d0bc1a887" |
| 41 | 38 | ||
| 42 | inherit autotools pkgconfig | 39 | inherit autotools pkgconfig |
| 43 | 40 | ||
