From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id UI9mKHnGzGAVQwAAgWs5BA (envelope-from ) for ; Fri, 18 Jun 2021 18:14:49 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id gDIkJHnGzGAqVQAAbx9fmQ (envelope-from ) for ; Fri, 18 Jun 2021 16:14:49 +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 22CB012359 for ; Fri, 18 Jun 2021 18:14:49 +0200 (CEST) Received: from localhost ([::1]:47974 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luH8q-0007k4-4v for larch@yhetil.org; Fri, 18 Jun 2021 12:14:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51920) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luH5J-0000UH-5j for guix-patches@gnu.org; Fri, 18 Jun 2021 12:11:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46298) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luH5I-00029T-SL for guix-patches@gnu.org; Fri, 18 Jun 2021 12:11:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luH5I-0002zN-Nm for guix-patches@gnu.org; Fri, 18 Jun 2021 12:11:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [[PATCH v2 core-updates] 22/37] openssl: Extract logic for computing CONFIGURE_TARGET_ARCH. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 18 Jun 2021 16:11:08 +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.162403264511227 (code B ref 49025); Fri, 18 Jun 2021 16:11:08 +0000 Received: (at 49025) by debbugs.gnu.org; 18 Jun 2021 16:10:45 +0000 Received: from localhost ([127.0.0.1]:57795 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luH4u-0002uu-FS for submit@debbugs.gnu.org; Fri, 18 Jun 2021 12:10:44 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:49836) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luH4Y-0002qa-38 for 49025@debbugs.gnu.org; Fri, 18 Jun 2021 12:10:22 -0400 Received: from localhost.localdomain ([188.188.242.184]) by baptiste.telenet-ops.be with bizsmtp id Jg9t250053zRM2s01gAMNw; Fri, 18 Jun 2021 18:10:21 +0200 From: Maxime Devos Date: Fri, 18 Jun 2021 18:09:21 +0200 Message-Id: <20210618160936.18972-22-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210618160936.18972-1-maximedevos@telenet.be> References: <20210618160936.18972-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=1624032621; bh=1ERsHqWnvtyigwuip0m1eh/IFO2MV3pns4YrtQZDDxw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:Reply-To; b=BbxACnsAssGXA2IcyXzVlKr0Y7DqgK3ZfBIP53NtOENhbtcy7pRmHC1CX4F9isyh8 p4SmWZwIvlVacQdB+bggNAf1K0MCUyV1MWBLOl+WCxJdu2ziATbCjNO/3Fxu+izZCo WJJByxNmNNnX1484vWmQdiQ7lEFs1k3Gmu6yzj/AMDbDXmFrlFW54UDg2upwLIOXL6 zV5F4rTCBL4xrdj48BOiQ+H5dumR9kYneBL1ostjazat8XjXCxxxfMNNB+FDZA+gOU aA5H7SIHHa2enoBnklHWudf/a+glXQfI20n4qcQpgjBHtS67//ulF9x17vSfW3sq2N Rm8h0edLvsmCg== 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: , Reply-To: 49025@debbugs.gnu.org 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=1624032889; h=from:from:sender:sender:reply-to: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=1ERsHqWnvtyigwuip0m1eh/IFO2MV3pns4YrtQZDDxw=; b=jHHW8A3LTMDDVj6+gXCK4EneBWL8vrjjMkICCmNMegibo0NETkKXm9e1NNbko9jW0JWEBK NYuWtw7LMIj/wmhKFcsjjcv5e8wwVtnwsFUtGOzKt4l2U2DWzcMUi6F02UMVVtrx5wZGfe A5Eh+/WfrFHQ2g98x8ItyMitznjvt866HwySDn3GKwW1VW+dXqoW27Qxc1pjMW3Fqz3Mq3 zq7M55gUpGNwtmKEsr2Bd/y9KbDDYKWEkktQyvfmgtgkq+7Y5JY/UB7CH+qZTxTRvyyWqW lJVdsNH49gSWk6S6rhpXiNkOLBcORaWgAkZujbiuLDAvxt05vu3JNHxwqHU9Bw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1624032889; a=rsa-sha256; cv=none; b=kZYyLzUj8DqXGwyY/w82HZhLmcNRwWE491+8oXqxyNSRNEkB6goLzvit7Gtl3d3gzR2RxY Y9Enix0O8MzR6/UW/bt0qmaTopiW+R+gunHjzZapHWIkGijX4DIBSsr56T8GLYE+1yeDLg 2KkmdiBV6Tk8/fgFm5vvELM8XDnggGZ/AXPRcYVIw8YwrbjbBphKUa5PuVMVRQ3hfE5wJK ocQe9hWkGIgd5QDtzf6BW45fYMpn9SqwFZSufe0UApftAh2TCzJ6VwMetFjY3cucBdCnei CPEqArCzZlzQ23DEatxYVurTbxQCJvPxqZ4epzjdSf+5BZnvZOqEqv3Y4blC2w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=BbxACnsA; 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: 5.17 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=BbxACnsA; 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: 22CB012359 X-Spam-Score: 5.17 X-Migadu-Scanner: scn1.migadu.com X-TUID: 72unOlRJwfCy 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 a4e754e27f..af91e42888 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -313,6 +313,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") @@ -351,25 +376,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