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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 37B23158086 for ; Sun, 31 Oct 2021 01:34:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 68EF0E0901; Sun, 31 Oct 2021 01:34:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 4E890E0901 for ; Sun, 31 Oct 2021 01:34:10 +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 283783434B9 for ; Sun, 31 Oct 2021 01:34:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7D5B6164 for ; Sun, 31 Oct 2021 01:34:07 +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: <1635644021.e1645d02e29cec605a91fd91b63543502e7599ac.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.4-r50.ebuild X-VCS-Directories: sys-fs/e2fsprogs/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: e1645d02e29cec605a91fd91b63543502e7599ac X-VCS-Branch: master Date: Sun, 31 Oct 2021 01:34:07 +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: e52736e8-935f-49dc-9ffa-9300b4c937e4 X-Archives-Hash: 6e2efbab7c8582aec9da9f2e772bf46b commit: e1645d02e29cec605a91fd91b63543502e7599ac Author: Sam James gentoo org> AuthorDate: Sun Oct 31 01:33:41 2021 +0000 Commit: Sam James gentoo org> CommitDate: Sun Oct 31 01:33:41 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1645d02 sys-fs/e2fsprogs: include dilfridge@'s changes to merged e2fsprogs-libs >From his overlay at https://gitweb.gentoo.org/dev/dilfridge.git/plain/sys-fs/e2fsprogs/e2fsprogs-1.46.3-r100.ebuild?id=8551292e0a0f847ab7072ffab9626a3003dca1ab. Signed-off-by: Sam James gentoo.org> sys-fs/e2fsprogs/e2fsprogs-1.46.4-r50.ebuild | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.4-r50.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.46.4-r50.ebuild index 6eb62630726..d646b58c2e6 100644 --- a/sys-fs/e2fsprogs/e2fsprogs-1.46.4-r50.ebuild +++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.4-r50.ebuild @@ -80,8 +80,6 @@ multilib_src_configure() { $(tc-has-tls || echo --disable-tls) $(multilib_native_use_enable fuse fuse2fs) $(use_enable nls) - --disable-libblkid - --disable-libuuid $(multilib_native_use_enable tools e2initrd-helper) --disable-fsck --disable-uuidd @@ -92,14 +90,15 @@ multilib_src_configure() { # we use blkid/uuid from util-linux now if use kernel_linux ; then export ac_cv_lib_{uuid_uuid_generate,blkid_blkid_get_cache}=yes + myeconfargs+=( --disable-lib{blkid,uuid} ) fi ac_cv_path_LDCONFIG=: \ - ECONF_SOURCE="${S}" \ - CC="$(tc-getCC)" \ - BUILD_CC="$(tc-getBUILD_CC)" \ - BUILD_LD="$(tc-getBUILD_LD)" \ - econf "${myeconfargs[@]}" + ECONF_SOURCE="${S}" \ + CC="$(tc-getCC)" \ + BUILD_CC="$(tc-getBUILD_CC)" \ + BUILD_LD="$(tc-getBUILD_LD)" \ + econf "${myeconfargs[@]}" if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then eerror "INTL sanity check failed, aborting build."