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 A971B15800A for ; Sat, 17 Jun 2023 22:47:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A9A72E087B; Sat, 17 Jun 2023 22:47:09 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8AF63E087B for ; Sat, 17 Jun 2023 22:47:09 +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 7193F340E9E for ; Sat, 17 Jun 2023 22:47:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0447BA66 for ; Sat, 17 Jun 2023 22:47: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: <1687042005.91caf8a690ae6df19f7287f2ee7c0790ca3a8150.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/coreutils/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/coreutils/coreutils-9.3-r3.ebuild sys-apps/coreutils/coreutils-9999.ebuild X-VCS-Directories: sys-apps/coreutils/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 91caf8a690ae6df19f7287f2ee7c0790ca3a8150 X-VCS-Branch: master Date: Sat, 17 Jun 2023 22:47: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: 69b64c66-fb85-4104-b2f3-f94d3d099980 X-Archives-Hash: 3dcbab8dc180ba0ce1a6d7aa116fac34 commit: 91caf8a690ae6df19f7287f2ee7c0790ca3a8150 Author: Sam James gentoo org> AuthorDate: Sat Jun 17 22:43:28 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sat Jun 17 22:46:45 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91caf8a6 sys-apps/coreutils: append-lfs-flags for alpha & friends Thanks to matoro for investigating & reporting upstream. The gnulib autoconf machinery doesn't seem to realise right now that we need _F_O_B=64 on alpha at least for 64-bit ino_t. Bug: https://debbugs.gnu.org/64123 Signed-off-by: Sam James gentoo.org> .../{coreutils-9999.ebuild => coreutils-9.3-r3.ebuild} | 11 ++++++++++- sys-apps/coreutils/coreutils-9999.ebuild | 6 +++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/sys-apps/coreutils/coreutils-9999.ebuild b/sys-apps/coreutils/coreutils-9.3-r3.ebuild similarity index 94% copy from sys-apps/coreutils/coreutils-9999.ebuild copy to sys-apps/coreutils/coreutils-9.3-r3.ebuild index 6e3d435cba1d..ab1c0e9a1cbd 100644 --- a/sys-apps/coreutils/coreutils-9999.ebuild +++ b/sys-apps/coreutils/coreutils-9.3-r3.ebuild @@ -23,7 +23,7 @@ if [[ ${PV} == 9999 ]] ; then elif [[ ${PV} == *_p* ]] ; then # Note: could put this in devspace, but if it's gone, we don't want # it in tree anyway. It's just for testing. - MY_SNAPSHOT="$(ver_cut 1-2).198-e68b1" + MY_SNAPSHOT="$(ver_cut 1-2).18-ffd62" SRC_URI="https://www.pixelbeat.org/cu/coreutils-${MY_SNAPSHOT}.tar.xz -> ${P}.tar.xz" SRC_URI+=" verify-sig? ( https://www.pixelbeat.org/cu/coreutils-${MY_SNAPSHOT}.tar.xz.sig -> ${P}.tar.xz.sig )" S="${WORKDIR}"/${PN}-${MY_SNAPSHOT} @@ -110,6 +110,8 @@ src_unpack() { src_prepare() { local PATCHES=( # Upstream patches + "${FILESDIR}"/${P}-cp-parents-preserve-permissions.patch + "${FILESDIR}"/${P}-old-kernel-copy_file_range.patch ) if ! use vanilla && [[ -d "${WORKDIR}"/patch ]] ; then @@ -118,6 +120,9 @@ src_prepare() { default + # Just for ${P}-old-kernel-copy_file_range.patch + touch aclocal.m4 configure.ac Makefile.in gnulib-tests/Makefile.in configure || die + # Since we've patched many .c files, the make process will try to # re-build the manpages by running `./bin --help`. When doing a # cross-compile, we can't do that since 'bin' isn't a native bin. @@ -135,6 +140,10 @@ src_prepare() { } src_configure() { + # On alpha at least, gnulib (as of 9.3) can't seem to figure out we need + # _F_O_B=64: https://debbugs.gnu.org/64123 + append-lfs-flags + local myconf=( --with-packager="Gentoo" --with-packager-version="${PVR} (p${PATCH_VER:-0})" diff --git a/sys-apps/coreutils/coreutils-9999.ebuild b/sys-apps/coreutils/coreutils-9999.ebuild index 6e3d435cba1d..3e4dc9a20eb0 100644 --- a/sys-apps/coreutils/coreutils-9999.ebuild +++ b/sys-apps/coreutils/coreutils-9999.ebuild @@ -23,7 +23,7 @@ if [[ ${PV} == 9999 ]] ; then elif [[ ${PV} == *_p* ]] ; then # Note: could put this in devspace, but if it's gone, we don't want # it in tree anyway. It's just for testing. - MY_SNAPSHOT="$(ver_cut 1-2).198-e68b1" + MY_SNAPSHOT="$(ver_cut 1-2).18-ffd62" SRC_URI="https://www.pixelbeat.org/cu/coreutils-${MY_SNAPSHOT}.tar.xz -> ${P}.tar.xz" SRC_URI+=" verify-sig? ( https://www.pixelbeat.org/cu/coreutils-${MY_SNAPSHOT}.tar.xz.sig -> ${P}.tar.xz.sig )" S="${WORKDIR}"/${PN}-${MY_SNAPSHOT} @@ -135,6 +135,10 @@ src_prepare() { } src_configure() { + # On alpha at least, gnulib (as of 9.3) can't seem to figure out we need + # _F_O_B=64: https://debbugs.gnu.org/64123 + append-lfs-flags + local myconf=( --with-packager="Gentoo" --with-packager-version="${PVR} (p${PATCH_VER:-0})"