From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id MAKGGibH7mAcggEAgWs5BA (envelope-from ) for ; Wed, 14 Jul 2021 13:14:46 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id aM41FibH7mDfKgAAB5/wlQ (envelope-from ) for ; Wed, 14 Jul 2021 11:14:46 +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 0209219474 for ; Wed, 14 Jul 2021 13:14:46 +0200 (CEST) Received: from localhost ([::1]:47466 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3cqi-0002Ku-MK for larch@yhetil.org; Wed, 14 Jul 2021 07:14:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57294) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3cqA-00017i-LU for guix-patches@gnu.org; Wed, 14 Jul 2021 07:14:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59889) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3cq8-00011p-VS for guix-patches@gnu.org; Wed, 14 Jul 2021 07:14:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m3cq8-0001R8-S8 for guix-patches@gnu.org; Wed, 14 Jul 2021 07:14:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v6 17/22] openssl: Extract logic for computing CONFIGURE_TARGET_ARCH. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Jul 2021 11:14: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: Mathieu Othacehe , Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.16262612225330 (code B ref 49025); Wed, 14 Jul 2021 11:14:08 +0000 Received: (at 49025) by debbugs.gnu.org; 14 Jul 2021 11:13:42 +0000 Received: from localhost ([127.0.0.1]:43175 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m3cph-0001Nn-HK for submit@debbugs.gnu.org; Wed, 14 Jul 2021 07:13:41 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:39776) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m3cpT-0001Jc-JZ for 49025@debbugs.gnu.org; Wed, 14 Jul 2021 07:13:27 -0400 Received: from localhost.localdomain ([188.188.219.228]) by andre.telenet-ops.be with bizsmtp id UzDG2500W4wFxCU01zDTGe; Wed, 14 Jul 2021 13:13:27 +0200 From: Maxime Devos Date: Wed, 14 Jul 2021 13:13:02 +0200 Message-Id: <20210714111307.19324-18-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210714111307.19324-1-maximedevos@telenet.be> References: <20210714111307.19324-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=1626261207; bh=59zKgKpvwivXNlDrsEtd2QfN4mS/pBxN1trlqWAIkiA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=TL2A97EQuMDJS5sLHrsFhMsdQKEeulLCqV/k3bOPEhoi4r8IcaSjFIYBL+QncYqEp Ko6Hx0G/cyU0NvDrNQDqeVZ1LViPPIOCTis7QcOdZkb3wyLHbMBYfUjJXikHdrjagZ l2qut5k8gkGRKNscMdNod6bDMvhcYQO3Z4D8Lr53Pt2czARG2VyVjKPA+B2dKFHr3j joIq7lufKEREyoztT3NHS3oUbYUI33xHnqbiUnd3EKDy8hvf0Qcp8WeHfmYJHgeLO0 ZTUp8WQq0WWEUnsKGvOAOV7xSY3MLq09Fmc8gK2dBdMUaRwjBqUFqvOsafG0QTirCP hKLdVBhITj9pw== 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=1626261286; 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=59zKgKpvwivXNlDrsEtd2QfN4mS/pBxN1trlqWAIkiA=; b=eL0803U10KEn4RIEfKySya08ostub7ehgnr6MvcmSKRj1T3TZgokxog1mljkoPdqo6+Y4M JNWLRhhRXNbU9MPUfFuyxkp9F3p/Fw/FX9lI3T/QQUZyyHp/RJBXTTN8IBSP5tpBz2bBX7 IBvddfYCM+oBkeCXbHEsuei4652YxnFfuBGfeYRHFZifWnAWKfChTHjKt7hYr+UaI3vLyw 6vaQLAbype52wjMN83JcyhmKn24Q0L+BIMYnkYyTZ8ZFBLNq98MJ/WlLJsaGofVpM8pQXK 58d7AosrhigPSDToeQLi9FeY6u61vCr82Trxs4URYt6oOnqbmArS2zIvC5amng== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1626261286; a=rsa-sha256; cv=none; b=AdBV6eRBejRnXrGskaHDTfaXW2ufb24AAmyUbX7UVPYpzBvgHs76Be2wy34YtLViXUe84o jk347oXlvNs/39QCd6qHuBtn8XJv4tVHGsZaSgolqDTtt2JiPWCd+lo+CwPR/6hR4LurGn TBgfASCbQIEus6u4rzjL8z+zgULZLg26x6g8uTCK/71jZQIuA/q5dHUi5mF8CK8sVLDTir lLfRWc2tARxg+ABaoRDOAyhVQWOjXTaOJp9wVug83g7uAjwx6pq++pCQjS/WWYft3eFrXb ZdERn6nXS8ElOYFzr+a2C2Fjyxu6aEQYGxtTZxCvjuaOSNkPsPgbklNByNVujA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=TL2A97EQ; 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.70 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=TL2A97EQ; 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: 0209219474 X-Spam-Score: 3.70 X-Migadu-Scanner: scn0.migadu.com X-TUID: io48sKr9ZiCd 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 6cebc1d6ed..8c7bba0b6e 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -311,6 +311,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") @@ -349,25 +374,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