commit: 0998c45f60570c31e5833e333f226056f974202c Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Aug 31 01:36:13 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Aug 31 01:36:13 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0998c45f
dev-libs/elfutils: bring back USE=static-libs I dropped it in 8d06a4aeffc377c8e4edd58e0e7b085ba20b16f6 and while it _was_ broken, it was only broken recently by the autoreconf added for the libcxx patch, so let's bring it back. I had assumed it was been broken for longer. Bug: https://bugs.gentoo.org/925241 Signed-off-by: Sam James <sam <AT> gentoo.org> .../{elfutils-9999.ebuild => elfutils-0.191-r2.ebuild} | 17 +++++++++++------ dev-libs/elfutils/elfutils-9999.ebuild | 16 ++++++++++------ 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/dev-libs/elfutils/elfutils-9999.ebuild b/dev-libs/elfutils/elfutils-0.191-r2.ebuild similarity index 84% copy from dev-libs/elfutils/elfutils-9999.ebuild copy to dev-libs/elfutils/elfutils-0.191-r2.ebuild index 01b47f66fca5..917e0ffdca15 100644 --- a/dev-libs/elfutils/elfutils-9999.ebuild +++ b/dev-libs/elfutils/elfutils-0.191-r2.ebuild @@ -28,22 +28,22 @@ fi LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )" SLOT="0" -IUSE="bzip2 debuginfod lzma nls test +utils valgrind zstd" +IUSE="bzip2 debuginfod lzma nls static-libs test +utils valgrind zstd" RESTRICT="!test? ( test )" RDEPEND=" !dev-libs/libelf - >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] - bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) + >=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}] + bzip2? ( >=app-arch/bzip2-1.0.6-r4[static-libs?,${MULTILIB_USEDEP}] ) debuginfod? ( app-arch/libarchive:= dev-db/sqlite:3= net-libs/libmicrohttpd:= - net-misc/curl[${MULTILIB_USEDEP}] + net-misc/curl[static-libs?,${MULTILIB_USEDEP}] ) - lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] ) - zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] ) + lzma? ( >=app-arch/xz-utils-5.0.5-r1[static-libs?,${MULTILIB_USEDEP}] ) + zstd? ( app-arch/zstd:=[static-libs?,${MULTILIB_USEDEP}] ) elibc_musl? ( dev-libs/libbsd sys-libs/argp-standalone @@ -64,6 +64,7 @@ BDEPEND+=" PATCHES=( "${FILESDIR}"/${PN}-0.189-musl-aarch64-regs.patch "${FILESDIR}"/${PN}-0.191-musl-macros.patch + "${FILESDIR}"/${PN}-0.191-avoid-overriding-libcxx-system-header.patch ) src_prepare() { @@ -71,6 +72,10 @@ src_prepare() { eautoreconf + if ! use static-libs; then + sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in || die + fi + # https://sourceware.org/PR23914 sed -i 's:-Werror::' */Makefile.in || die } diff --git a/dev-libs/elfutils/elfutils-9999.ebuild b/dev-libs/elfutils/elfutils-9999.ebuild index 01b47f66fca5..250038f6f588 100644 --- a/dev-libs/elfutils/elfutils-9999.ebuild +++ b/dev-libs/elfutils/elfutils-9999.ebuild @@ -28,22 +28,22 @@ fi LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )" SLOT="0" -IUSE="bzip2 debuginfod lzma nls test +utils valgrind zstd" +IUSE="bzip2 debuginfod lzma nls static-libs test +utils valgrind zstd" RESTRICT="!test? ( test )" RDEPEND=" !dev-libs/libelf - >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] - bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) + >=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}] + bzip2? ( >=app-arch/bzip2-1.0.6-r4[static-libs?,${MULTILIB_USEDEP}] ) debuginfod? ( app-arch/libarchive:= dev-db/sqlite:3= net-libs/libmicrohttpd:= - net-misc/curl[${MULTILIB_USEDEP}] + net-misc/curl[static-libs?,${MULTILIB_USEDEP}] ) - lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] ) - zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] ) + lzma? ( >=app-arch/xz-utils-5.0.5-r1[static-libs?,${MULTILIB_USEDEP}] ) + zstd? ( app-arch/zstd:=[static-libs?,${MULTILIB_USEDEP}] ) elibc_musl? ( dev-libs/libbsd sys-libs/argp-standalone @@ -71,6 +71,10 @@ src_prepare() { eautoreconf + if ! use static-libs; then + sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in || die + fi + # https://sourceware.org/PR23914 sed -i 's:-Werror::' */Makefile.in || die }
