From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 6PN+Dsva6mBVUQAAgWs5BA (envelope-from ) for ; Sun, 11 Jul 2021 13:49:31 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id GGdECsva6mC2OAAAB5/wlQ (envelope-from ) for ; Sun, 11 Jul 2021 11:49:31 +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 EA0052A153 for ; Sun, 11 Jul 2021 13:49:30 +0200 (CEST) Received: from localhost ([::1]:51364 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2Xxi-0005Ts-0J for larch@yhetil.org; Sun, 11 Jul 2021 07:49:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57570) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2XxL-0004DM-VN for guix-patches@gnu.org; Sun, 11 Jul 2021 07:49:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50782) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2XxL-0008Lk-MS for guix-patches@gnu.org; Sun, 11 Jul 2021 07:49:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m2XxL-000758-MG for guix-patches@gnu.org; Sun, 11 Jul 2021 07:49:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH v5 15/20] openssl: Extract logic for computing CONFIGURE_TARGET_ARCH. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 11 Jul 2021 11:49:07 +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: Maxime Devos Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162600409627026 (code B ref 49025); Sun, 11 Jul 2021 11:49:07 +0000 Received: (at 49025) by debbugs.gnu.org; 11 Jul 2021 11:48:16 +0000 Received: from localhost ([127.0.0.1]:34070 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m2XwW-00071j-AD for submit@debbugs.gnu.org; Sun, 11 Jul 2021 07:48:16 -0400 Received: from xavier.telenet-ops.be ([195.130.132.52]:38492) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m2XwM-0006y4-2B for 49025@debbugs.gnu.org; Sun, 11 Jul 2021 07:48:06 -0400 Received: from localhost.localdomain ([213.119.242.127]) by xavier.telenet-ops.be with bizsmtp id Tnno2500V2ldwth01no5sP; Sun, 11 Jul 2021 13:48:05 +0200 From: Maxime Devos Date: Sun, 11 Jul 2021 13:47:18 +0200 Message-Id: <20210711114723.27568-16-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210711114723.27568-1-maximedevos@telenet.be> References: <419215938396207999184dafa43afaed6d7a0715.camel@telenet.be> <20210711114723.27568-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=1626004085; bh=59zKgKpvwivXNlDrsEtd2QfN4mS/pBxN1trlqWAIkiA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=oeIcvvqICV7FNzjBPxYad1JxQdzU5TOF5Alfc2EV8NpSxReD6TKXvKJusGLmiL8Ql QRaBLIqfhRd+2rBVFHIdxYzeUSgNyDnWqjGqzF1tphLmSJd1AwdAG1CPNUogWYER+9 bOfRD4nJNxc71OoWAHMMPGBmk3VyZVNtaerkQuVoTqrAoieubGrFV0NW2DbyrhFQaE g2w47ZRc94qzoJSqSQMG2AaUVcr6dwlgKjkcaZn7eFtOHRIHoNhrSY9YY9jB3cPOPs nWmkqdriyuq5uKpozqnEL1yHknPSOyWjkIVmADXqnnqlpxdh8VEW7r/vrweFc/9/IG 9pXbun5YEJOUQ== 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=1626004171; 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=SjvnJl8etHY6Wd2nEKH0uAhavtGmnJx9ar2UpkV6NglmzMHafFjcBs+AHm07ZFjCCOhoY9 gPmWOPZJHqWXeapt28xpxoF7i/QBGHazBbkIwUbx5IHrOVwwp4JuqWyXfSILBYnvnXIWka C1b/P0Zi0qwRN9yUJdE3E3i6WgSo6AHTxSw+B+oPjFfEu4LBBgp8y8kuffSTQqBWKPX1jl sirVAk+JrHxBm3NxxhompyPri3CDDajqvNNUZ7YmKjRMutAAfPWccZVZCKNBnqvoH5Wq4S LENbLENdjPPpPf05RJavIHgrc+M9yFa9fu3VvlAwURiPdcjcjCcMhhW+GBeYog== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1626004171; a=rsa-sha256; cv=none; b=Bk0R8eMm/Z4DrlBh0KJIo7lhOgDBb3U9bcBFO02KMVjd/YkqjfJZlV6MAzIbrbpTh8itd7 W+2a/a3QVMC4xR2m7cmrL5hs9IhD8hghMe4ZeHFVPNJNM0//+qVW3awqbAZaVrL476yYnw OJeeAf7t63EIFnTgWEJek7LdSetbwVHY1mEh3ime1Il7GA3BiYAtNGT5dZ3Zu57bCM8dAO sjTUVsxiELmG+DUK9SYhyPzeSn/lV0I4Rhcv34LJcwfpvLbovYWkuvWUoz4C4cXwlkLPHj 2MnzOjax+OpCh4HI59vMfjCLthcItV/6xhsB16IaxKjDVFLR1XU8NyBUgbBMfQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=oeIcvvqI; 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.69 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=oeIcvvqI; 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: EA0052A153 X-Spam-Score: 3.69 X-Migadu-Scanner: scn0.migadu.com X-TUID: h4VcWbrFgxQZ 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