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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B8294158042 for ; Wed, 13 Nov 2024 03:13:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EEEF6E0815; Wed, 13 Nov 2024 03:13:30 +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 D2450E0815 for ; Wed, 13 Nov 2024 03:13:30 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C073933BEFF for ; Wed, 13 Nov 2024 03:13:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2BD1518DD for ; Wed, 13 Nov 2024 03:13:28 +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: <1731467436.7dfc6696249c7d992801d1352ed36c6c0c48ae9a.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-scheme/guile/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-scheme/guile/files/guile-3.0-fix-32bit-BE.patch X-VCS-Directories: dev-scheme/guile/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 7dfc6696249c7d992801d1352ed36c6c0c48ae9a X-VCS-Branch: master Date: Wed, 13 Nov 2024 03:13:28 +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: bafc5f8b-565b-403b-8ce0-c8750c55eeb2 X-Archives-Hash: d16f0debb6f5922a384ca383f19365d3 commit: 7dfc6696249c7d992801d1352ed36c6c0c48ae9a Author: Sam James gentoo org> AuthorDate: Wed Nov 13 03:10:36 2024 +0000 Commit: Sam James gentoo org> CommitDate: Wed Nov 13 03:10:36 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7dfc6696 dev-scheme/guile: fix 32-bit patch As Stefan reports on the forums [0], regular Make conditions don't work as expected in Automake. We'd end up having GUILE_OPTIMIZATIONS set but Automake not realising it, so it'd use the default -O2 below, which made stage0 far slower than it needed to be. Fix that so that -O1 is always used when it should be, and the special -O1 ... options are needed for 32-bit BE, as originally intended. -O2 is now never used for stage0. This fixes slow guile build times on platforms with prebuilt/. (I will note, however, that ultimately, we may end up with slow build times again if we either delete the prebuilt/ stuff entirely or make it optional - which is indeed how I didn't notice it myself at least.) [0] https://forums.gentoo.org/viewtopic-p-8845997.html#8845997 Bug: https://bugs.gentoo.org/940650 Signed-off-by: Sam James gentoo.org> .../guile/files/guile-3.0-fix-32bit-BE.patch | 27 ++++++++++++++-------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/dev-scheme/guile/files/guile-3.0-fix-32bit-BE.patch b/dev-scheme/guile/files/guile-3.0-fix-32bit-BE.patch index 6417f639b5df..a4e575691293 100644 --- a/dev-scheme/guile/files/guile-3.0-fix-32bit-BE.patch +++ b/dev-scheme/guile/files/guile-3.0-fix-32bit-BE.patch @@ -1,8 +1,17 @@ https://bugs.gentoo.org/940650#c4 -https://bugs.debian.org/cgi-bin/bugreport.cgi?att=1;bug=977223;filename=guile-3.0-fix-32bit-BE.patch;msg=66 - -diff --git a/stage0/Makefile.am b/stage0/Makefile.am -index 12029fb45..b00611df0 100644 +https://bugs.debian.org/977223 +https://sources.debian.org/patches/guile-3.0/3.0.8-2/0009-Fix-32-bit-big-endian-builds-via-Oresolve-primitives.patch/ +--- a/configure.ac ++++ b/configure.ac +@@ -374,6 +374,8 @@ esac + AC_MSG_RESULT($SCM_PREBUILT_BINARIES) + AC_SUBST([SCM_PREBUILT_BINARIES]) + ++AM_CONDITIONAL([GUILE_32_BIT_BIG_ENDIAN], [test "$SCM_PREBUILT_BINARIES" = 32-bit-big-endian]) ++ + AC_HEADER_SYS_WAIT + AC_HEADER_DIRENT + --- a/stage0/Makefile.am +++ b/stage0/Makefile.am @@ -22,7 +22,12 @@ @@ -10,11 +19,11 @@ index 12029fb45..b00611df0 100644 GUILE_WARNINGS = -W0 -GUILE_OPTIMIZATIONS = -O1 -+$(ifeq($SCM_PREBUILT_BINARIES,"32-bit-little-endian") \ -+ GUILE_OPTIMIZATIONS = -O1 -Oresolve-primitives -Ocps \ -+else \ -+ GUILE_OPTIMIZATIONS = -O1 \ -+endif) ++if GUILE_32_BIT_BIG_ENDIAN ++GUILE_OPTIMIZATIONS = -O1 -Oresolve-primitives -Ocps ++else ++GUILE_OPTIMIZATIONS = -O1 ++endif + GUILE_BOOTSTRAP_STAGE = stage0