From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id iC6rAmYIzmAdEgEAgWs5BA (envelope-from ) for ; Sat, 19 Jun 2021 17:08:22 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id kAjsOWUIzmAOEgAAbx9fmQ (envelope-from ) for ; Sat, 19 Jun 2021 15:08:21 +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 55A1F2C595 for ; Sat, 19 Jun 2021 17:08:21 +0200 (CEST) Received: from localhost ([::1]:55184 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luca4-0002vl-DM for larch@yhetil.org; Sat, 19 Jun 2021 11:08:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56674) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lucY5-00081s-JH for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:18 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48893) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lucY1-0007yH-4Z for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:17 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lucY0-0005gR-VI for guix-patches@gnu.org; Sat, 19 Jun 2021 11:06:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v4 core-updates 22/36] openssl: Extract logic for computing CONFIGURE_TARGET_ARCH. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 19 Jun 2021 15:06:12 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49025 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49025@debbugs.gnu.org Cc: othacehe@gnu.org, Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162411516021590 (code B ref 49025); Sat, 19 Jun 2021 15:06:12 +0000 Received: (at 49025) by debbugs.gnu.org; 19 Jun 2021 15:06:00 +0000 Received: from localhost ([127.0.0.1]:60390 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucXo-0005c4-0k for submit@debbugs.gnu.org; Sat, 19 Jun 2021 11:06:00 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:59620) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lucX6-0005X6-SP for 49025@debbugs.gnu.org; Sat, 19 Jun 2021 11:05:18 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by baptiste.telenet-ops.be with bizsmtp id K3552500S0mfAB40135Gqb; Sat, 19 Jun 2021 17:05:16 +0200 From: Maxime Devos Date: Sat, 19 Jun 2021 17:04:44 +0200 Message-Id: <20210619150458.12057-23-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210619150458.12057-1-maximedevos@telenet.be> References: <20210619150458.12057-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624115116; bh=hOXFAKx0OeKrsZHlmI0Ed0p7vPPzTDwO8XFAVwi8EqM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=GzZjdh2wvPDs0p515j5JqIGDelC4tO5pnOF4tq9CkJpeisJIBFdc1X+FZqSsY4LsZ zCmLfeF2+sXbsFC/2N7YetuEw4BRDDffyclOjmIUrIlToEKuklbogMILzPeS8ZErpV KqxjyYy1CRaZHmb2yo9L29NwhatplCnS0o5u1NsDCm5+8cMOzJf8USln6scUd6Cv3I YWtHRMxLbLO0GUPYhwLzrbRTMRVyfFPpHrRUVYACzi7VFM2/60c/CfKLVsKLVzSGl4 Gyhv7FZzfk4d14bPwabtZT+DwCR/e0ay8Ucwi47zvIJxlDFIeCSeFcwzIW67b7CqQt k2U96rCkFG/UQ== 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1624115301; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=hOXFAKx0OeKrsZHlmI0Ed0p7vPPzTDwO8XFAVwi8EqM=; b=YJHHpNQxu4QxKxkGHRGtgKno5+2oGELe6hAn+owZW3Be1TBFdhXX7pnJVpvJXBLhVQIwWA iPU57Wpo539vnXlsLFRd5ut9mk+DSLA4utGK3MWlGcm9A2BvVhxv7z8W1kfG1P7eWyTVCB QPziAg3LT/FZCWBw4nChjneryatBtuCyjYH72+CBHaiYGQZqcvY7ng9cAJdu50n4yrHYZE RZ84RsIuJwOm5D7yeevfLRES5J0v9O8kZVuHFxL2kcE+iTEuN9blj6nW/cw1JR1ePVY65G IFi15mzzTCp8pwzx476Lfu8nRiqlS0EtOLIgv8iaAeNpoeENGfFPXGZR4tR83w== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1624115301; a=rsa-sha256; cv=none; b=kcsOUWGMw3GB1pOXtlaM6clOrArGJD40tLNJiSYzKP9uJTSyhnVHYAvYZNYguzs4UuBIrI I4M13rKJR/rINYTZGeIjzxbno2pNdVnU7aGEbtZl8XGZjsQqLwgO+HWRHlw48pc6DuRodW csDSFegt9+vz3mGqrXpkndFPMPefOsmRjmrYFVv794z36YK6B5IFWtzkjJWaIdhIw0DloL iPJcvI7pQhW8DT47SFod4c+i5HHT7yYnlR9cIg1C06oriibC0TcR16uG207eDFiDx3E7WP QigjJBvE4lbhqIdcU62Sney1+N0Z9OJ6hLZV6ZKzBfXHKvFrTCSlwpqvxGP5nw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=GzZjdh2w; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 3.68 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=GzZjdh2w; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 55A1F2C595 X-Spam-Score: 3.68 X-Migadu-Scanner: scn1.migadu.com X-TUID: M8GSrJye2i/c By computing this value outside the build code, new targets can be added without causing rebuilds for other targets. * gnu/packages/tls.scm (target->openssl-target): New procedure. (openssl)[arguments]<#:phases>{set-cross-compile}: Use it. --- gnu/packages/tls.scm | 46 ++++++++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 19 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 72a1cd8f0c..1ed43f0ebd 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -310,6 +310,31 @@ required structures.") (define-public guile3.0-gnutls (deprecated-package "guile3.0-gnutls" gnutls)) +(define (target->openssl-target target) + "Return the value to set CONFIGURE_TARGET_ARCH to when cross-compiling +OpenSSL for TARGET." + ;; Keep this code outside the build code, + ;; such that new targets can be added + ;; without causing rebuilds for other targets. + (cond ((string-prefix? "i586" target) + "hurd-x86") + ((string-prefix? "i686" target) + "linux-x86") + ((string-prefix? "x86_64" target) + "linux-x86_64") + ((string-prefix? "mips64el" target) + "linux-mips64") + ((string-prefix? "arm" target) + "linux-armv4") + ((string-prefix? "aarch64" target) + "linux-aarch64") + ((string-prefix? "powerpc64le" target) + "linux-ppc64le") + ((string-prefix? "powerpc64" target) + "linux-ppc64") + ((string-prefix? "powerpc" target) + "linux-ppc"))) + (define-public openssl (package (name "openssl") @@ -348,25 +373,8 @@ required structures.") (lambda* (#:key target #:allow-other-keys) (setenv "CROSS_COMPILE" (string-append target "-")) (setenv "CONFIGURE_TARGET_ARCH" - (cond - ((string-prefix? "i586" target) - "hurd-x86") - ((string-prefix? "i686" target) - "linux-x86") - ((string-prefix? "x86_64" target) - "linux-x86_64") - ((string-prefix? "mips64el" target) - "linux-mips64") - ((string-prefix? "arm" target) - "linux-armv4") - ((string-prefix? "aarch64" target) - "linux-aarch64") - ((string-prefix? "powerpc64le" target) - "linux-ppc64le") - ((string-prefix? "powerpc64" target) - "linux-ppc64") - ((string-prefix? "powerpc" target) - "linux-ppc")))))) + #$(target->openssl-target + (%current-target-system)))))) #~()) (replace 'configure (lambda _ -- 2.32.0