From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id kMniHWstgWCHswAAgWs5BA (envelope-from ) for ; Thu, 22 Apr 2021 10:01:47 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id wFm4GWstgWDiAgAA1q6Kng (envelope-from ) for ; Thu, 22 Apr 2021 08:01:47 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 2C61CA364 for ; Thu, 22 Apr 2021 10:01:47 +0200 (CEST) Received: from localhost ([::1]:47492 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lZUHS-0002JX-BY for larch@yhetil.org; Thu, 22 Apr 2021 04:01:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37920) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lZUH5-0001zL-5Q for guix-devel@gnu.org; Thu, 22 Apr 2021 04:01:23 -0400 Received: from flashner.co.il ([178.62.234.194]:40232) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lZUH3-0006fi-7d for guix-devel@gnu.org; Thu, 22 Apr 2021 04:01:22 -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 To: 47615@debbugs.gnu.org, guix-devel@gnu.org Subject: [PATCH v2 02/12] gnu: guile-3.0: Fix building on powerpc-linux. 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=178.62.234.194; envelope-from=efraim@flashner.co.il; helo=flashner.co.il X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+larch=yhetil.org@gnu.org Sender: "Guix-devel" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1619078507; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=i8aCNK8k1geKOW7cMLSJEQtZopGWVImNlMV9bYnTlUM=; b=BRBW3+jIrcFgpIuaVRSKzdtISpZUi/Hi+K1V93iLJwB4IXVttS2+q8fOcXgvqLAmugDEt7 6x8ZGkCfvYdmMfN5n0o+rHhaVp291WsX4ICz6VMP+DFCYd3qW6v1EAuJB+WEz5LikP4TGt 3gQ7iPkr83eFx1qIxe1LxzwelTI6QC6kuOoWRvUQUGTw9yJA+w1eYoOyl5Mdedcz0UWLvD M2ThCfon+iQ2WSmVmCYPHPiU0UPAhPYzpHRpM06w2AqaU3kfn3Q34JW4O8QYXShpm7mALE zXciN3/Jkb9TMtFKxeJwzu+UtEhQ/PduuybNz4+oRRDZQHOnQ9BLwW/0zsg35w== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1619078507; a=rsa-sha256; cv=none; b=nc6LSQAldFT80yB2lNW15NxWvSaUW4j8zpcbt8evO8FgimB1jUN8Cm1w61b3TvRDKh+Yl4 MyI+gczgJwHPKf0gkWW/J5kBCrkaAQjW4laJL8j7gSNU5wugq9/fQ7dF5tdJ2NuX/h32zD lQ29HSfeX6lxjGxYcd1E1Ybn5KkiBoAvkNjKPaaUKa8qfiYlM6gva3NZ7hPUCOUxJN9cU1 MxkKzcvPC9FXsSPLWkLr9k7uPnxij4MT2GUY3lTsJfkv9DK91/EVudAV4TaY3zHUPYlJqs M+Tqtu5b5v7puvLkVfHbbjU3x6/NpPT1ipl5bbQ87ttzQs0tcaDKJwdoef57ew== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-devel-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-devel-bounces@gnu.org X-Migadu-Spam-Score: -1.44 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-devel-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-devel-bounces@gnu.org X-Migadu-Queue-Id: 2C61CA364 X-Spam-Score: -1.44 X-Migadu-Scanner: scn0.migadu.com X-TUID: Pvn+8JRcDeys * 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") -- 2.31.1