commit: 8d06a4aeffc377c8e4edd58e0e7b085ba20b16f6 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Aug 31 01:03:03 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Aug 31 01:03:03 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d06a4ae
dev-libs/elfutils: add 9999 While here, drop USE=static-libs. It didn't work, partly because the sed was being done before eautoreconf. Signed-off-by: Sam James <sam <AT> gentoo.org> dev-libs/elfutils/elfutils-0.191-r1.ebuild | 46 +++++++++++++-------- ...futils-0.191-r1.ebuild => elfutils-9999.ebuild} | 47 +++++++++++++--------- 2 files changed, 58 insertions(+), 35 deletions(-) diff --git a/dev-libs/elfutils/elfutils-0.191-r1.ebuild b/dev-libs/elfutils/elfutils-0.191-r1.ebuild index e33417f6c8bc..1a15c09a876d 100644 --- a/dev-libs/elfutils/elfutils-0.191-r1.ebuild +++ b/dev-libs/elfutils/elfutils-0.191-r1.ebuild @@ -4,32 +4,46 @@ EAPI=8 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/elfutils.gpg -inherit autotools flag-o-matic multilib-minimal verify-sig +inherit autotools flag-o-matic multilib-minimal DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)" HOMEPAGE="https://sourceware.org/elfutils/"; -SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"; -SRC_URI+=" verify-sig? ( https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2.sig )" +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://sourceware.org/git/elfutils.git"; + inherit git-r3 + + BDEPEND=" + sys-devel/bison + sys-devel/flex + " +else + inherit verify-sig + SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"; + SRC_URI+=" verify-sig? ( https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2.sig )" + + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" + + BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-elfutils-20240301 )" +fi LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" -IUSE="bzip2 debuginfod lzma nls static-libs test +utils zstd" +IUSE="bzip2 debuginfod lzma nls test +utils zstd" RESTRICT="!test? ( test )" RDEPEND=" !dev-libs/libelf - >=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}] - bzip2? ( >=app-arch/bzip2-1.0.6-r4[static-libs?,${MULTILIB_USEDEP}] ) + >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] + bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) debuginfod? ( app-arch/libarchive:= dev-db/sqlite:3= net-libs/libmicrohttpd:= - net-misc/curl[static-libs?,${MULTILIB_USEDEP}] + net-misc/curl[${MULTILIB_USEDEP}] ) - lzma? ( >=app-arch/xz-utils-5.0.5-r1[static-libs?,${MULTILIB_USEDEP}] ) - zstd? ( app-arch/zstd:=[static-libs?,${MULTILIB_USEDEP}] ) + lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] ) + zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] ) elibc_musl? ( dev-libs/libbsd sys-libs/argp-standalone @@ -40,12 +54,10 @@ RDEPEND=" DEPEND=" ${RDEPEND} " -BDEPEND=" - app-alternatives/lex +BDEPEND+=" sys-devel/m4 virtual/pkgconfig nls? ( sys-devel/gettext ) - verify-sig? ( >=sec-keys/openpgp-keys-elfutils-20240301 ) " PATCHES=( @@ -57,10 +69,6 @@ PATCHES=( src_prepare() { default - if ! use static-libs; then - sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in || die - fi - eautoreconf # https://sourceware.org/PR23914 @@ -78,6 +86,8 @@ src_configure() { } multilib_src_configure() { + unset LEX YACC + local myeconfargs=( $(use_enable nls) $(multilib_native_use_enable debuginfod) @@ -97,6 +107,8 @@ multilib_src_configure() { $(use_with zstd) ) + [[ ${PV} == 9999 ]] && myeconfargs+=( --enable-maintainer-mode ) + # Needed because sets alignment macro is-flagq -fsanitize=address && myeconfargs+=( --enable-sanitize-address ) is-flagq -fsanitize=undefined && myeconfargs+=( --enable-sanitize-undefined ) diff --git a/dev-libs/elfutils/elfutils-0.191-r1.ebuild b/dev-libs/elfutils/elfutils-9999.ebuild similarity index 69% copy from dev-libs/elfutils/elfutils-0.191-r1.ebuild copy to dev-libs/elfutils/elfutils-9999.ebuild index e33417f6c8bc..e4acd35940aa 100644 --- a/dev-libs/elfutils/elfutils-0.191-r1.ebuild +++ b/dev-libs/elfutils/elfutils-9999.ebuild @@ -4,32 +4,46 @@ EAPI=8 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/elfutils.gpg -inherit autotools flag-o-matic multilib-minimal verify-sig +inherit autotools flag-o-matic multilib-minimal DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)" HOMEPAGE="https://sourceware.org/elfutils/"; -SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"; -SRC_URI+=" verify-sig? ( https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2.sig )" +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://sourceware.org/git/elfutils.git"; + inherit git-r3 + + BDEPEND=" + sys-devel/bison + sys-devel/flex + " +else + inherit verify-sig + SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"; + SRC_URI+=" verify-sig? ( https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2.sig )" + + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + + BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-elfutils-20240301 )" +fi LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" -IUSE="bzip2 debuginfod lzma nls static-libs test +utils zstd" +IUSE="bzip2 debuginfod lzma nls test +utils zstd" RESTRICT="!test? ( test )" RDEPEND=" !dev-libs/libelf - >=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}] - bzip2? ( >=app-arch/bzip2-1.0.6-r4[static-libs?,${MULTILIB_USEDEP}] ) + >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] + bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) debuginfod? ( app-arch/libarchive:= dev-db/sqlite:3= net-libs/libmicrohttpd:= - net-misc/curl[static-libs?,${MULTILIB_USEDEP}] + net-misc/curl[${MULTILIB_USEDEP}] ) - lzma? ( >=app-arch/xz-utils-5.0.5-r1[static-libs?,${MULTILIB_USEDEP}] ) - zstd? ( app-arch/zstd:=[static-libs?,${MULTILIB_USEDEP}] ) + lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] ) + zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] ) elibc_musl? ( dev-libs/libbsd sys-libs/argp-standalone @@ -40,27 +54,20 @@ RDEPEND=" DEPEND=" ${RDEPEND} " -BDEPEND=" - app-alternatives/lex +BDEPEND+=" sys-devel/m4 virtual/pkgconfig nls? ( sys-devel/gettext ) - verify-sig? ( >=sec-keys/openpgp-keys-elfutils-20240301 ) " 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() { default - if ! use static-libs; then - sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in || die - fi - eautoreconf # https://sourceware.org/PR23914 @@ -78,6 +85,8 @@ src_configure() { } multilib_src_configure() { + unset LEX YACC + local myeconfargs=( $(use_enable nls) $(multilib_native_use_enable debuginfod) @@ -97,6 +106,8 @@ multilib_src_configure() { $(use_with zstd) ) + [[ ${PV} == 9999 ]] && myeconfargs+=( --enable-maintainer-mode ) + # Needed because sets alignment macro is-flagq -fsanitize=address && myeconfargs+=( --enable-sanitize-address ) is-flagq -fsanitize=undefined && myeconfargs+=( --enable-sanitize-undefined )
