From patchwork Mon Sep 2 15:32:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15222 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 CC3DE1734D; Mon, 2 Sep 2019 16:34:33 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 7E71217329 for ; Mon, 2 Sep 2019 16:34:33 +0100 (BST) Received: from localhost ([::1]:37552 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oLe-0001Oq-Rk for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:34:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41965) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oLH-0001Ll-8Y for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4oLF-0002aN-RN for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49900) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oLF-0002a5-J1 for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oLF-0006RQ-CM for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 02/48] gnu: openssl: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Sep 2019 15:34:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36477 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 36477@debbugs.gnu.org Received: via spool by 36477-submit@debbugs.gnu.org id=B36477.156743843224598 (code B ref 36477); Mon, 02 Sep 2019 15:34:05 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:33:52 +0000 Received: from localhost ([127.0.0.1]:58688 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oL1-0006Of-VN for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:33:52 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:55432) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oL0-0006Nt-Be for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:33:51 -0400 Received: by mail-wm1-f67.google.com with SMTP id g207so11067232wmg.5 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:33:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EvdAH9vjM6pVdtGB5ClO6MNOhkjgKNFwK19SilpDT1Y=; b=Jg0PqMRbuPmWMF6pEhfHAI4dE3izNNuia91KRovMCi1RBLWhwQowk6z3hoKvJfxpKQ sqibcfgn08bLBKAp0FzfZ7uIfuZBaxrjQTh+5t2LwcK02+aX0MakEBg5NhFDdy4X8qV+ T78N/idhtGvYs2tFsYPxFSolDn3nCQ60ZrNwpIE5aZg8UksCEIjEs2LRzAMXQFKbTrwh rXLVRhM+zcrb8TMiw8Qlfdss5iEJx3jH1i7h7G3IYySYv5iFKGyHdzaKRytxc5nwztyU NZEbcS+3K9/eb7ThR6a5i8WJB9ELSIiKnUq/4QNiMEgLW44gbhDB5tn8W3blp+5mxsIH x2fA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EvdAH9vjM6pVdtGB5ClO6MNOhkjgKNFwK19SilpDT1Y=; b=DcsSvIeFEqHsWpmLmB1HNkHg9C6Dg2nD+5C65uPVKBAHAjFoj1LYI9M29Fu9cL8UpZ zWeSYJ5mhqV7GtMpOfX6VBYw0+C43wZeTkAjjHNohISYuFIu0FlA7pZH6keuJcMKpwUQ fQ+nB4jo/FnNewe8BLfmRqE08ytk0e7kFX0wkNyNTy72WGL1OFr5EsjyEmdBiK7bvVHe NuvjBSl0yLOpX/kzPxNJo3Kr17yxirC+/bAAd/8osBpe3/jyw7ddzyx5Gxpr9kE6bx5k LAOMlGis0cDV2LRhStEmR3Ioe9XSpDGnFBePm6yIi8qPaUdW3+mVrge+kRs24TOFaVkM Buow== X-Gm-Message-State: APjAAAXjEUkUBzbO0bLyzEb+4LoO/ZZoUccqu2GxcYKXZuy0EZBIMH9x LZEFeJuGs4UQZSsyLl0vMhf1jnIT X-Google-Smtp-Source: APXvYqx/CzcZPNOGqTheypfmF+KIL3Xr6BdMCRToXBHW2PJ+mzHPeKs3eD0t8O0071LuLrAnuJLoOQ== X-Received: by 2002:a1c:720e:: with SMTP id n14mr27713072wmc.54.1567438424527; Mon, 02 Sep 2019 08:33:44 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.33.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:33:43 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:32:47 +0200 Message-Id: <20190902153333.11190-3-m.othacehe@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190902153333.11190-1-m.othacehe@gmail.com> References: <20190902153333.11190-1-m.othacehe@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mathieu Othacehe Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tls.scm (openssl-next)[arguments]: Pass CROSS_COMPILE environment variable and target system to configure script. --- gnu/packages/tls.scm | 62 ++++++++++++++++++++++++++++++++------------ 1 file changed, 45 insertions(+), 17 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index f2e7f4ad0c..73aad0c230 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2017 Rutger Helling ;;; Copyright © 2018 Clément Lassieur +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -300,6 +301,23 @@ required structures.") #:disallowed-references ,(list (canonical-package perl)) #:phases (modify-phases %standard-phases + ,@(if (%current-target-system) + '((add-before + 'configure 'set-cross-compile + (lambda* (#:key target outputs #:allow-other-keys) + (setenv "CROSS_COMPILE" (string-append target "-")) + (setenv "CONFIGURE_TARGET_ARCH" + (cond + ((string-prefix? "i686" target) + "linux-x86") + ((string-prefix? "x86_64" target) + "linux-x86_64") + ((string-prefix? "arm" target) + "linux-armv4") + ((string-prefix? "aarch64" target) + "linux-aarch64"))) + #t))) + '()) (replace 'configure (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -309,7 +327,9 @@ required structures.") (("/usr/bin/env") (string-append (assoc-ref %build-inputs "coreutils") "/bin/env"))) - (invoke "./config" + (invoke ,@(if (%current-target-system) + '("./Configure") + '("./config")) "shared" ;build shared libraries "--libdir=lib" @@ -320,7 +340,10 @@ required structures.") "/share/openssl-" ,version) (string-append "--prefix=" out) - (string-append "-Wl,-rpath," lib))))) + (string-append "-Wl,-rpath," lib) + ,@(if (%current-target-system) + '((getenv "CONFIGURE_TARGET_ARCH")) + '()))))) (add-after 'install 'move-static-libraries (lambda* (#:key outputs #:allow-other-keys) ;; Move static libraries to the "static" output. @@ -416,21 +439,26 @@ required structures.") (("^MANDIR[[:blank:]]*=.*$") (string-append "MANDIR = " out "/share/man\n"))) #t))) - (replace 'configure - ;; Override this phase because OpenSSL 1.0 does not understand -rpath. - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (invoke "./config" - "shared" ;build shared libraries - "--libdir=lib" - - ;; The default for this catch-all directory is - ;; PREFIX/ssl. Change that to something more - ;; conventional. - (string-append "--openssldir=" out - "/share/openssl-" ,version) - - (string-append "--prefix=" out))))) + (replace 'configure + ;; Override this phase because OpenSSL 1.0 does not understand -rpath. + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (invoke ,@(if (%current-target-system) + '("./Configure") + '("./config")) + "shared" ;build shared libraries + "--libdir=lib" + + ;; The default for this catch-all directory is + ;; PREFIX/ssl. Change that to something more + ;; conventional. + (string-append "--openssldir=" out + "/share/openssl-" ,version) + + (string-append "--prefix=" out) + ,@(if (%current-target-system) + '((getenv "CONFIGURE_TARGET_ARCH")) + '()))))) (delete 'move-extra-documentation) (add-after 'install 'move-man3-pages (lambda* (#:key outputs #:allow-other-keys)