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 E543115800F for ; Sat, 11 Feb 2023 22:13:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 05075E0886; Sat, 11 Feb 2023 22:13:39 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E0553E0886 for ; Sat, 11 Feb 2023 22:13:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0CC9A340D92 for ; Sat, 11 Feb 2023 22:13:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9CAC6893 for ; Sat, 11 Feb 2023 22:13:35 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1676153595.37f510da22bbe73cd606c7df841cbae8d2611132.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/util-linux/util-linux-2.38.1-r2.ebuild sys-apps/util-linux/util-linux-9999.ebuild X-VCS-Directories: sys-apps/util-linux/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 37f510da22bbe73cd606c7df841cbae8d2611132 X-VCS-Branch: master Date: Sat, 11 Feb 2023 22:13:35 +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: bb6dd613-8b93-4a6f-a88d-6ae9c6e47199 X-Archives-Hash: 6290dd81b3d6f0aaaf12d6c45cd23e5a commit: 37f510da22bbe73cd606c7df841cbae8d2611132 Author: Mike Gilbert gentoo org> AuthorDate: Sat Feb 11 22:04:40 2023 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Sat Feb 11 22:13:15 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37f510da sys-apps/util-linux: remove obsolete fallocate test Bug: https://bugs.gentoo.org/300307 Signed-off-by: Mike Gilbert gentoo.org> sys-apps/util-linux/util-linux-2.38.1-r2.ebuild | 22 +++++----------------- sys-apps/util-linux/util-linux-9999.ebuild | 22 +++++----------------- 2 files changed, 10 insertions(+), 34 deletions(-) diff --git a/sys-apps/util-linux/util-linux-2.38.1-r2.ebuild b/sys-apps/util-linux/util-linux-2.38.1-r2.ebuild index f49e21c65cae..7de646c812ab 100644 --- a/sys-apps/util-linux/util-linux-2.38.1-r2.ebuild +++ b/sys-apps/util-linux/util-linux-2.38.1-r2.ebuild @@ -157,21 +157,6 @@ src_prepare() { eautoreconf } -lfs_fallocate_test() { - # Make sure we can use fallocate with LFS, bug #300307 - cat <<-EOF > "${T}"/fallocate.${ABI}.c - #define _GNU_SOURCE - #include - main() { return fallocate(0, 0, 0, 0); } - EOF - - append-lfs-flags - - $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \ - || export ac_cv_func_fallocate=no - rm -f "${T}"/fallocate.${ABI}.c -} - python_configure() { local myeconfargs=( "${commonargs[@]}" @@ -191,8 +176,6 @@ python_configure() { } multilib_src_configure() { - lfs_fallocate_test - # The scanf test in a run-time test which fails while cross-compiling. # Blindly assume a POSIX setup since we require libmount, and libmount # itself fails when the scanf test fails. bug #531856 @@ -297,6 +280,11 @@ multilib_src_configure() { fi } +src_configure() { + append-lfs-flags + multilib-minimal_src_configure +} + python_compile() { pushd "${BUILD_DIR}" >/dev/null || die emake all diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild index f76687a5bc42..0baf9332ec6f 100644 --- a/sys-apps/util-linux/util-linux-9999.ebuild +++ b/sys-apps/util-linux/util-linux-9999.ebuild @@ -157,21 +157,6 @@ src_prepare() { fi } -lfs_fallocate_test() { - # Make sure we can use fallocate with LFS, bug #300307 - cat <<-EOF > "${T}"/fallocate.${ABI}.c - #define _GNU_SOURCE - #include - main() { return fallocate(0, 0, 0, 0); } - EOF - - append-lfs-flags - - $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \ - || export ac_cv_func_fallocate=no - rm -f "${T}"/fallocate.${ABI}.c -} - python_configure() { local myeconfargs=( "${commonargs[@]}" @@ -191,8 +176,6 @@ python_configure() { } multilib_src_configure() { - lfs_fallocate_test - # The scanf test in a run-time test which fails while cross-compiling. # Blindly assume a POSIX setup since we require libmount, and libmount # itself fails when the scanf test fails. bug #531856 @@ -297,6 +280,11 @@ multilib_src_configure() { fi } +src_configure() { + append-lfs-flags + multilib-minimal_src_configure +} + python_compile() { pushd "${BUILD_DIR}" >/dev/null || die emake all