commit: 37f510da22bbe73cd606c7df841cbae8d2611132 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Sat Feb 11 22:04:40 2023 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> 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 <floppym <AT> 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 <fcntl.h> - 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 <fcntl.h> - 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
