From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 994EE15808D for ; Tue, 19 Apr 2022 13:12:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BC5FEE0863; Tue, 19 Apr 2022 13:12:57 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2F3E8E0863 for ; Tue, 19 Apr 2022 13:12:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 00C8D341B35 for ; Tue, 19 Apr 2022 13:12:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 62179342 for ; Tue, 19 Apr 2022 13:12:54 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1650373909.f20674a2ffa68abbe6123c78356cc3dffd907171.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/e2fsprogs/e2fsprogs-1.46.5-r1.ebuild sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild X-VCS-Directories: sys-fs/e2fsprogs/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: f20674a2ffa68abbe6123c78356cc3dffd907171 X-VCS-Branch: master Date: Tue, 19 Apr 2022 13:12:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6204f069-f239-4412-a0e9-504a2d478a1c X-Archives-Hash: eedea2c9d53976e3246e5262b019f8c2 commit: f20674a2ffa68abbe6123c78356cc3dffd907171 Author: David Seifert gentoo org> AuthorDate: Tue Apr 19 07:21:56 2022 +0000 Commit: Sam James gentoo org> CommitDate: Tue Apr 19 13:11:49 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f20674a2 sys-fs/e2fsprogs: install all libraries unconditionally Closes: https://bugs.gentoo.org/837668 Signed-off-by: David Seifert gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/25096 Signed-off-by: Sam James gentoo.org> ...gs-1.46.5.ebuild => e2fsprogs-1.46.5-r1.ebuild} | 68 ++++++++++------------ 1 file changed, 32 insertions(+), 36 deletions(-) diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r1.ebuild similarity index 75% rename from sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild rename to sys-fs/e2fsprogs/e2fsprogs-1.46.5-r1.ebuild index 275b94d17ffd..2949d25768a2 100644 --- a/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild +++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r1.ebuild @@ -12,16 +12,22 @@ SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/$ LICENSE="GPL-2 BSD" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="cron fuse lto nls static-libs +threads +tools" +IUSE="cron fuse lto nls static-libs test +threads +tools" +RESTRICT="!test? ( test )" RDEPEND=" !sys-libs/${PN}-libs cron? ( sys-fs/lvm2[-device-mapper-only(-)] ) fuse? ( sys-fs/fuse:0 ) nls? ( virtual/libintl ) - tools? ( >=sys-apps/util-linux-2.16 )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig + tools? ( sys-apps/util-linux )" +# For testing lib/ext2fs, lib/support/libsupport.a is required, which +# unconditionally includes '' from sys-apps/util-linux. +DEPEND=" + ${RDEPEND} + test? ( sys-apps/util-linux[${MULTILIB_USEDEP}] )" +BDEPEND=" + virtual/pkgconfig sys-apps/texinfo nls? ( sys-devel/gettext )" @@ -32,13 +38,9 @@ PATCHES=( "${FILESDIR}"/${P}-parallel-make.patch ) -pkg_setup() { - if use tools ; then - MULTILIB_WRAPPED_HEADERS=( - /usr/include/ext2fs/ext2_types.h - ) - fi -} +MULTILIB_WRAPPED_HEADERS=( + /usr/include/ext2fs/ext2_types.h +) src_prepare() { default @@ -101,50 +103,44 @@ multilib_src_configure() { } multilib_src_compile() { - if ! multilib_is_native_abi || ! use tools ; then + if multilib_is_native_abi && use tools ; then + emake V=1 + else emake -C lib/et V=1 emake -C lib/ss V=1 - if use tools ; then - emake -C lib/ext2fs V=1 - emake -C lib/e2p V=1 - fi - return 0 + emake -C lib/ext2fs V=1 + emake -C lib/e2p V=1 fi - - emake V=1 } multilib_src_test() { - if multilib_is_native_abi ; then + if multilib_is_native_abi && use tools ; then emake V=1 check else + # required by lib/ext2fs's check target + emake -C lib/support V=1 + # For non-native, there's no binaries to test. Just libraries. emake -C lib/et V=1 check emake -C lib/ss V=1 check + emake -C lib/ext2fs V=1 check + emake -C lib/e2p V=1 check fi } multilib_src_install() { - if ! multilib_is_native_abi || ! use tools ; then + if multilib_is_native_abi && use tools ; then + emake STRIP=':' V=1 DESTDIR="${D}" install + else emake -C lib/et V=1 DESTDIR="${D}" install emake -C lib/ss V=1 DESTDIR="${D}" install - - if use tools ; then - emake -C lib/ext2fs V=1 DESTDIR="${D}" install - emake -C lib/e2p V=1 DESTDIR="${D}" install - fi - else - emake \ - STRIP=: \ - DESTDIR="${D}" \ - install - - # Move shared libraries to /lib/, install static libraries to - # /usr/lib/, and install linker scripts to /usr/lib/. - gen_usr_ldscript -a e2p ext2fs + emake -C lib/ext2fs V=1 DESTDIR="${D}" install + emake -C lib/e2p V=1 DESTDIR="${D}" install fi - gen_usr_ldscript -a com_err ss $(usex kernel_linux '' 'uuid blkid') + # Move shared libraries to /lib/, install static libraries to + # /usr/lib/, and install linker scripts to /usr/lib/. + gen_usr_ldscript -a com_err ss ext2fs e2p # configure doesn't have an option to disable static libs :/ if ! use static-libs ; then