[gentoo-commits] repo/gentoo:master commit in: dev-libs/libbsd/files/, dev-libs/libbsd/

[gentoo-commits] repo/gentoo:master commit in: dev-libs/libbsd/files/, dev-libs/libbsd/

[Sam James]

commit:     c5750781de5450ed5a3c8e3a37fe6026911623c9
Author:     Violet Purcell <vimproved <AT> inventati <DOT> org>
AuthorDate: Mon Feb 13 04:51:50 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 13 04:59:58 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5750781

dev-libs/libbsd: Backport Clang 16 configure fix

Signed-off-by: Violet Purcell <vimproved <AT> inventati.org>
Closes: https://github.com/gentoo/gentoo/pull/29566
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...x-version-script-linker-support-detection.patch | 36 ++++++++++++++++++++++
 dev-libs/libbsd/libbsd-0.11.7-r2.ebuild            | 13 +++++++-
 2 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/dev-libs/libbsd/files/libbsd-build-Fix-version-script-linker-support-detection.patch b/dev-libs/libbsd/files/libbsd-build-Fix-version-script-linker-support-detection.patch
new file mode 100644
index 000000000000..2e45429021ff
--- /dev/null
+++ b/dev-libs/libbsd/files/libbsd-build-Fix-version-script-linker-support-detection.patch
@@ -0,0 +1,36 @@
+From dec783dce5a7131e232a06e63a544645b5463dd8 Mon Sep 17 00:00:00 2001
+From: Guillem Jover <guillem@hadrons.org>
+Date: Sun, 12 Feb 2023 23:55:09 +0100
+Subject: [PATCH] build: Fix version script linker support detection
+
+When the linker uses --no-undefined-version either specified by the user
+or as the default behavior (such as with newer clang >= 16 releases),
+a missing symbol definition will cause a linker error if that symbol is
+listed in the version script.
+
+Upstream commit: https://gitlab.freedesktop.org/libbsd/libbsd/-/commit/dec783dce5a7131e232a06e63a544645b5463dd8
+
+---
+ configure.ac | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 17d113c..7d17a93 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -33,7 +33,11 @@ AC_CACHE_CHECK([if ld supports --version-script flag],
+     save_LDFLAGS=$LDFLAGS
+     LDFLAGS="$LDFLAGS -Wl,--version-script=conftest.map"
+     AC_LINK_IFELSE([
+-      AC_LANG_PROGRAM([], [])
++	AC_LANG_PROGRAM([[
++extern int symbol(void);
++int symbol(void) { return 0; }
++]], [[
++]])
+     ], [
+       libbsd_cv_version_script=yes
+     ], [
+-- 
+2.39.1.615.ga0422de7ea.dirty
+

diff --git a/dev-libs/libbsd/libbsd-0.11.7-r2.ebuild b/dev-libs/libbsd/libbsd-0.11.7-r2.ebuild
index 0fcfb6bd563b..c70b6bdb49f3 100644
--- a/dev-libs/libbsd/libbsd-0.11.7-r2.ebuild
+++ b/dev-libs/libbsd/libbsd-0.11.7-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/guillemjover.asc
-inherit multilib multilib-minimal verify-sig
+inherit autotools multilib multilib-minimal verify-sig
 
 DESCRIPTION="Library to provide useful functions commonly found on BSD systems"
 HOMEPAGE="https://libbsd.freedesktop.org/wiki/ https://gitlab.freedesktop.org/libbsd/libbsd"
@@ -22,6 +22,17 @@ DEPEND="${RDEPEND}
 "
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-guillemjover )"
 
+PATCHES=(
+	"${FILESDIR}/libbsd-build-Fix-version-script-linker-support-detection.patch"
+)
+
+src_prepare() {
+	default
+
+	# Drop on next release, only needed for lld patch
+	eautoreconf
+}
+
 multilib_src_configure() {
 	# The build system will install libbsd-ctor.a despite USE="-static-libs"
 	# which is correct, see:

[gentoo-commits] repo/gentoo:master commit in: dev-libs/libbsd/files/, dev-libs/libbsd/

[Sam James]

commit:     6d35e642cd7c454256eb22759ac1afe28a0c38ef
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue May  9 13:42:21 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May  9 13:43:39 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d35e642

dev-libs/libbsd: fix build w/ musl-1.2.4

Closes: https://bugs.gentoo.org/905912
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/libbsd/files/libbsd-0.11.7-musl-lfs.patch | 32 ++++++++++++++++++++++
 dev-libs/libbsd/libbsd-0.11.7-r2.ebuild            |  1 +
 2 files changed, 33 insertions(+)

diff --git a/dev-libs/libbsd/files/libbsd-0.11.7-musl-lfs.patch b/dev-libs/libbsd/files/libbsd-0.11.7-musl-lfs.patch
new file mode 100644
index 000000000000..41cc27e75237
--- /dev/null
+++ b/dev-libs/libbsd/files/libbsd-0.11.7-musl-lfs.patch
@@ -0,0 +1,32 @@
+https://bugs.gentoo.org/905912
+https://gitlab.freedesktop.org/libbsd/libbsd/-/merge_requests/24
+
+From c36c29f014b0ef56a3aef984fa40b0e100b6f419 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Thu, 15 Dec 2022 09:02:22 -0800
+Subject: [PATCH] funopen: Replace off64_t with off_t in funopen_seek
+
+AC_SYS_LARGEFILE in configure.ac is setting needed defines to make
+64bit off_t on relevant platforms.
+
+Fixes build on musl
+
+| ../../../../../../../../workspace/sources/libbsd/src/funopen.c:68:28: error: unknown type name 'off64_t'; did you mean 'off_t'?
+| funopen_seek(void *cookie, off64_t *offset, int whence)
+|                            ^~~~~~~
+|                            off_t
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/src/funopen.c
++++ b/src/funopen.c
+@@ -65,7 +65,7 @@ funopen_write(void *cookie, const char *buf, size_t size)
+ }
+ 
+ static int
+-funopen_seek(void *cookie, off64_t *offset, int whence)
++funopen_seek(void *cookie, off_t *offset, int whence)
+ {
+ 	struct funopen_cookie *cookiewrap = cookie;
+ 	off_t soff = *offset;
+-- 
+GitLab

diff --git a/dev-libs/libbsd/libbsd-0.11.7-r2.ebuild b/dev-libs/libbsd/libbsd-0.11.7-r2.ebuild
index 1383b676c74a..cc3316c69e98 100644
--- a/dev-libs/libbsd/libbsd-0.11.7-r2.ebuild
+++ b/dev-libs/libbsd/libbsd-0.11.7-r2.ebuild
@@ -24,6 +24,7 @@ BDEPEND="verify-sig? ( sec-keys/openpgp-keys-guillemjover )"
 
 PATCHES=(
 	"${FILESDIR}/libbsd-build-Fix-version-script-linker-support-detection.patch"
+	"${FILESDIR}/libbsd-0.11.7-musl-lfs.patch"
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: dev-libs/libbsd/files/, dev-libs/libbsd/

[Sam James]

commit:     b28853e0d461aa9fa6edb7b986a1926aa2fed048
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 25 16:27:59 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 25 16:36:59 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b28853e0

dev-libs/libbsd: add 0.11.5, drop 0.11.4

Mostly just upstreams our OBJDUMP patch.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/libbsd/Manifest                           |  2 +-
 .../libbsd-0.11.4-build-respect-OBJDUMP.patch      | 26 ----------------------
 .../{libbsd-0.11.4.ebuild => libbsd-0.11.5.ebuild} | 13 +----------
 3 files changed, 2 insertions(+), 39 deletions(-)

diff --git a/dev-libs/libbsd/Manifest b/dev-libs/libbsd/Manifest
index 6d0fb03107da..c47ce9ccb000 100644
--- a/dev-libs/libbsd/Manifest
+++ b/dev-libs/libbsd/Manifest
@@ -1,2 +1,2 @@
 DIST libbsd-0.11.3.tar.xz 399712 BLAKE2B 1af04b8fcbc0bfa59fba549639d61a33ac934fe7ee42b506d1b0452e0b836b0bfdd3d8739de90465be46fe6a9d326a2d11bcf72280aa19ccba81db5da6d63d89 SHA512 a7015ea1ffa3766b1a4690526a25231898ad8275149b31fb6801082450172249997c36165626d101ffce53b59767a46676eebc0806426922fe4e773a0376c1f5
-DIST libbsd-0.11.4.tar.xz 409148 BLAKE2B f6d71ac7b823cd8e46dbdefa044bdd6a026f7b1f4f5dcc6d7b9ad00851e1dff783ce55bdcfdea0896b98ed1f283df1a9baeaa55ca426c6653511d00e33fa63dc SHA512 59b903389529ff69e8c4644483cc991ae1e574384ef8ea37b4552766cb72fdc254b1e64edf6d4594c98b520cd9fef8543fe002b2fe04da7a25750809d040b995
+DIST libbsd-0.11.5.tar.xz 409972 BLAKE2B 00c89ad1be351e7851538eac2744f5aef87b5937330d514d17af8a20a04bc6eab0e2bda61d0080da1d1439306b3b191ab68b4bc4cd8558ff0adfe402bfbf5b52 SHA512 c52c19eddd53630aca14f9f6221f7b84aa9cc798b4bb91e867822b161793313aab872ac1c0350d29312a72fee6e2061f3910ff918b724ec171d8c9de5837c841

diff --git a/dev-libs/libbsd/files/libbsd-0.11.4-build-respect-OBJDUMP.patch b/dev-libs/libbsd/files/libbsd-0.11.4-build-respect-OBJDUMP.patch
deleted file mode 100644
index 2f9df4475bbe..000000000000
--- a/dev-libs/libbsd/files/libbsd-0.11.4-build-respect-OBJDUMP.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://gitlab.freedesktop.org/libbsd/libbsd/-/merge_requests/16
-
-From 3fbb632b460a4f2d37036cf3959736938494459e Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sun, 23 Jan 2022 15:36:55 +0000
-Subject: [PATCH] build: respect $(OBJDUMP)
-
-We already search for it in `./configure` so let's respect
-the result of that search.
-
-This helps with cross-compilation and any other cases
-where one might want to choose a different toolchain.
-
-Bug: https://bugs.gentoo.org/831863
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -141,7 +141,7 @@ TRANSPARENT_LIBMD_DEPENDS = format.ld
- 
- format.ld:
- 	$(CC) -shared -nostdlib -nostartfiles -x assembler /dev/null -o $@.so
--	objdump -f $@.so | sed -n 's/.*file format \(.*\)/OUTPUT_FORMAT(\1)/;T;p' > $@
-+	$(OBJDUMP) -f $@.so | sed -n 's/.*file format \(.*\)/OUTPUT_FORMAT(\1)/;T;p' > $@
- 	rm -f $@.so
- endif
- 

diff --git a/dev-libs/libbsd/libbsd-0.11.4.ebuild b/dev-libs/libbsd/libbsd-0.11.5.ebuild
similarity index 85%
rename from dev-libs/libbsd/libbsd-0.11.4.ebuild
rename to dev-libs/libbsd/libbsd-0.11.5.ebuild
index ca1cbf076ce2..55d75e728bd8 100644
--- a/dev-libs/libbsd/libbsd-0.11.4.ebuild
+++ b/dev-libs/libbsd/libbsd-0.11.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools multilib-minimal
+inherit multilib-minimal
 
 DESCRIPTION="Library to provide useful functions commonly found on BSD systems"
 HOMEPAGE="https://libbsd.freedesktop.org/wiki/ https://gitlab.freedesktop.org/libbsd/libbsd"
@@ -19,17 +19,6 @@ DEPEND="${RDEPEND}
 	>=sys-kernel/linux-headers-3.17
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.11.4-build-respect-OBJDUMP.patch
-)
-
-src_prepare() {
-	default
-
-	# Needed for objdump patch
-	eautoreconf
-}
-
 multilib_src_configure() {
 	# The build system will install libbsd-ctor.a despite of USE="-static-libs"
 	# which is correct, see:

[gentoo-commits] repo/gentoo:master commit in: dev-libs/libbsd/files/, dev-libs/libbsd/

[Sam James]

commit:     689f7b50735d60bf3f3afe15de1ea667fa462667
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 23 15:41:27 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 23 15:41:27 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=689f7b50

dev-libs/libbsd: respect OBJDUMP

Closes: https://bugs.gentoo.org/831863
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../libbsd-0.11.4-build-respect-OBJDUMP.patch      | 26 ++++++++++++++++++++++
 dev-libs/libbsd/libbsd-0.11.4.ebuild               | 13 ++++++++++-
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/dev-libs/libbsd/files/libbsd-0.11.4-build-respect-OBJDUMP.patch b/dev-libs/libbsd/files/libbsd-0.11.4-build-respect-OBJDUMP.patch
new file mode 100644
index 000000000000..2f9df4475bbe
--- /dev/null
+++ b/dev-libs/libbsd/files/libbsd-0.11.4-build-respect-OBJDUMP.patch
@@ -0,0 +1,26 @@
+https://gitlab.freedesktop.org/libbsd/libbsd/-/merge_requests/16
+
+From 3fbb632b460a4f2d37036cf3959736938494459e Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 23 Jan 2022 15:36:55 +0000
+Subject: [PATCH] build: respect $(OBJDUMP)
+
+We already search for it in `./configure` so let's respect
+the result of that search.
+
+This helps with cross-compilation and any other cases
+where one might want to choose a different toolchain.
+
+Bug: https://bugs.gentoo.org/831863
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -141,7 +141,7 @@ TRANSPARENT_LIBMD_DEPENDS = format.ld
+ 
+ format.ld:
+ 	$(CC) -shared -nostdlib -nostartfiles -x assembler /dev/null -o $@.so
+-	objdump -f $@.so | sed -n 's/.*file format \(.*\)/OUTPUT_FORMAT(\1)/;T;p' > $@
++	$(OBJDUMP) -f $@.so | sed -n 's/.*file format \(.*\)/OUTPUT_FORMAT(\1)/;T;p' > $@
+ 	rm -f $@.so
+ endif
+ 

diff --git a/dev-libs/libbsd/libbsd-0.11.4.ebuild b/dev-libs/libbsd/libbsd-0.11.4.ebuild
index 55d75e728bd8..ca1cbf076ce2 100644
--- a/dev-libs/libbsd/libbsd-0.11.4.ebuild
+++ b/dev-libs/libbsd/libbsd-0.11.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit multilib-minimal
+inherit autotools multilib-minimal
 
 DESCRIPTION="Library to provide useful functions commonly found on BSD systems"
 HOMEPAGE="https://libbsd.freedesktop.org/wiki/ https://gitlab.freedesktop.org/libbsd/libbsd"
@@ -19,6 +19,17 @@ DEPEND="${RDEPEND}
 	>=sys-kernel/linux-headers-3.17
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.11.4-build-respect-OBJDUMP.patch
+)
+
+src_prepare() {
+	default
+
+	# Needed for objdump patch
+	eautoreconf
+}
+
 multilib_src_configure() {
 	# The build system will install libbsd-ctor.a despite of USE="-static-libs"
 	# which is correct, see:

[gentoo-commits] repo/gentoo:master commit in: dev-libs/libbsd/files/, dev-libs/libbsd/

[Lars Wendler]

commit:     7ced86cd1ba6f854d99b75e0a3444e32e59a41ce
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 19 10:55:52 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Aug 19 11:01:01 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ced86cd

dev-libs/libbsd: Removed old.

Package-Manager: Portage-2.3.72, Repoman-2.3.17
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 dev-libs/libbsd/Manifest                       |  2 --
 dev-libs/libbsd/files/libbsd-0.8.6-sparc.patch | 32 -------------------
 dev-libs/libbsd/libbsd-0.8.6.ebuild            | 44 --------------------------
 dev-libs/libbsd/libbsd-0.8.7.ebuild            | 44 --------------------------
 4 files changed, 122 deletions(-)

diff --git a/dev-libs/libbsd/Manifest b/dev-libs/libbsd/Manifest
index 51746ae4612..857f6a1f9c9 100644
--- a/dev-libs/libbsd/Manifest
+++ b/dev-libs/libbsd/Manifest
@@ -1,4 +1,2 @@
 DIST libbsd-0.10.0.tar.xz 393576 BLAKE2B 66005a511dae7fb799322c813b8ea058ab460e3b9044756d6efad5de741d8f70270496f09803bbce8cd0000ff37e998f18e092037c850826c3c8e3f47ddfdb28 SHA512 b75529785b16c93d31401187f8a58258fbebe565dac071c8311775c913af989f62cd29d5ce2651af3ea6221cffd31cf04826577d3e546ab9ca14340f297777b9
-DIST libbsd-0.8.6.tar.xz 371112 BLAKE2B adab6c17267e0cff128351efccf5c1225b7dd85dc61dd8168bf212ba5aff8d726fa5be687c041821af9a427ddad9dfcd3630cac9134b9e81c86ab2599e43aef9 SHA512 ece01ced324f840c2cee6321c7dcf97ff123d55ea9f203c1ce35e1b46643dc7b34ef6dc6c8d128252b36848624850b40823411cc96b99a66a401eb1e9d8cea6b
-DIST libbsd-0.8.7.tar.xz 371772 BLAKE2B aa4aa1c19872edf9e7e6ed270275199366345531a48ee28c25e209f17c5403a22269b91ab1c806cb1b54ba33a8464f4b035fe7ee2bc5dddd0a4fda09c540b058 SHA512 605a14eb5d33c0e45c3bd29e585ebc15832e2ed1efa9356291a0562622168da96db1a20766e9dae8910ea0c1516429f43905edc8d4f2a40a5a341a689d08fcc3
 DIST libbsd-0.9.1.tar.xz 387180 BLAKE2B 40dd82ca1088ee7aae8b3d7685e8514eec702bf7ada7ef98f7177cad92b7e0fccc22a953b35f0f27202eb56833b31a81bef1324d43864d1b80887ba7c58684d5 SHA512 435822b8f2495a5e2705e5ab5c834a4f0f3a177b3e5c46a7c6162924507ca984e957e94a512b5ebd0067ecb413bac458fade357709ef199e9b75edf0315de91c

diff --git a/dev-libs/libbsd/files/libbsd-0.8.6-sparc.patch b/dev-libs/libbsd/files/libbsd-0.8.6-sparc.patch
deleted file mode 100644
index d2c35d8dc4e..00000000000
--- a/dev-libs/libbsd/files/libbsd-0.8.6-sparc.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 0b65d43963fc1bea195e94e3af922a7893bf6fcd Mon Sep 17 00:00:00 2001
-From: James Clarke <jrtc27@jrtc27.com>
-Date: Sun, 4 Mar 2018 23:44:52 +0100
-Subject: Add support for ELF machine EM_SPARC32PLUS
-
-32-bit SPARC on V8+ uses a different ELF machine type.
-
-Fixes: https://bugs.gentoo.org/634550
-Signed-off-by: Guillem Jover <guillem@hadrons.org>
----
- src/local-elf.h | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/local-elf.h b/src/local-elf.h
-index 1faf182..f7cbd83 100644
---- a/src/local-elf.h
-+++ b/src/local-elf.h
-@@ -186,7 +186,11 @@
- #define ELF_TARG_MACH	EM_SPARCV9
- #define ELF_TARG_CLASS	ELFCLASS64
- #else
-+#if defined(__sparc_v9__)
-+#define ELF_TARG_MACH	EM_SPARC32PLUS
-+#else
- #define ELF_TARG_MACH	EM_SPARC
-+#endif
- #define ELF_TARG_CLASS	ELFCLASS32
- #endif
- #define ELF_TARG_DATA	ELFDATA2MSB
--- 
-cgit v1.1
-

diff --git a/dev-libs/libbsd/libbsd-0.8.6.ebuild b/dev-libs/libbsd/libbsd-0.8.6.ebuild
deleted file mode 100644
index 1d417a41098..00000000000
--- a/dev-libs/libbsd/libbsd-0.8.6.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib-minimal
-
-DESCRIPTION="An library to provide useful functions commonly found on BSD systems"
-HOMEPAGE="https://libbsd.freedesktop.org/wiki/ https://gitlab.freedesktop.org/libbsd/libbsd"
-SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz"
-
-LICENSE="BSD BSD-2 BSD-4 ISC"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-DEPEND=">=sys-kernel/linux-headers-3.17"
-RDEPEND=""
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.8.6-sparc.patch"
-)
-
-pkg_setup() {
-	local f="${EROOT}/usr/$(get_libdir)/${PN}.a"
-	local m="You need to remove ${f} by hand or re-emerge sys-libs/glibc first."
-	if ! has_version ${CATEGORY}/${PN}; then
-		if [[ -e ${f} ]]; then
-			eerror "${m}"
-			die "${m}"
-		fi
-	fi
-}
-
-multilib_src_configure() {
-	# The build system will install libbsd-ctor.a despite of USE="-static-libs"
-	# which is correct, see:
-	# https://gitlab.freedesktop.org/libbsd/libbsd/commit/c5b959028734ca2281250c85773d9b5e1d259bc8
-	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	find "${ED}" -name "*.la" -delete || die
-}

diff --git a/dev-libs/libbsd/libbsd-0.8.7.ebuild b/dev-libs/libbsd/libbsd-0.8.7.ebuild
deleted file mode 100644
index 8fe9b46741c..00000000000
--- a/dev-libs/libbsd/libbsd-0.8.7.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib-minimal
-
-DESCRIPTION="An library to provide useful functions commonly found on BSD systems"
-HOMEPAGE="https://libbsd.freedesktop.org/wiki/ https://gitlab.freedesktop.org/libbsd/libbsd"
-SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz"
-
-LICENSE="BSD BSD-2 BSD-4 ISC"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-DEPEND=">=sys-kernel/linux-headers-3.17"
-RDEPEND=""
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.8.6-sparc.patch"
-)
-
-pkg_setup() {
-	local f="${EROOT}/usr/$(get_libdir)/${PN}.a"
-	local m="You need to remove ${f} by hand or re-emerge sys-libs/glibc first."
-	if ! has_version ${CATEGORY}/${PN}; then
-		if [[ -e ${f} ]]; then
-			eerror "${m}"
-			die "${m}"
-		fi
-	fi
-}
-
-multilib_src_configure() {
-	# The build system will install libbsd-ctor.a despite of USE="-static-libs"
-	# which is correct, see:
-	# https://gitlab.freedesktop.org/libbsd/libbsd/commit/c5b959028734ca2281250c85773d9b5e1d259bc8
-	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-	find "${ED}" -name "*.la" -delete || die
-}

[gentoo-commits] repo/gentoo:master commit in: dev-libs/libbsd/files/, dev-libs/libbsd/

[Anthony G. Basile]

commit:     a4c3992d87691624583cc7fb96d1d6cbba309d8e
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 12 23:56:16 2019 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Feb 12 23:56:16 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4c3992d

dev-libs/libbsd: fix bug #677746

Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 .../libbsd/files/libbsd-0.9.1-missing-header.patch | 43 ++++++++++++++++++++++
 dev-libs/libbsd/libbsd-0.9.1.ebuild                |  6 ++-
 2 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/dev-libs/libbsd/files/libbsd-0.9.1-missing-header.patch b/dev-libs/libbsd/files/libbsd-0.9.1-missing-header.patch
new file mode 100644
index 00000000000..7ca2b881a38
--- /dev/null
+++ b/dev-libs/libbsd/files/libbsd-0.9.1-missing-header.patch
@@ -0,0 +1,43 @@
+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: 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>
+---
+ src/flopen.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+(limited to 'src/flopen.c')
+
+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>
+ 
+-- 
+cgit v1.1
+

diff --git a/dev-libs/libbsd/libbsd-0.9.1.ebuild b/dev-libs/libbsd/libbsd-0.9.1.ebuild
index a3299a2bcae..fbc48c4614d 100644
--- a/dev-libs/libbsd/libbsd-0.9.1.ebuild
+++ b/dev-libs/libbsd/libbsd-0.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,6 +16,10 @@ IUSE="static-libs"
 DEPEND=">=sys-kernel/linux-headers-3.17"
 RDEPEND=""
 
+PATCHES=(
+	"${FILESDIR}/${P}-missing-header.patch"
+)
+
 pkg_setup() {
 	local f="${EROOT}/usr/$(get_libdir)/${PN}.a"
 	local m="You need to remove ${f} by hand or re-emerge sys-libs/glibc first."

[gentoo-commits] repo/gentoo:master commit in: dev-libs/libbsd/files/, dev-libs/libbsd/

[Sergei Trofimovich]

commit:     a6ef75dadb937aec325a57e51d046d7c2e1eec57
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Tue Mar 13 15:44:01 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Mar 21 22:07:43 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6ef75da

dev-libs/libbsd: fix ELF machine type for 32 bit sparc

Bug: https://bugs.gentoo.org/634550
Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="sparc"
Closes: https://github.com/gentoo/gentoo/pull/7446

 dev-libs/libbsd/files/libbsd-0.8.6-sparc.patch | 32 ++++++++++++++++++++++++++
 dev-libs/libbsd/libbsd-0.8.6.ebuild            |  4 ++++
 dev-libs/libbsd/libbsd-0.8.7.ebuild            |  4 ++++
 3 files changed, 40 insertions(+)

diff --git a/dev-libs/libbsd/files/libbsd-0.8.6-sparc.patch b/dev-libs/libbsd/files/libbsd-0.8.6-sparc.patch
new file mode 100644
index 00000000000..d2c35d8dc4e
--- /dev/null
+++ b/dev-libs/libbsd/files/libbsd-0.8.6-sparc.patch
@@ -0,0 +1,32 @@
+From 0b65d43963fc1bea195e94e3af922a7893bf6fcd Mon Sep 17 00:00:00 2001
+From: James Clarke <jrtc27@jrtc27.com>
+Date: Sun, 4 Mar 2018 23:44:52 +0100
+Subject: Add support for ELF machine EM_SPARC32PLUS
+
+32-bit SPARC on V8+ uses a different ELF machine type.
+
+Fixes: https://bugs.gentoo.org/634550
+Signed-off-by: Guillem Jover <guillem@hadrons.org>
+---
+ src/local-elf.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/local-elf.h b/src/local-elf.h
+index 1faf182..f7cbd83 100644
+--- a/src/local-elf.h
++++ b/src/local-elf.h
+@@ -186,7 +186,11 @@
+ #define ELF_TARG_MACH	EM_SPARCV9
+ #define ELF_TARG_CLASS	ELFCLASS64
+ #else
++#if defined(__sparc_v9__)
++#define ELF_TARG_MACH	EM_SPARC32PLUS
++#else
+ #define ELF_TARG_MACH	EM_SPARC
++#endif
+ #define ELF_TARG_CLASS	ELFCLASS32
+ #endif
+ #define ELF_TARG_DATA	ELFDATA2MSB
+-- 
+cgit v1.1
+

diff --git a/dev-libs/libbsd/libbsd-0.8.6.ebuild b/dev-libs/libbsd/libbsd-0.8.6.ebuild
index ab9fdb3b03f..bfc008979c3 100644
--- a/dev-libs/libbsd/libbsd-0.8.6.ebuild
+++ b/dev-libs/libbsd/libbsd-0.8.6.ebuild
@@ -16,6 +16,10 @@ IUSE="static-libs"
 DEPEND=">=sys-kernel/linux-headers-3.17"
 RDEPEND=""
 
+PATCHES=(
+	"${FILESDIR}/${PN}-0.8.6-sparc.patch"
+)
+
 pkg_setup() {
 	local f="${EROOT}/usr/$(get_libdir)/${PN}.a"
 	local m="You need to remove ${f} by hand or re-emerge sys-libs/glibc first."

diff --git a/dev-libs/libbsd/libbsd-0.8.7.ebuild b/dev-libs/libbsd/libbsd-0.8.7.ebuild
index bde7f808bf8..8ce1c8916cb 100644
--- a/dev-libs/libbsd/libbsd-0.8.7.ebuild
+++ b/dev-libs/libbsd/libbsd-0.8.7.ebuild
@@ -16,6 +16,10 @@ IUSE="static-libs"
 DEPEND=">=sys-kernel/linux-headers-3.17"
 RDEPEND=""
 
+PATCHES=(
+	"${FILESDIR}/${PN}-0.8.6-sparc.patch"
+)
+
 pkg_setup() {
 	local f="${EROOT}/usr/$(get_libdir)/${PN}.a"
 	local m="You need to remove ${f} by hand or re-emerge sys-libs/glibc first."