From patchwork Thu Apr 22 07:59:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 28742 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C580E27BC7C; Thu, 22 Apr 2021 09:02:50 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 90A0827BC7B for ; Thu, 22 Apr 2021 09:02:50 +0100 (BST) Received: from localhost ([::1]:50160 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lZUIT-0003VE-Oy for patchwork@mira.cbaines.net; Thu, 22 Apr 2021 04:02:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38178) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lZUHi-0002yC-Et for guix-patches@gnu.org; Thu, 22 Apr 2021 04:02:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49105) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lZUHi-0007Cr-6M for guix-patches@gnu.org; Thu, 22 Apr 2021 04:02:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lZUHi-0008JS-4T for guix-patches@gnu.org; Thu, 22 Apr 2021 04:02:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47615] [PATCH v2 02/12] gnu: guile-3.0: Fix building on powerpc-linux. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Apr 2021 08:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47615 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47615@debbugs.gnu.org, guix-devel@gnu.org Cc: Efraim Flashner Received: via spool by 47615-submit@debbugs.gnu.org id=B47615.161907848731901 (code B ref 47615); Thu, 22 Apr 2021 08:02:02 +0000 Received: (at 47615) by debbugs.gnu.org; 22 Apr 2021 08:01:27 +0000 Received: from localhost ([127.0.0.1]:60648 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lZUH9-0008IT-Bi for submit@debbugs.gnu.org; Thu, 22 Apr 2021 04:01:27 -0400 Received: from flashner.co.il ([178.62.234.194]:43488) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lZUH8-0008IG-3Y for 47615@debbugs.gnu.org; Thu, 22 Apr 2021 04:01:26 -0400 Received: from localhost (unknown [31.210.177.125]) by flashner.co.il (Postfix) with ESMTPSA id 3B580403A4; Thu, 22 Apr 2021 08:01:20 +0000 (UTC) From: Efraim Flashner Date: Thu, 22 Apr 2021 10:59:15 +0300 Message-Id: <007143fda1cfa0d5e6625158a94ea4e48b79a790.1619076704.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/guile.scm (guile-3.0)[arguments]: On powerpc add two phases to adjust for 32-bit big-endian systems. --- gnu/packages/guile.scm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) This patch has the comments updated. I reported my findings to the guile debbugs email and Other People™ are testing the changes on the other architectures. Otherwise patch unchanged. diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index f63322794d..08ad50f7b0 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -305,7 +305,22 @@ without requiring the source code to be rewritten.") (substitute-keyword-arguments (package-arguments guile-2.2) ((#:configure-flags flags ''()) `(cons "--disable-jit" ,flags))) - (package-arguments guile-2.2))) + (if (string-prefix? "powerpc-" (%current-system)) + (substitute-keyword-arguments (package-arguments guile-2.2) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'adjust-bootstrap-flags + (lambda _ + ;; Upstream knows about suggested solution. + ;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=45214 + (substitute* "bootstrap/Makefile.in" + (("^GUILE_OPTIMIZATIONS.*") + "GUILE_OPTIMIZATIONS = -O1 -Oresolve-primitives -Ocps\n")))) + (add-after 'unpack 'remove-failing-tests + (lambda _ + ;; TODO: Discover why this test fails on powerpc-linux + (delete-file "test-suite/standalone/test-out-of-memory")))))) + (package-arguments guile-2.2)))) (native-search-paths (list (search-path-specification (variable "GUILE_LOAD_PATH")