diff options
-rw-r--r-- | dev-libs/libbsd/Manifest | 2 | ||||
-rw-r--r-- | dev-libs/libbsd/files/libbsd-0.11.4-build-respect-OBJDUMP.patch | 26 | ||||
-rw-r--r-- | dev-libs/libbsd/libbsd-0.11.5.ebuild (renamed from dev-libs/libbsd/libbsd-0.11.4.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 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: |