From patchwork Mon Jun 14 15:38:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30240 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 01B8127BC78; Mon, 14 Jun 2021 16:47:07 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A225727BC78 for ; Mon, 14 Jun 2021 16:47:07 +0100 (BST) Received: from localhost ([::1]:54026 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lsonq-0006H9-Fj for patchwork@mira.cbaines.net; Mon, 14 Jun 2021 11:47:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54612) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lsog1-0002sW-V0 for guix-patches@gnu.org; Mon, 14 Jun 2021 11:39:01 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36063) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lsog1-0007ii-Lv for guix-patches@gnu.org; Mon, 14 Jun 2021 11:39:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lsog1-0004IT-K7 for guix-patches@gnu.org; Mon, 14 Jun 2021 11:39:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49025] [PATCH 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: Mon, 14 Jun 2021 15:39:01 +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 Received: via spool by 49025-submit@debbugs.gnu.org id=B49025.162368509316360 (code B ref 49025); Mon, 14 Jun 2021 15:39:01 +0000 Received: (at 49025) by debbugs.gnu.org; 14 Jun 2021 15:38:13 +0000 Received: from localhost ([127.0.0.1]:47565 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsofB-0004Fe-Rv for submit@debbugs.gnu.org; Mon, 14 Jun 2021 11:38:13 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:45738) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lsofA-00049r-1g for 49025@debbugs.gnu.org; Mon, 14 Jun 2021 11:38:08 -0400 Received: from butterfly.local ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id H3e72500N0mfAB4013e7VT; Mon, 14 Jun 2021 17:38:07 +0200 Message-ID: <21aa622c4f4153b6b4d3c61118a3f08b98a9ab13.camel@telenet.be> From: Maxime Devos Date: Mon, 14 Jun 2021 17:38:07 +0200 In-Reply-To: References: User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1623685087; bh=SB2vME/5ejSsqY2A+fZfvee8EhsMpmKKjvlHX221cOE=; h=Subject:From:To:Date:In-Reply-To:References; b=avcTg39Q8UF3nztM66WemRNpu7RSh9g8FP3PIUnxLVNgOLlzIebpT25uH0O1jSatO i1h1kT8pemU+lGqaCEgvRhlK8irdrqrYBjkxMoMJ2I0iRR9nqCPTmFXcqX0+UZ7xVe l7OY6Ee40DhCRqj4JqZOhZoYXugNwotDTCHkLmJDgM+2zqsezXwNM7LFDY//F4f02i fiZ+2/XC6+V9jVo8qwP6Jch39ntfLDj3to1o508OBOT0f2iNmWjsfVLaerlFCyw66F CNsPT5y6vGz/3c53Yyl21srigaUW8W3jViD+EjijOKuqOVGRQcGJ1WzKkAnmBy3Th4 /RJGwUg1CARlw== 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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 _