From patchwork Mon Sep 2 15:32:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15221 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 EE6941734D; Mon, 2 Sep 2019 16:34:31 +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 9D76417329 for ; Mon, 2 Sep 2019 16:34:31 +0100 (BST) Received: from localhost ([::1]:37550 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oLe-0001N8-NL for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:34:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41934) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oLF-0001Kk-Vs for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4oLE-0002Ya-KK for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49896) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oLE-0002YU-Hk for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oLE-0006Qx-BB for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 01/48] gnu: libgpg-error: 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:04 +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.156743843124578 (code B ref 36477); Mon, 02 Sep 2019 15:34:04 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:33:51 +0000 Received: from localhost ([127.0.0.1]:58685 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oL0-0006OG-Hn for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:33:50 -0400 Received: from mail-wm1-f43.google.com ([209.85.128.43]:37388) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oKz-0006Nr-6L for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:33:49 -0400 Received: by mail-wm1-f43.google.com with SMTP id d16so15056394wme.2 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:33:49 -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=fbjhgLiIcSFl1jnVMgZJ0ZGtXkc4IJDs6xJwIiAuOxg=; b=rsjGgZoiRue05VDXz1fsHkOm9rFBFw1hO2w9PtesM9WXNec5AFPcHv4GcdDvAXTkdk q/O25/biwZ4TS67r/QjXqKlnWsSFeFapRuamPo1Zgb1dqO4xTZBgNWR5/tItlMQ8bU6h 9RwfyZ5cmF9cuTAUMuPSkKrbR15Vu/7Hdctd7PPx/k0KXSrHQsVp7RBT7bW2mLUmp9Rw baQiFnkVCq0CMS0netAfH7w+X8eB7HA06GY9e1k+cGYMuMh7blwiu4cysgVX9dlWrSaN LLvPRU49PU/WuSJTKu6v9yBqg/MnzRebdQ/4ACTp+rXD9XS0G66Ehxi8ZSeG8CAg+3gM 550Q== 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=fbjhgLiIcSFl1jnVMgZJ0ZGtXkc4IJDs6xJwIiAuOxg=; b=CQu31/R4czrGTWkaN7/MAI6eYIyrk7ZNjzLvi5un5c/aIPt3mj0eu9VFoVEJ7kQqoo AZ1r34gxz80BdcSSYePTsDm4SY8+lJVhT4lE3MhCxIKGEVTXFXc0DUm0/fkoeN87bfzy y0X+c8HkSexwqHOBgyBC9yYedT7GGupBR4mjVqdizzbyIrpVHmKEmFaTdz518ZH9fCnL KDfwhc0jqx5N+9NisQ7VMJNxHlNp5O1oWyVgca3NR2DKzqQGWM68nbhVr7fVcpogN/Uh vMHw8C36nXFE2Hek1mwb65wBTMNvVdqKRvlY10Jc4oBKdbP9b76dTpetsrHpT7DCslVp ilpw== X-Gm-Message-State: APjAAAVJ2sP2E6Vd+ad9iytLyuc6QbuFjbvUXgz5sZKLNRPGCTZXDVht 7rFbmcgoUld254OxXWWD9WAIIwNr X-Google-Smtp-Source: APXvYqwukO5sp4YVRvbmY+a7rXNBW2+ucCcr93dgjkYwjl9kufDpco8V8TJGx13f9oYSh1eUpwrlzg== X-Received: by 2002:a7b:cb0a:: with SMTP id u10mr9676026wmj.16.1567438423273; Mon, 02 Sep 2019 08:33:43 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.33.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:33:42 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:32:46 +0200 Message-Id: <20190902153333.11190-2-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/gnupg.scm (libgpg-error)[arguments]: Add a lock-obj header to the target platform when cross-compiling, [native-inputs]: add gettext that is needed when cross-compiling. --- gnu/packages/gnupg.scm | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 95a35368fa..c7e6aabf79 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2017 Petter ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Marius Bakke -;;; Copyright © 2018 Björn Höfling +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -96,6 +96,31 @@ (("namespace=errnos") "pkg_namespace=errnos")) #t)))) (build-system gnu-build-system) + (arguments + (if (%current-target-system) + `(#:modules ((ice-9 match) + (guix build gnu-build-system) + (guix build utils)) + #:phases + (modify-phases %standard-phases + ;; When cross-compiling, some platform specific properties cannot + ;; be detected. Create a symlink to the appropriate platform + ;; file. See Cross-Compiling section at: + ;; https://github.com/gpg/libgpg-error/blob/master/README + (add-after 'unpack 'cross-symlinks + (lambda* (#:key target inputs #:allow-other-keys) + (let ((triplet + (match (string-take target + (string-index target #\-)) + ("armhf" "arm-unknown-linux-gnueabi") + (x + (string-append x "-unknown-linux-gnu"))))) + (symlink + (string-append "lock-obj-pub." triplet ".h") + "src/syscfg/lock-obj-pub.linux-gnu.h")) + #t)))) + '())) + (native-inputs `(("gettext" ,gettext-minimal))) (home-page "https://gnupg.org") (synopsis "Library of error values for GnuPG components") (description 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) From patchwork Mon Sep 2 15:32:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15232 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 1D4A91734D; Mon, 2 Sep 2019 16:36:08 +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 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 DA64717329 for ; Mon, 2 Sep 2019 16:36:07 +0100 (BST) Received: from localhost ([::1]:37604 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oNC-00030G-RN for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:36:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41979) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oLH-0001M9-NO for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4oLG-0002be-LH for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49902) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oLG-0002bA-GJ for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oLG-0006Rf-Af for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 03/48] gnu: texinfo: 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:06 +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.156743843424620 (code B ref 36477); Mon, 02 Sep 2019 15:34:06 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:33:54 +0000 Received: from localhost ([127.0.0.1]:58692 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oL4-0006P0-CY for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:33:54 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:51194) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oL1-0006Nu-AR for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:33:51 -0400 Received: by mail-wm1-f68.google.com with SMTP id c10so3138064wmc.0 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:33:51 -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=Ajr8xf2vRDDxJ2Ol3st96lpfnw0F/3sbAMrDymCwnyc=; b=G9JNgFy/kPXx9QN3kl+7W15KcOZc62NKhDneAEG3rctx8dUw5/gTuEXpA3DTtz7Dl5 RRis1A5RXIJAJkhh+3yXclz9v8xToR6+NFN9Usjvyk5JAaYYKu4LOL6AhOf3XXshOJCe Yfv1ENfSJiRrzVGYniQPSDobbVYa6YYu0K43iZlcCA+2ALrKNbyyw4ZrSX36JesTV635 4phXpPped73Gk22jUYTJVQot9Eb5cNF++OFC6M8yGrNO6q57+vNQ19UXpkK/NJ0sneu0 25MFN/j+QZCMa4IGX1mCek9D1FbsjrMG4DCkT0x9kMofaOw//d2Y85HB937oJ82AP6dS fCbw== 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=Ajr8xf2vRDDxJ2Ol3st96lpfnw0F/3sbAMrDymCwnyc=; b=coKua2DZwsnf3eRkfaJ+4gu7VSs9dDkmO/DmciU6wF2Bq09cNAELcQhGy2UrGwZLWX rfqhyPAzByI1ku34kilEOs5V8V57yvkpz4ugob0RumHoNz0JRSdF8ZYdtdzeoPvlUzZ1 aR2KjinU0WIOvPVV/JVGR4SEDtY/qfd9dWgaTxerk/+D2SrKKSOkesz8+dAwXP9hUvIP g/sA/EPJW4QiH0iSET3FUI4NtqEgNloriheHFVyB7DibPiOFAvh6okLkzuGDwY7cNzd8 2KiCTYKxnAy74sWfY4v0WM9OzSpfoa6pD9YgCW6+hKnQ8weYaE1Ld9y++WBdr09Djori t2ZA== X-Gm-Message-State: APjAAAXyEjL96PnqbuCrNKggKJGRN4oCOMR8TMaQpZAYPdaxdKXPcYkT zivV0w5K6BhfB+2+B5/WpXNJA7IA X-Google-Smtp-Source: APXvYqyS/npEVLs7ziY2h4K2z/WDRgEY8uFNv44GS8tRQA93UN5z2ONmEohXL78pUGHUB4FpiRBZfA== X-Received: by 2002:a1c:1aca:: with SMTP id a193mr1882468wma.120.1567438425528; Mon, 02 Sep 2019 08:33:45 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.33.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:33:45 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:32:48 +0200 Message-Id: <20190902153333.11190-4-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/texinfo.scm (texinfo)[arguments]: Do not reset environment before running configure with the native compiler, in a cross-compilation context, [inputs]: move perl from here ... [native-inputs]: ... to here. Also add ncurses that is needed in a cross-compilation context to build texinfo native tools. --- gnu/packages/texinfo.scm | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index befdd78551..c93c7fc353 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -41,8 +41,28 @@ (base32 "0rixv4c301djr0d0cnsxs8c1wjndi6bf9vi5axz6mwjkv80cmfcv")))) (build-system gnu-build-system) - (inputs `(("ncurses" ,ncurses) - ("perl" ,perl))) + (arguments + ;; When cross-compiling, the package is configured twice: once with the + ;; native compiler and once with the cross-compiler. During the configure + ;; with the native compiler, the environment is reset. This leads to + ;; multiple environment variables missing. Do not reset the environment + ;; to prevent that. + `(,@(if (%current-target-system) + '(#:phases + (modify-phases %standard-phases + (add-before 'configure 'fix-cross-configure + (lambda _ + (substitute* "configure" + (("env -i") + "env ")) + #t)))) + '()))) + (inputs `(("ncurses" ,ncurses))) + ;; When cross-compiling, texinfo will build some of it's own binaries with + ;; the native compiler. This means ncurses is needed both in both inputs + ;; and native-inputs. + (native-inputs `(("perl" ,perl) + ("ncurses" ,ncurses))) (native-search-paths ;; This is the variable used by the standalone Info reader. From patchwork Mon Sep 2 15:32:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15238 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 531B61734D; Mon, 2 Sep 2019 16:36: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 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 0EEF817329 for ; Mon, 2 Sep 2019 16:36:33 +0100 (BST) Received: from localhost ([::1]:37618 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oNc-0003Wp-0G for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:36:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41990) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oLI-0001Ma-4N for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4oLH-0002cG-0v for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49904) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oLG-0002bz-Te for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oLG-0006Rr-Q3 for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 04/48] gnu: cmake: 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:06 +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.156743843524633 (code B ref 36477); Mon, 02 Sep 2019 15:34:06 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:33:55 +0000 Received: from localhost ([127.0.0.1]:58695 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oL4-0006P4-PH for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:33:55 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:37210) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oL2-0006Nw-Bq for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:33:52 -0400 Received: by mail-wm1-f66.google.com with SMTP id d16so15056526wme.2 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:33:52 -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=veZqU6dWskdofP94vEQ2ligOZQWONzY/eLOoYY8WvdA=; b=i3UwzybfNlhfZs+KPVKjQVO8uqycfZaVTQ2xkkBqWuXe0CJcJw0+hj69qjYqPlXhKq Fh7WUlxyHnI/RJEI10ZX8RMMm/p86GWAMaBaIMXbxFiEmYIIzQPnWiAIKeu0J8Xc6Nur 6zxemd0GpNHtdz+MvXsVtO48ivaP5/y3Q9p/fYsy52WWJ6Ufqg0u3ZRnEI8Bfpo+CniW H7yoQk3Qjtf0S6qo+QpLm9SV9NiPP7+S2u53PNxWYfwwXBsYCOeHJ77a+ajhlMRZAB9v OFFXPc0Xt5MParOzTpMbIeZnxDYql7v0zp+2FVt2vAmyJC0skEIFSNNVBUYAR7dREigh VLow== 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=veZqU6dWskdofP94vEQ2ligOZQWONzY/eLOoYY8WvdA=; b=MkV3mJzpDpi34upAb9k5Ax9GR02sSqCCCxom+sWConlaYpcgd6+8ed1QLoNAb0cakA fWXfBLy2uE8pXsyYOmFK+SY7e28mK2C6VjxtTZovcWNZStWJD1bobTsVkHfD6UX//tdt WzrAz+i6lkCNYer/uzEqXD+pSSaJ025WlDPcPoA3SDpGxukhGmPy9EsxngZ7SgaiJn/D cfsn7Rq/jsKBBBdI8V8hnGAsHC/0AewjG2W6DtFRhXkd9b8xCc9A3EEHbFjkBndjQKGQ QXNS/FjxXNmmB26dqEK1Eidb4KspXOg2zKar/G+BFBCYSodMOio4O0NooR86JBtsV3/O QOAA== X-Gm-Message-State: APjAAAUoTrExZhBsbIZyrdcYqBx8RxyvskFhy1VG7swDmuvDZ2VR1xNm W90PrAHG+6JtXi+DXu8ieZ4QElJo X-Google-Smtp-Source: APXvYqwPl8jblMAbmIrQVtH9XlFWcz8pu8FVxo+H8vkXoppEN3Vx2AwobJFhADnmvOlr6RMSo/aXog== X-Received: by 2002:a7b:cbcf:: with SMTP id n15mr36984389wmi.48.1567438426538; Mon, 02 Sep 2019 08:33:46 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.33.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:33:46 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:32:49 +0200 Message-Id: <20190902153333.11190-5-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/cmake.scm (cmake-minimal-cross): New package. * guix/build-system/cmake.scm (default-cmake): Add new target argument and use it to select cmake-minimal or cmake-minimal-cross. (lower): Pass target to default-cmake. --- gnu/packages/cmake.scm | 8 ++++++++ guix/build-system/cmake.scm | 9 ++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index 1d8d829ec5..9bf0273f00 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -207,6 +207,14 @@ and workspaces that can be used in the compiler environment of your choice.") (outputs '("out" "doc")) (properties (alist-delete 'hidden? (package-properties cmake-minimal))))) +(define-public cmake-minimal-cross + (package + (inherit cmake-minimal) + (name "cmake-minimal-cross") + (native-search-paths '()) + (search-paths + (package-native-search-paths cmake-minimal)))) + (define-public emacs-cmake-mode (package (inherit cmake) diff --git a/guix/build-system/cmake.scm b/guix/build-system/cmake.scm index ca88fadddf..aa0f4187ec 100644 --- a/guix/build-system/cmake.scm +++ b/guix/build-system/cmake.scm @@ -43,16 +43,19 @@ `((guix build cmake-build-system) ,@%gnu-build-system-modules)) -(define (default-cmake) +(define (default-cmake target) "Return the default CMake package." ;; Do not use `@' to avoid introducing circular dependencies. (let ((module (resolve-interface '(gnu packages cmake)))) - (module-ref module 'cmake-minimal))) + (module-ref module + (if target + 'cmake-minimal-cross + 'cmake-minimal)))) (define* (lower name #:key source inputs native-inputs outputs system target - (cmake (default-cmake)) + (cmake (default-cmake target)) #:allow-other-keys #:rest arguments) "Return a bag for NAME." From patchwork Mon Sep 2 15:32:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15235 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 045051734D; Mon, 2 Sep 2019 16:36:20 +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 B5D9817329 for ; Mon, 2 Sep 2019 16:36:19 +0100 (BST) Received: from localhost ([::1]:37614 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oNO-0003FX-UU for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:36:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42007) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oLI-0001N0-PX for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4oLH-0002d6-Hr for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49905) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oLH-0002d1-Ej for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oLH-0006Ry-Ay for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 05/48] gnu: libpaper: Fix aarch64 cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Sep 2019 15:34:07 +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.156743843524645 (code B ref 36477); Mon, 02 Sep 2019 15:34:07 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:33:55 +0000 Received: from localhost ([127.0.0.1]:58697 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oL5-0006PG-7o for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:33:55 -0400 Received: from mail-wm1-f46.google.com ([209.85.128.46]:55624) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oL3-0006Ny-Bq for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:33:53 -0400 Received: by mail-wm1-f46.google.com with SMTP id g207so11067381wmg.5 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:33:53 -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=uEJlu+nj8wYQv4Io36GWgKbWiTaW16j8T1ZQciMpFfY=; b=jD5LiqqgN8c2O0XixAlCQqsG8N7mgWvB6Sv0Ux/2mqI8cCT6sAj5rpzEwE4tjkz46d heUO4n58mRa+HauNUP6KPFEjFMJR26nWXylh5YEtJB3nlMC6KA6p8sh26nSSyjMUDkN8 0cM38ivalf9eff5s5ZcS2CIzgT762SSgiKQa2fnqW6Nryi+DJGKzniEbwx46BcrZAR3m z+Eb2QBbaLWOtA5NB6bbGnbjqyQ5KDkvc+Y3lh2uuQWtkCtVuw+iw1M3VEks5cz1AiX4 tQI1mfsTGv4SyIfTX7VNQ+sgDjSIPNSeIsM3ye4S7mlBxoNGHyJ0a9+PkyxgB6hauPz0 yKpg== 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=uEJlu+nj8wYQv4Io36GWgKbWiTaW16j8T1ZQciMpFfY=; b=Dw25F8jM0nIwCJxtFARYSTFouq5TsSdMoPEAAb4oWUv2yvgKQbvBEg+wxWkoZSsXT9 +DIwXQ215cygStKFRGGLqqK6j1zxYB8fzYbaiTOr+JcVl0EnZsoJEvas9Exn4XfYCAWC BKiHYtM+HTl7UFDtKgkqlcuuI0uigdKw06km5L4Xhd6I8JhtqrYYhLuWvX1VpNy7EAE5 aX1q1mPRNYRNX29/zma+1WsGBGHWgthqNUfygIAJLks6AH0kEpFlnlgwQ6DV/E3Y15qX oGzaYHVCIAe25NFA+6MK5f1myG99U9xhY22SoZWMINNN3/x3BAev8XwtPI47MY4q6chV lVfw== X-Gm-Message-State: APjAAAUeXxDAw14b/9q8zcwMr/J0l/XjJD0vHwml2ryHlD5gzEFKZvKz Of6kgE012t6qs6pTxL9SXywx6RYi X-Google-Smtp-Source: APXvYqyYD5izd6yfN4kqKEKg0I6DwgF/FFXccIvzK5vwiTBo6P9p18jslSmy60MMe7IMKbUMEFTinQ== X-Received: by 2002:a7b:c0d4:: with SMTP id s20mr8634626wmh.110.1567438427528; Mon, 02 Sep 2019 08:33:47 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.33.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:33:47 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:32:50 +0200 Message-Id: <20190902153333.11190-6-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 The packaged config.sub and config.guess do not have aarch64 support. Replace them by the ones from automake. * gnu/packages/ghostscript.scm (libpaper)[arguments]: Replace outdated config.sub and config.guess, taken from ... [native-inputs]: ... here, by adding automake. --- gnu/packages/ghostscript.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm index 817104cde1..e6879eada9 100644 --- a/gnu/packages/ghostscript.scm +++ b/gnu/packages/ghostscript.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Marius Bakke +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -84,6 +85,24 @@ Consortium standard (ICC), approved as ISO 15076-1.") (sha256 (base32 "0zhcx67afb6b5r936w5jmaydj3ks8zh83n9rm5sv3m3k8q8jib1q")))) (build-system gnu-build-system) + (native-inputs + `(("automake" ,automake))) ; For up to date 'config.guess' and 'config.sub'. + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-configure + (lambda* (#:key inputs native-inputs #:allow-other-keys) + ;; Replace outdated config.sub and config.guess: + (for-each (lambda (file) + (install-file + (string-append (assoc-ref + (or native-inputs inputs) "automake") + "/share/automake-" + ,(version-major+minor + (package-version automake)) + "/" file) ".")) + '("config.sub" "config.guess")) + #t))))) (synopsis "Library for handling paper sizes") (description "The paper library and accompanying files are intended to provide a simple From patchwork Mon Sep 2 15:32:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15243 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 BBA311734D; Mon, 2 Sep 2019 16:36:49 +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 3850B17329 for ; Mon, 2 Sep 2019 16:36:49 +0100 (BST) Received: from localhost ([::1]:37628 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oNs-0003pf-Fh for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:36:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42039) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oLK-0001Nr-AB for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4oLI-0002ea-2l for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49907) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oLH-0002e1-Vh for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oLH-0006S6-PV for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 06/48] gnu: groff: 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:07 +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.156743844124663 (code B ref 36477); Mon, 02 Sep 2019 15:34:07 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:34:01 +0000 Received: from localhost ([127.0.0.1]:58701 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oL6-0006PZ-Kq for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:00 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:34863) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oL4-0006O5-BN for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:33:54 -0400 Received: by mail-wr1-f68.google.com with SMTP id g7so14485624wrx.2 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:33:54 -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=MLoKM26KiDKSQJBPaWe+0gl5V43a258D4sP2wVkGi5c=; b=E+h2QSkwjPskIoMy9bj8dAvs+Ug0aVLWT/oXnq5DjtUtGw0AfoqT7+MIa31+uUJ+MH Mgqu2bskKIWPioc9o4oBGU5mTqSLsAnDUYdCJUnDmDo+iU7Qi662wZUhl3LeMTEag4Al egww1gqcWX/+LaR17gjSBBNqrCp12HuIrSbVO4f/qXpLXG7iqj5gX9QEDepMujH5fW8F wSF0+uWAtqFwzKkOpYUn/dfbCt0/+OsPjIRhEHOeHp/dQCdYB7YPslCAMxp5K/cBTxpV LDroI8rl5dx7ao6GnVXBncwmXM2mWSP3kLWp2OUfQmfdsKpYQoqy5G4T8XRM1l5UAJ1M k8AQ== 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=MLoKM26KiDKSQJBPaWe+0gl5V43a258D4sP2wVkGi5c=; b=Wtlmo0850xf0mI/NstGV6tVF6IGDp1BvnTimUw6heWQmmJPzId7IkjqyMcmqlNPUNh t3oG8tvtlBEuSmDATDASEscdG6zCJ/TAatmU78tdCmamsARiG8mYEOCDzzovVc/q65bw i6nXuzO4yRkYgtKSiRAyYzwIREm44qSlHeLppkJXyrFxE1wlcSNS40ixbOrcL0VFPsx4 Jyk9FATfJ0/a4w1KTTgt3mHbqVbEq+0h5y0B4hEffh7CSjjMMxUFOi1xIY2WZ2BPB/At tX7yf/QDoWZboMUV4vEA+vn113AilUmpFIp+iXC3w10cz/DCcPS1wG869v7NHKLX4/2v TAqA== X-Gm-Message-State: APjAAAXiI0z5Z8s/4EVsQ0oG0BmxCCKmLAbi6yROHG9BWYklImz4A8RE LjDgjRtfw0RBl1Y4Q4pHb9uUHqdZ X-Google-Smtp-Source: APXvYqxSQaigKSHLAB6IqS3kLw+eRxhZZvCyN5DDCAc5zNVY6gbgaEkD/m0Fe97GBeVaFmlH2M58mg== X-Received: by 2002:a5d:5387:: with SMTP id d7mr20529868wrv.312.1567438428510; Mon, 02 Sep 2019 08:33:48 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.33.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:33:48 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:32:51 +0200 Message-Id: <20190902153333.11190-7-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/groff.scm (groff)[arguments]: Replace build phase to pass GROFF_BIN_PATH and GROFFBIN variables when cross-compiling. Also add native groff as a native-input when cross-compiling. --- gnu/packages/groff.scm | 40 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 37 insertions(+), 3 deletions(-) diff --git a/gnu/packages/groff.scm b/gnu/packages/groff.scm index 98f17914bf..65b661cd79 100644 --- a/gnu/packages/groff.scm +++ b/gnu/packages/groff.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2017 Ludovic Courtès ;;; Copyright © 2019 Efraim Flashner ;;; Copyright © 2019 Eric Bavier +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -55,7 +56,13 @@ ;; from 'inputs'. (inputs `(("ghostscript" ,ghostscript))) - (native-inputs `(("bison" ,bison) + + ;; When cross-compiling, this package depends upon a native install of + ;; itself. + (native-inputs `(,@(if (%current-target-system) + `(("self" ,this-package)) + '()) + ("bison" ,bison) ("perl" ,perl) ("psutils" ,psutils) ("texinfo" ,texinfo))) @@ -94,7 +101,33 @@ (lambda _ ;see https://savannah.gnu.org/bugs/index.php?55461 (substitute* "Makefile.in" (("^docdir =.*") "docdir = @docdir@\n")) - #t))))) + #t)) + ,@(if (%current-target-system) + '((replace 'build + (lambda* (#:key + make-flags parallel-build? + native-inputs target #:allow-other-keys) + ;; When cross-compiling, native groff is needed, see: + ;; http://www.mail-archive.com/bug-groff@gnu.org/msg01335.html + (let ((parallel + (if parallel-build? + `("-j" ,(number->string (parallel-job-count))) + '())) + (flags + (if target + (let ((groff (or + (assoc-ref native-inputs "groff") + (assoc-ref native-inputs "self")))) + (append + make-flags + (list + (string-append "GROFF_BIN_PATH=" groff) + (string-append "GROFFBIN=" groff + "/bin/groff")))) + make-flags))) + (apply invoke `("make" ,@parallel ,@flags))) + #t))) + '())))) (synopsis "Typesetting from plain text mixed with formatting commands") (description "Groff is a typesetting package that reads plain text and produces @@ -115,7 +148,8 @@ is usually the formatter of \"man\" documentation pages.") ;; Omit the DVI, PS, PDF, and HTML backends. (inputs '()) (native-inputs `(("bison" ,bison) - ("perl" ,perl))) + ("perl" ,perl) + ("groff" ,groff))) (arguments `(#:disallowed-references (,perl) From patchwork Mon Sep 2 15:32:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15223 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 3D6941734D; Mon, 2 Sep 2019 16:34:44 +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 EDBA717329 for ; Mon, 2 Sep 2019 16:34:43 +0100 (BST) Received: from localhost ([::1]:37560 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oLq-0001fR-Od for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:34:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42042) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oLK-0001Nw-BV for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4oLI-0002g8-PH for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49908) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oLI-0002fP-Ey for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oLI-0006SF-A3 for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 07/48] gnu: texinfo-5: 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:08 +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.156743844224694 (code B ref 36477); Mon, 02 Sep 2019 15:34:08 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:34:02 +0000 Received: from localhost ([127.0.0.1]:58707 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLA-0006Pk-VO for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:02 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:35298) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oL5-0006OC-7p for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:33:55 -0400 Received: by mail-wm1-f68.google.com with SMTP id n10so4385981wmj.0 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:33:55 -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=QgEosa+JuN/2tF/22Iuzgl9bBc6yclBToJTHYX3YTKw=; b=W8sPHhZNIYpOrdJKgticr1jtEm/fc+zUI71B48X7IPxheqcKUtL3EYeRDLAt5bo4bE nHRgRdNHTin1JMBx+jZ8pzMIg05ox8/yTq72U90Y480KkerkOhtx8GxqnUsdLBcPoAOs VILcCRAFG22XVceqZTFYSdeCaQPYh+tBPmOyAwGo849aVBxcTyvI9XBokFO6AItUaxYq A6QjHzAY+rwcY3z6E33P7T+pCcRsWB5xOUT5JRy9MUo2EnjmkM2XM+HZOuG8PnOqFF69 yk6NXJl3b/NKfA5MLXnieXq/eMlcFh/o29f5Za5/4QseaRSK/uz+tOfqUiiburngy691 AONQ== 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=QgEosa+JuN/2tF/22Iuzgl9bBc6yclBToJTHYX3YTKw=; b=OV0fQ8uFnYWDFi0LLsUXI9i459k4ZJ3iSWqQ+G+7yW7Y9nkjXFykyTZRDPRt5XzhF2 f4+QGvBbUgrhX9AxaLZSCtS4v3fZvGbLEbeAYlw7Cas+XSnoeipPZ1OlHXM1dPa/aFj2 k/VNQFtWl/wyOfx4z9Y37Spou/gXbJyKGq6N94qkSPVaNADsRKGFvf2zk8P2FViSSo5T mikWnV9j2+6zUNNdnqta2Q6cTABJI5Kos/nCe+7xVrSguPmG+IP7g+9gyIASa+DrcwbZ J+PhuRViKNfUl1FwRXQynRAKUWpbA2vWNfwNSvJeHveW9Jp7R+f/NZR1FQ3tsQFneWcW 1RcQ== X-Gm-Message-State: APjAAAXjY/wAwJ+Lg5FnlE9/92OY6BQBev+cx9EwbyUu7/dWeVm9G4r0 cgJtRvgtCTLN3TUSwjsGcnNJixy+ X-Google-Smtp-Source: APXvYqxDtBnt/h+pdLYR0DExMXj7oRs+vcRSdkxCQ/RNvvAj+zyfSpnHWVFta/mm6Wzv5M5V7xNo+Q== X-Received: by 2002:a1c:6a0b:: with SMTP id f11mr34075299wmc.87.1567438429511; Mon, 02 Sep 2019 08:33:49 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.33.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:33:49 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:32:52 +0200 Message-Id: <20190902153333.11190-8-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: Pierre-Moana Levesque Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From: Pierre-Moana Levesque * gnu/packages/texinfo.scm (texinfo-5)[native-inputs]: Keep native-inputs from inherited package texinfo. --- gnu/packages/texinfo.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index c93c7fc353..19f87a4de9 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2014, 2016 Eric Bavier ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2017 Efraim Flashner +;;; Copyright © 2019 Pierre-Moana Levesque ;;; ;;; This file is part of GNU Guix. ;;; @@ -91,8 +92,7 @@ is on expressing the content semantically, avoiding physical markup commands.") (patches (search-patches "texinfo-5-perl-compat.patch")) (sha256 (base32 - "1njfwh2z34r2c4r0iqa7v24wmjzvsfyz4vplzry8ln3479lfywal")))) - (native-inputs '()))) + "1njfwh2z34r2c4r0iqa7v24wmjzvsfyz4vplzry8ln3479lfywal")))))) (define-public texinfo-4 (package (inherit texinfo) From patchwork Mon Sep 2 15:32:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15254 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 04FA41734D; Mon, 2 Sep 2019 16:38:09 +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 5A09017329 for ; Mon, 2 Sep 2019 16:38:08 +0100 (BST) Received: from localhost ([::1]:37664 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oP9-0005EE-Ty for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:38:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42536) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oMC-0002A0-Up for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4oMA-0004Ci-Vc for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50022) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oMA-0004Ca-So for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oM9-0006c2-OY for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 08/48] gnu: bc: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Sep 2019 15:35:01 +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.156743845924990 (code B ref 36477); Mon, 02 Sep 2019 15:35:01 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:34:19 +0000 Received: from localhost ([127.0.0.1]:58741 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLL-0006TS-0f for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:19 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:39664) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oL6-0006OY-Fi for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:04 -0400 Received: by mail-wm1-f67.google.com with SMTP id n2so13669399wmk.4 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:33:56 -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=iNlm7lejLUO4LF27OJRpsPNwY4c9reHKEXZ/UbOpFSY=; b=gGhAVoslF2mect+/bRAvbGGVFdLv6dH2DfMGlNR9ZWyg9+askjrnRt8pymGjgAMDIn oEWtqQeWaBi89n4kHnXo6OkpvD3b8HGA4cYtUIphGciP7wB4OtjQyvAUD4lV5/Ren4jN M+ACpy9e29SsK7f8qiUjsak29wK/euAZ6u+eZeeYUuSUegJmxIKK8jZ6uvY9ZRhMf1vr xrVSI+M9zftNlY3tPV1h+sDBD+w8LnaqMvs/cKFCK1v4/shodSydG1h7IM3NwrrQYWiV STWgNHbR9nULXWMQXzFspmYdnCW72nP2E/jB1KvpAYd1y6dw92+E0F/3jwoW/HOS8rke nang== 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=iNlm7lejLUO4LF27OJRpsPNwY4c9reHKEXZ/UbOpFSY=; b=SMLUFRetWXEAk24rJgqvIX0WHtlp6rG5hiOggbwXWdMlDzplukp2Twky8ZogcmSuP7 5eIgRWecbgkH6kjNAhHh5qEwNEhHI4S3V9SUvDmn0ifyX+9rNBVfwtRsFkFtBpKuzCgq axMR1AssN8kRxXVpkdc/NjRnl0vICyOpvxdqu/6IGNN0z5HP3YWdhbteVU452djxi9Dm 1lyrK+1pID35BgB/P18htKZq5xGkRz8KYEnK/ilz+2np7CsdrHhq40pE4fOx7dYx2ClO hV8Przlv8wdmeyaktuKqvJAp7cNa2HYi9SeOGfsM/yk/fEQGrDvJAetK31j3r4pove52 tR1Q== X-Gm-Message-State: APjAAAVSswip7ZsJiOTkYzjjTR3Gxyfewu5XzqHnnWkyH0+6WrUScYeu HNPs0E6fsWqIljeB59qYa5rEL8Vk X-Google-Smtp-Source: APXvYqxzQ4C9dZL5XoK9k0AE3wCSKPZNugFnyAL7qMzR3azpFkD2Qp4sADyQKSt1/bBvK+ndLIcZwg== X-Received: by 2002:a1c:c589:: with SMTP id v131mr9943423wmf.163.1567438430641; Mon, 02 Sep 2019 08:33:50 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.33.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:33:50 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:32:53 +0200 Message-Id: <20190902153333.11190-9-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/patches/bc-fix-cross-compilation.patch: New patch file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/algebra.scm (bc)[origin]: Apply it, [native-inputs]: Add automake and autoconf, [arguments]: Add a new 'autogen phase that is needed by the new patch. --- gnu/local.mk | 1 + gnu/packages/algebra.scm | 15 +- .../patches/bc-fix-cross-compilation.patch | 171 ++++++++++++++++++ 3 files changed, 184 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/bc-fix-cross-compilation.patch diff --git a/gnu/local.mk b/gnu/local.mk index d60370fc3d..0bfde340ec 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -701,6 +701,7 @@ dist_patch_DATA = \ %D%/packages/patches/bash-linux-pgrp-pipe.patch \ %D%/packages/patches/bastet-change-source-of-unordered_set.patch \ %D%/packages/patches/bazaar-CVE-2017-14176.patch \ + %D%/packages/patches/bc-fix-cross-compilation.patch \ %D%/packages/patches/beets-python-3.7-fix.patch \ %D%/packages/patches/beignet-correct-file-names.patch \ %D%/packages/patches/benchmark-unbundle-googletest.patch \ diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index fb9e78bf92..2b43e5f2a8 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2017, 2019 Eric Bavier +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -681,15 +682,23 @@ binary.") (uri (string-append "mirror://gnu/bc/bc-" version ".tar.gz")) (sha256 (base32 - "0amh9ik44jfg66csyvf4zz1l878c4755kjndq9j0270akflgrbb2")))) + "0amh9ik44jfg66csyvf4zz1l878c4755kjndq9j0270akflgrbb2")) + (patches (search-patches "bc-fix-cross-compilation.patch")))) (build-system gnu-build-system) (native-inputs - `(("ed" ,ed) + `(("automake" ,automake) + ("autoconf" ,autoconf) + ("ed" ,ed) ("flex" ,flex) ("texinfo" ,texinfo))) (arguments '(#:configure-flags - (list "--with-readline"))) + (list "--with-readline") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'autogen + (lambda _ + (invoke "autoreconf" "-vif")))))) (home-page "https://www.gnu.org/software/bc/") (synopsis "Arbitrary precision numeric processing language") (description diff --git a/gnu/packages/patches/bc-fix-cross-compilation.patch b/gnu/packages/patches/bc-fix-cross-compilation.patch new file mode 100644 index 0000000000..14dfecdbde --- /dev/null +++ b/gnu/packages/patches/bc-fix-cross-compilation.patch @@ -0,0 +1,171 @@ +Patch taken from nix. + +commit fdda59736ddc048cf38a2c7103f4f5d9eeaf995e +Author: Ben Gamari +Date: Tue Oct 17 10:51:34 2017 -0400 + + Try implementing cross-compilation + +diff --git a/bc/Makefile.am b/bc/Makefile.am +index d9d412e..fdef633 100644 +--- a/bc/Makefile.am ++++ b/bc/Makefile.am +@@ -17,6 +17,7 @@ MAINTAINERCLEANFILES = Makefile.in bc.c bc.h scan.c \ + + AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/../h + LIBBC = ../lib/libbc.a ++LIBBC_HOST = ../lib/libbc_host.a + LIBL = @LEXLIB@ + LDADD = $(LIBBC) $(LIBL) @READLINELIB@ + +@@ -29,12 +30,20 @@ $(PROGRAMS): libmath.h $(LIBBC) + scan.o: bc.h + global.o: libmath.h ++ ++main_host.c : main.c ++ cp $< $@ + +-fbcOBJ = main.o bc.o scan.o execute.o load.o storage.o util.o warranty.o ++fbcOBJ = $(addsuffix _host,main.o bc.o scan.o execute.o load.o storage.o util.o warranty.o) ++ ++%.o_host : CC:=$(CC_FOR_BUILD) ++ ++%.o_host : %.c ++ $(COMPILE) -c $(CFLAGS) $(INCLUDES) -o $@ $< + +-libmath.h: libmath.b $(fbcOBJ) $(LIBBC) ++libmath.h: libmath.b $(fbcOBJ) $(LIBBC_HOST) + echo '{0}' > libmath.h +- $(MAKE) global.o +- $(LINK) -o fbc $(fbcOBJ) global.o $(LIBBC) $(LIBL) $(READLINELIB) $(LIBS) ++ $(MAKE) global.o_host ++ $(CC_FOR_BUILD) -o fbc $(fbcOBJ) global.o_host $(LIBBC_HOST) $(LIBL) ${READLINELIB} $(LIBS) + ./fbc -c $(srcdir)/libmath.b libmath.h + $(srcdir)/fix-libmath_h + rm -f ./fbc ./global.o +diff --git a/configure.ac b/configure.ac +index fc74573..5cabb73 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -20,6 +20,7 @@ m4_define([dc_version], 1.4.1) + + AC_INIT([bc],[bc_version]) + AC_CONFIG_SRCDIR(doc/bc.1) ++AC_CONFIG_MACRO_DIR([m4]) + AM_INIT_AUTOMAKE([dist-bzip2]) + AC_CONFIG_HEADERS(config.h) + +@@ -35,6 +36,7 @@ AC_DEFINE([DC_COPYRIGHT], + [Define the dc copyright line.]) + + AC_PROG_CC ++AX_CC_FOR_BUILD + AC_USE_SYSTEM_EXTENSIONS + + AM_PROG_LEX +diff --git a/lib/Makefile.am b/lib/Makefile.am +index ec4bf59..c670f5b 100644 +--- a/lib/Makefile.am ++++ b/lib/Makefile.am +@@ -1,5 +1,5 @@ + ## Process this file with automake to produce Makefile.in +-noinst_LIBRARIES = libbc.a ++noinst_LIBRARIES = libbc.a libbc_host.a + + AM_CPPFLAGS = -I. -I.. -I$(srcdir)/../h + +@@ -24,3 +24,11 @@ testmul: testmul.o number.o + + specialnumber: newnumber.o + cp newnumber.o number.o ++ ++%.o_host : CC:=$(CC_FOR_BUILD) ++%.o_host : %.c ++ $(COMPILE) -c $(CFLAGS) $(INCLUDES) -o $@ $< ++ ++libbc_host.a : $(addsuffix _host,$(libbc_a_OBJECTS)) ++ ar cru $@ $+ ++ ranlib $@ +diff --git a/m4/cc_for_build.m4 b/m4/cc_for_build.m4 +new file mode 100644 +index 0000000..c62ffad +--- /dev/null ++++ b/m4/cc_for_build.m4 +@@ -0,0 +1,77 @@ ++# =========================================================================== ++# https://www.gnu.org/software/autoconf-archive/ax_cc_for_build.html ++# =========================================================================== ++# ++# SYNOPSIS ++# ++# AX_CC_FOR_BUILD ++# ++# DESCRIPTION ++# ++# Find a build-time compiler. Sets CC_FOR_BUILD and EXEEXT_FOR_BUILD. ++# ++# LICENSE ++# ++# Copyright (c) 2010 Reuben Thomas ++# Copyright (c) 1999 Richard Henderson ++# ++# This program is free software: you can redistribute it and/or modify it ++# under the terms of the GNU General Public License as published by the ++# Free Software Foundation, either version 3 of the License, or (at your ++# option) any later version. ++# ++# This program is distributed in the hope that it will be useful, but ++# WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General ++# Public License for more details. ++# ++# You should have received a copy of the GNU General Public License along ++# with this program. If not, see . ++# ++# As a special exception, the respective Autoconf Macro's copyright owner ++# gives unlimited permission to copy, distribute and modify the configure ++# scripts that are the output of Autoconf when processing the Macro. You ++# need not follow the terms of the GNU General Public License when using ++# or distributing such scripts, even though portions of the text of the ++# Macro appear in them. The GNU General Public License (GPL) does govern ++# all other use of the material that constitutes the Autoconf Macro. ++# ++# This special exception to the GPL applies to versions of the Autoconf ++# Macro released by the Autoconf Archive. When you make and distribute a ++# modified version of the Autoconf Macro, you may extend this special ++# exception to the GPL to apply to your modified version as well. ++ ++#serial 3 ++ ++dnl Get a default for CC_FOR_BUILD to put into Makefile. ++AC_DEFUN([AX_CC_FOR_BUILD], ++[# Put a plausible default for CC_FOR_BUILD in Makefile. ++if test -z "$CC_FOR_BUILD"; then ++ if test "x$cross_compiling" = "xno"; then ++ CC_FOR_BUILD='$(CC)' ++ else ++ CC_FOR_BUILD=gcc ++ fi ++fi ++AC_SUBST(CC_FOR_BUILD) ++# Also set EXEEXT_FOR_BUILD. ++if test "x$cross_compiling" = "xno"; then ++ EXEEXT_FOR_BUILD='$(EXEEXT)' ++else ++ AC_CACHE_CHECK([for build system executable suffix], bfd_cv_build_exeext, ++ [rm -f conftest* ++ echo 'int main () { return 0; }' > conftest.c ++ bfd_cv_build_exeext= ++ ${CC_FOR_BUILD} -o conftest conftest.c 1>&5 2>&5 ++ for file in conftest.*; do ++ case $file in ++ *.c | *.o | *.obj | *.ilk | *.pdb) ;; ++ *) bfd_cv_build_exeext=`echo $file | sed -e s/conftest//` ;; ++ esac ++ done ++ rm -f conftest* ++ test x"${bfd_cv_build_exeext}" = x && bfd_cv_build_exeext=no]) ++ EXEEXT_FOR_BUILD="" ++ test x"${bfd_cv_build_exeext}" != xno && EXEEXT_FOR_BUILD=${bfd_cv_build_exeext} ++fi ++AC_SUBST(EXEEXT_FOR_BUILD)])dnl From patchwork Mon Sep 2 15:32:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15224 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 CAD221734D; Mon, 2 Sep 2019 16:34:48 +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 8E9A717329 for ; Mon, 2 Sep 2019 16:34:48 +0100 (BST) Received: from localhost ([::1]:37562 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oLw-0001hr-2p for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:34:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42056) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oLK-0001OK-V0 for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4oLJ-0002gw-1i for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49910) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oLI-0002gn-UX for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oLI-0006SW-Oh for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 09/48] gnu: indent: Fix aarch64 cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Sep 2019 15:34:08 +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.156743844424729 (code B ref 36477); Mon, 02 Sep 2019 15:34:08 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:34:04 +0000 Received: from localhost ([127.0.0.1]:58711 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLD-0006Qf-9h for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:03 -0400 Received: from mail-wm1-f51.google.com ([209.85.128.51]:55015) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oL7-0006Og-IG for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:01 -0400 Received: by mail-wm1-f51.google.com with SMTP id k2so13606233wmj.4 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:33:57 -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=J4EVlF9NjWGdbp6RUKSnrF114qb0famxMcdmDQ4iU10=; b=iCiKAyELlxozG5QbUbb6nWD76oWlcCEnzcNpSw3EvXcnpbpMruoizYzU1657SYi5GR 5yz1m6xBq/pH87I0SuxeydGAMoVKhknbChJqJBJJrodvAGP5GC87ncKq3afzuVRVSaml OuMZ3CDa20BPFydLpV4NYcviKfdDGhZgTYGg0VhlKRCh2MIQD3CVTpvZkoaHXcLiovtx Cgf3I/F03VbEPgrsZkHgqL6dV2jCY9HvA+OWeoFXCY5kedoHpSNIsIxawSItXghPWMTd /XWGXKemqtXRz+vpuRB24xe2Yn7Y1mAUfPPQrqToSmT2DSictSUvQ2WaappauFhq0InE tvJA== 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=J4EVlF9NjWGdbp6RUKSnrF114qb0famxMcdmDQ4iU10=; b=fJ0ShB+j6RVpq/Ml4Zj7B82A6gt9UbU6LGGA3evlYf8ooc7x9WCKWX9LIeTQyW+ybr bkNvt9o7OS1LY2izR/ay03IF77jBqpWycad+c8zZt7si+wFhL1+PngDWFXe97z2pF6UI uqKouzKFkusMeJbPJueukFg5bi5RM+wNFEF9I+R2+00zOB+MmI/BiHFlTnCqar6Fzxlf d0cdry76HNSNbsrWqysZzUtuXKRhL0eGEMDmz9zg8gtqvNh1l7GAdHVYMp6zFAko+GSP UEwDcrDqrKRf5mkoPIkXUQZofkmzLv8YqeZGpiYbk7hqcZWWQowJc5vJ6qAhz4sMqPZ0 JwQA== X-Gm-Message-State: APjAAAWv6pnttPNbaipwkw9foTi+PpVzL2lUz5BOUSCIIWLYYU9DlEsg FbZhNznwzH0v/KOBuhvBjQbwI3nJ X-Google-Smtp-Source: APXvYqwxRadX6kQBeLzMMYehVUcTWXkvKEEygy2GZg9Ji3BTo7syzYXDwkjERS4J0uB1t3lp5mlOXg== X-Received: by 2002:a1c:4383:: with SMTP id q125mr37634036wma.16.1567438431736; Mon, 02 Sep 2019 08:33:51 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.33.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:33:51 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:32:54 +0200 Message-Id: <20190902153333.11190-10-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 The packaged config.sub and config.guess do not have aarch64 support. Replace them by the ones from automake. * gnu/packages/code.scm (indent)[arguments]: Replace outdated config.sub and config.guess, taken from ... [native-inputs]: ... here, by adding automake. (indent-2.2.12)[native-inputs]: Inherit from indent native-inputs to keep automake that is added above. --- gnu/packages/code.scm | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index 13e2c4ad44..50d6870bc7 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -29,6 +29,7 @@ (define-module (gnu packages code) #:use-module (guix packages) + #:use-module (guix utils) #:use-module (guix download) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) @@ -644,9 +645,24 @@ the C, C++, C++/CLI, Objective‑C, C#, and Java programming languages.") ;; overrides this to be in PREFIX/doc. Fix this. (substitute* "doc/Makefile.in" (("^docdir = .*$") "docdir = @docdir@\n")) + #t)) + (add-after 'unpack 'fix-configure + (lambda* (#:key inputs native-inputs #:allow-other-keys) + ;; Replace outdated config.sub and config.guess: + (with-directory-excursion "config" + (for-each (lambda (file) + (install-file + (string-append (assoc-ref + (or native-inputs inputs) "automake") + "/share/automake-" + ,(version-major+minor + (package-version automake)) + "/" file) ".")) + '("config.sub" "config.guess"))) #t))))) (native-inputs - `(("texinfo" ,texinfo))) + `(("texinfo" ,texinfo) + ("automake" ,automake))) ; For up to date 'config.guess' and 'config.sub'. (synopsis "Code reformatter") (description "Indent is a program that makes source code easier to read by From patchwork Mon Sep 2 15:32:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15226 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 984721734D; Mon, 2 Sep 2019 16:35:02 +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 4DA8C17329 for ; Mon, 2 Sep 2019 16:35:02 +0100 (BST) Received: from localhost ([::1]:37566 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oM9-0001wJ-QG for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:35:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42097) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oLM-0001OP-Ps for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4oLK-0002kp-8s for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49913) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oLJ-0002j0-Mx for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oLJ-0006Se-G6 for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 10/48] gnu: libsamplerate: Fix aarch64 cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Sep 2019 15:34:09 +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.156743844424745 (code B ref 36477); Mon, 02 Sep 2019 15:34:09 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:34:04 +0000 Received: from localhost ([127.0.0.1]:58714 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLD-0006Qo-Pu for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:04 -0400 Received: from mail-wm1-f41.google.com ([209.85.128.41]:39603) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oL8-0006Ot-IP for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:01 -0400 Received: by mail-wm1-f41.google.com with SMTP id n2so13669529wmk.4 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:33:58 -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=mY2FkG0vR4e3pmvL4B5XN1RoOZdmfFqkodnWOUzt9Aw=; b=NUwPfWd2sT0do4ZRpiH/Lf1GUC9eWqAp4VU+YupwCJ5IyqwI3IROvq9dXMaSUXGe5v LCKDaONRpGj0XbpNcgqyG4IPuXJ0ZZmotxwmq3xjxVXcvU5kvtNyhWVze4b0xBYg1IBs nf3D2n+S9qGxEfhH3opbPteZ8M2TKN/6PULBWFYsXM120ngGkQyU+AsYy4rPQn92yQr/ ckWCsVdwAeIU8StDEF0iP5jgj2vBDsQO0L53lWRI83XWndGsmSAwK6J+MH2bZHVm9uz1 vznpVmIQlq+6UC4qHwEgTGFtVM3aPtoHILKey/9xJvaygRFTOOmOefaTnVtxGoTYBN+O YlOQ== 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=mY2FkG0vR4e3pmvL4B5XN1RoOZdmfFqkodnWOUzt9Aw=; b=oiYmTCKKuDhUDVb1vZ3HnojgSXZ0HDBk1PfM8KMe/hOqavV9tEpPD5z1Q6WYrI/txM SSnz7tT2RTgIq7UqXxqCEs9fww6ff/O8VjtqKgQfc0XHw+KqJBvmMDh8RDMOve6B82yI SZOC59u1e3W46qKOfHk+jPVWNNIlPG+uM2jQz3InDjhyDF5WHspU0LlYmq56hEovzxYn EPH5VReCRoHEnOP3Rcnw/5j4gOzmPyVNT/prEfEyioE/X2IeQxuKFYD7mWoX/keGMgG2 R27u+nYgn+38siKLItvxIB90iMBPhaUr7SJoXeD6gAc8Rm4mutmx65t9CCEWlJ4JHxFN Jn0w== X-Gm-Message-State: APjAAAVpKOr+jbz82/zEkuWzGJhHw6Oi25bTLvEy8cAqb355PLP1FXDw x764RcZEB3JVE8CeKrg1yu9coEwK X-Google-Smtp-Source: APXvYqzXY7FEsxKR8+mVfsksG85RO6ObMsFEiiqxJdGu5GxPZHfxabIXZXmjjVEicC+d6B7CttnzSg== X-Received: by 2002:a1c:f604:: with SMTP id w4mr36899776wmc.169.1567438432710; Mon, 02 Sep 2019 08:33:52 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.33.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:33:52 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:32:55 +0200 Message-Id: <20190902153333.11190-11-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 The packaged config.sub and config.guess do not have aarch64 support. Replace them by the ones from automake. * gnu/packages/pulseaudio.scm (libsamplerate)[arguments]: Replace outdated config.sub and config.guess, taken from ... [native-inputs]: ... here, by adding automake. --- gnu/packages/pulseaudio.scm | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index ff4049d707..89773d8be2 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; Copyright © 2018 Pierre Langlois ;;; Copyright © 2019 Alex Griffin +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -29,6 +30,7 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix utils) #:use-module ((guix licenses) #:prefix l:) #:use-module (guix build-system gnu) #:use-module (guix build-system python) @@ -102,10 +104,28 @@ for reading and writing new sound file formats.") "1ha46i0nbibq0pl0pjwcqiyny4hj8lp1bnl4dpxm64zjw9lb2zha")))) (build-system gnu-build-system) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config) + ("automake" ,automake))) ;For up to date 'config.guess' and 'config.sub'. (propagated-inputs `(("libsndfile" ,libsndfile) ("fftw" ,fftw))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-configure + (lambda* (#:key inputs native-inputs #:allow-other-keys) + ;; Replace outdated config.sub and config.guess: + (with-directory-excursion "Cfg" + (for-each (lambda (file) + (install-file (string-append + (assoc-ref + (or native-inputs inputs) "automake") + "/share/automake-" + ,(version-major+minor + (package-version automake)) + "/" file) ".")) + '("config.sub" "config.guess"))) + #t))))) (home-page "http://www.mega-nerd.com/SRC/index.html") (synopsis "Audio sample rate conversion library") (description From patchwork Mon Sep 2 15:32:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15246 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 CCF6B1734D; Mon, 2 Sep 2019 16:37:05 +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 7C5FC17329 for ; Mon, 2 Sep 2019 16:37:05 +0100 (BST) Received: from localhost ([::1]:37640 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oO8-00047s-8e for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:37:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42140) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oLQ-0001PP-SO for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4oLO-0002tD-TK for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:16 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49921) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oLL-0002nz-La for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:13 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oLL-0006TV-G8 for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 11/48] gnu: cyrus-sasl: 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:11 +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.156743844924855 (code B ref 36477); Mon, 02 Sep 2019 15:34:11 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:34:09 +0000 Received: from localhost ([127.0.0.1]:58721 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLE-0006RD-VC for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:09 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:34196) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oL9-0006P1-MS for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:02 -0400 Received: by mail-wm1-f66.google.com with SMTP id y135so10149751wmc.1 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:33:59 -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=iuXs1KR+SYXViEeS/rJH9BUU5Wfs75GDGiD2Uw5o7kM=; b=vNlQG8Ky7Fz1rgFO2ywSZqssF4BR2GoiLxpI/VxRgbQbLGwRCmh7k9/ekeSYSncL6w PDcVS1fivrNVXV+/HvErHVidHfPoNSWVTISYIirSTe85m+jHKraWE4K95C3FRvES94MK E/LeeDy5xRRaTrWVMRorQFGn8CdS3B+tSLHHcMIvzkl/GD6eJipZztbcXa/eAmh5OCLB NRSwte6rIr5IBwv3bceqONqYqW6hK2n+vzfX464y2I0CEqvu24lsXZZGjICgWYeoc01h 1NgDHHmv+W+mum3Gll5g+xSSWPChWN/s5/cQe+csWgOJ6IkjuGwHUNLpHhVuvDyqmPYG 02ig== 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=iuXs1KR+SYXViEeS/rJH9BUU5Wfs75GDGiD2Uw5o7kM=; b=YWRWSEnF5NgYo61SMcFlFsr2p7lNZ9pj8Y/+2/hT2zlJ5v5IExuxyuteVZqdiwrmVz T/8hCiSGvtRWbEEMncc4Y93VWY++R/JyeQMa4LIZH1gulw7x9j1XfPc5jDQHnRyFf7Wm e6PihMgu7TsreAgeE4Ba+khGAYeyp0pnAKyRDCWYC5tpVTK/CmMHvGdkHrBjGVBdKG7O 1cSKqBO7UKJJugt8dzSeQvpWIEo3D/Gkdwr9V3NymCtluID58qLQAShv15fPuE7uRF/t 1pjwqs1mbDmQF9ExBxzvzmXptguC5ERqF8qIJnzz2DlxdN/y+tDZFWFHBjXsCjrtErJj ibog== X-Gm-Message-State: APjAAAUbHs04ZYAwynNwIXwmWOmUCXUhcbtmITYCYJUGQICxkKlDic9P b0Bhh378tu0WhJvnpPelthEFWGzu X-Google-Smtp-Source: APXvYqxmXNa309ctsFhih8zU+/OqumiyiIpnddiMH1/s0DXKYzObrRa7cIlZDIJCasT3rym4unqqeA== X-Received: by 2002:a1c:e709:: with SMTP id e9mr1359562wmh.65.1567438433908; Mon, 02 Sep 2019 08:33:53 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.33.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:33:53 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:32:56 +0200 Message-Id: <20190902153333.11190-12-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/patches/cyrus-sasl-ac-try-run-fix.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/cyrus-sasl.scm (cyrus-sasl)[origin]: Apply it. [native-tools]: Add autoconf, automake and libtool. [arguments]: Run autoconf to apply m4 modification in patch above. --- gnu/local.mk | 1 + gnu/packages/cyrus-sasl.scm | 17 +++++++++++++++-- .../patches/cyrus-sasl-ac-try-run-fix.patch | 12 ++++++++++++ 3 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/cyrus-sasl-ac-try-run-fix.patch diff --git a/gnu/local.mk b/gnu/local.mk index 0bfde340ec..3550479ae6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -752,6 +752,7 @@ dist_patch_DATA = \ %D%/packages/patches/cube-nocheck.patch \ %D%/packages/patches/cursynth-wave-rand.patch \ %D%/packages/patches/cvs-CVE-2017-12836.patch \ + %D%/packages/patches/cyrus-sasl-ac-try-run-fix.patch \ %D%/packages/patches/darkice-workaround-fpermissive-error.patch \ %D%/packages/patches/dbus-helper-search-path.patch \ %D%/packages/patches/dbus-c++-gcc-compat.patch \ diff --git a/gnu/packages/cyrus-sasl.scm b/gnu/packages/cyrus-sasl.scm index f84136e631..3e65a1faf6 100644 --- a/gnu/packages/cyrus-sasl.scm +++ b/gnu/packages/cyrus-sasl.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2013, 2014, 2015, 2017 Ludovic Courtès ;;; Copyright © 2013 Andreas Enge ;;; Copyright © 2016 Leo Famulari +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,6 +21,7 @@ (define-module (gnu packages cyrus-sasl) #:use-module (gnu packages) + #:use-module (gnu packages autotools) #:use-module (gnu packages dbm) #:use-module (gnu packages kerberos) #:use-module (gnu packages tls) @@ -41,8 +43,13 @@ "ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-" version ".tar.gz"))) (sha256 (base32 - "1m85zcpgfdhm43cavpdkhb1s2zq1b31472hq1w1gs3xh94anp1i6")))) + "1m85zcpgfdhm43cavpdkhb1s2zq1b31472hq1w1gs3xh94anp1i6")) + (patches (search-patches "cyrus-sasl-ac-try-run-fix.patch")))) (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool))) (inputs `(("gdbm" ,gdbm) ("openssl" ,openssl))) (propagated-inputs @@ -57,7 +64,13 @@ ;; 'plugin_common.c'. When building the shared libraries there, libtool ;; ends up doing "ln -s plugin_common.lo plugin_common.o", which can ;; fail with EEXIST when building things in parallel. - #:parallel-build? #f)) + #:parallel-build? #f + + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'autogen + (lambda _ + (invoke "autoreconf" "-vif")))))) (synopsis "Simple Authentication Security Layer implementation") (description "SASL (Simple Authentication Security Layer) is an Internet diff --git a/gnu/packages/patches/cyrus-sasl-ac-try-run-fix.patch b/gnu/packages/patches/cyrus-sasl-ac-try-run-fix.patch new file mode 100644 index 0000000000..8662e812e9 --- /dev/null +++ b/gnu/packages/patches/cyrus-sasl-ac-try-run-fix.patch @@ -0,0 +1,12 @@ +--- a/m4/sasl2.m4 2018-11-18 22:33:29.902625600 +0300 ++++ b/m4/sasl2.m4 2018-11-18 22:33:59.828746176 +0300 +@@ -339,7 +339,8 @@ + ], + [ AC_DEFINE(HAVE_GSS_SPNEGO,,[Define if your GSSAPI implementation supports SPNEGO]) + AC_MSG_RESULT(yes) ], +- AC_MSG_RESULT(no)) ++ AC_MSG_RESULT(no), ++ AC_MSG_RESULT(no)) + LIBS="$cmu_save_LIBS" + + else From patchwork Mon Sep 2 15:32:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15225 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 DD7D11734D; Mon, 2 Sep 2019 16:34:55 +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 028B417329 for ; Mon, 2 Sep 2019 16:34:55 +0100 (BST) Received: from localhost ([::1]:37564 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oM2-0001ky-E3 for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:34:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42095) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oLM-0001ON-QJ for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4oLK-0002mh-VN for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49917) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oLK-0002lt-KZ for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oLK-0006T1-Ck for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 12/48] gnu: mkfontdir: Fix aarch64 cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Sep 2019 15:34:10 +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.156743844524755 (code B ref 36477); Mon, 02 Sep 2019 15:34:10 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:34:05 +0000 Received: from localhost ([127.0.0.1]:58717 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLE-0006R1-G6 for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:04 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:33343) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLA-0006PM-Ox for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:02 -0400 Received: by mail-wr1-f67.google.com with SMTP id u16so14480038wrr.0 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:34:00 -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=nXYw+zN9bYBenszDgLFfhduj1r7/E4Vvk+eezGBCloI=; b=fsW1xnjinJ5/beDFqLwk0jPxa/j6WdDCjma9pnM9LBhPbwBm/UAhILcAjhOTdnbX0Q 83dY026QXRbZSQ/iEaI+pxZ/XHCd+1kvFfvDxQDpaFPUi9EKjvy6YiFLk+zLOlMvBfeo bKLlFoQNgIo6dTxzBEAu2+wD39iUA8SP0jz8Ka0s8YfPqsJqPzmDDzhbZGvf8/CHkKRL 7mXLi7K8DSsWrDK16DwEzi7q70t3NJTpvk9HeCakgVsRzxHUIyElap1Qkj7FrTE1fyOI iIWC8yCXiPiUdyS3sm3Z0rR73RNPHMKrVEQDkQ4FnHdaZBKxTsSnzJMV+vI7Krqrz7E1 Va6w== 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=nXYw+zN9bYBenszDgLFfhduj1r7/E4Vvk+eezGBCloI=; b=Th1Hhccas0ovSJMWmr7m7i/2vj27Y3gM/Sly+vPrnpm+Ciyoj+/J6NGHjWjHJDF1zM rbdkpZPMaoTbUkFWFWlhzRqVQk3B/x8nCeR4bpZ/GDpa6kc5dCx4SFCZ2qHyE9snQDJz SJzwEi72Y7rxWyJUn94yB/xAwxEcvJ5yaNpDG6tvA535nXuk7LQopfvwItVy3QwEseCj sBPdT6G/k0SvxHvh/Z3C5jtOZ11N2exr24qLUU76qYQdmg0ePy6d4wJ1oCHJ2/teKiGu y9rmg0EK6ZYLeT/jIJiUR2lfxIaf/TNwMLxFtMl7TFGcnVYCaIlKH4+7y3w3bF4z3whl 5sKQ== X-Gm-Message-State: APjAAAVlJ9JBLYuKn6gVkoZRSKcukrNwzOGDvZgcvMka2iEFsM90HwTi BES0pwed2s6MBs857uO3Wt4fJn3v X-Google-Smtp-Source: APXvYqwVwIoyToYY4C8QFYmCJWoe546RZ8q+78BB1csvF/4z08so/iYPveR8uN4/tcnbbOfwVrpeig== X-Received: by 2002:a5d:5642:: with SMTP id j2mr12633755wrw.345.1567438434971; Mon, 02 Sep 2019 08:33:54 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.33.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:33:54 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:32:57 +0200 Message-Id: <20190902153333.11190-13-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 The packaged config.sub and config.guess do not have aarch64 support. Replace them by the ones from automake. * gnu/packages/xorg.scm (mkfontdir)[arguments]: Replace outdated config.sub and config.guess, by the ones taken from ... [native-inputs]: ... here, by adding automake. --- gnu/packages/xorg.scm | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index d7cd585664..d5d983a8d2 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2018 Benjamin Slade ;;; Copyright © 2019 nee ;;; Copyright © 2019 Yoshinori Arai +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -4742,8 +4743,21 @@ protocol and arbitrary X extension protocol.") "0c3563kw9fg15dpgx4dwvl12qz6sdqdns1pxa574hc7i5m42mman")))) (build-system gnu-build-system) (arguments - '(#:phases + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-configure + (lambda* (#:key inputs native-inputs #:allow-other-keys) + ;; Replace outdated config.sub and config.guess: + (for-each (lambda (file) + (install-file (string-append + (assoc-ref + (or native-inputs inputs) "automake") + "/share/automake-" + ,(version-major+minor + (package-version automake)) + "/" file) ".")) + '("config.sub" "config.guess")) + #t)) (add-after 'install 'wrap-mkfontdir (lambda* (#:key inputs outputs #:allow-other-keys) (wrap-program (string-append (assoc-ref outputs "out") @@ -4755,7 +4769,8 @@ protocol and arbitrary X extension protocol.") (inputs `(("mkfontscale" ,mkfontscale))) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config) + ("automake" ,automake))) ;For up to date 'config.guess' and 'config.sub'. (home-page "https://www.x.org/wiki/") (synopsis "Create an index of X font files in a directory") (description From patchwork Mon Sep 2 15:32:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15249 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 C10F11734D; Mon, 2 Sep 2019 16:37:18 +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 7196F17329 for ; Mon, 2 Sep 2019 16:37:18 +0100 (BST) Received: from localhost ([::1]:37648 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oOL-0004Pt-PU for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:37:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42171) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oLS-0001Pi-UE for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4oLQ-0002w2-Ra for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:18 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49925) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oLO-0002tA-U8 for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:16 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oLM-0006Tk-8s for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:14 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 13/48] gnu: icu4c: 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:12 +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.156743845024868 (code B ref 36477); Mon, 02 Sep 2019 15:34:12 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:34:10 +0000 Received: from localhost ([127.0.0.1]:58734 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLJ-0006Sm-Jd for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:10 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:46999) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLC-0006Pa-Cz for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:02 -0400 Received: by mail-wr1-f68.google.com with SMTP id h7so13115159wrt.13 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:34:02 -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=diWb2r+CtGsA56kRxg55pygW7W5hCA/KMHXmhvcq3rw=; b=F63WWnYiCAyesQ/lEQxP/qQki3bsQkvwh6Rvyjxrefv8NQ01Dww9LilDKSUbE7boqp juLrOMSppH0YvxdakzCZtGPcI4juaB44igalZWeLEnqb/213e6CBTxBFZu8a5ksieZKs C65qTeL7CTv7Ba6pU0gxG7T4WEJ1luV+5BuQ1jdmWgh03j5RwuG4F6Mg1TdjKgvp199w WvCC6pJJHhXRH0t3Y+t4N3auBXr9Zgj1yRrcrOadzaQ/YI8XMSXt+cTji+fqn9vaSIDP gIW9Qyb8Uw+a/FZSt1PEb3DMiiTDuVemENJFma2GzFANHIwXy4AqZniaqTY90SIfX5Lt 0IdA== 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=diWb2r+CtGsA56kRxg55pygW7W5hCA/KMHXmhvcq3rw=; b=OOmGpzcPcrlDltUETNwYs0d0GlRcegh4RVp9ApRddElOtJE+YcjuoXPaIhjZWZ7lPZ DROcmx2N2tJxInNeeQtQmtD+qCMMpF33x3OAL6H9X9PExBQJxIRyABrI6euYnvv4RrFw ypPcQ6hpnw7bsc27L1fkk+t34nJWNpGmynRrqQdJozSSb2UjdZmKm3r7O8dQOFeJPU9l fEEjIC0LUHkWb2IDupSH2mnhSx5bzW6rCFnOwrxf496Qu/Aw93ZqiR0HnblkDeW5I0wU V0zcFRTYGasIV3QYfkzocDSE5CmMRIRjddpYx0cP1rNMbpqsVz+jjZTmnOlE0vS4aW70 CEnQ== X-Gm-Message-State: APjAAAVTw4d14e3BLo3qBBT9ZystcsZNenBZsB6DPhymL3JmVxh9GGr5 haiiKGqf+XhmA6kYmhqT3FdhMq57 X-Google-Smtp-Source: APXvYqzVIIGTu/+FTnWzPwGAirU5FO17yPGblu/7FzWwdLlKfGN3uwplCNEkb/c9xAilhWPjoOUY4g== X-Received: by 2002:adf:9482:: with SMTP id 2mr36464179wrr.91.1567438435907; Mon, 02 Sep 2019 08:33:55 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.33.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:33:55 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:32:58 +0200 Message-Id: <20190902153333.11190-14-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/icu4c.scm (icu4c-build-root): New variable. (icu4c)[native-inputs]: Add it. [arguments]: Pass it as a configure-flag. --- gnu/packages/icu4c.scm | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm index 922dfbd348..c70871f7e7 100644 --- a/gnu/packages/icu4c.scm +++ b/gnu/packages/icu4c.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2017 Clément Lassieur ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2019 Marius Bakke +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,6 +28,7 @@ #:use-module (gnu packages python) #:use-module (guix licenses) #:use-module (guix packages) + #:use-module (guix utils) #:use-module (guix download) #:use-module (guix build-system ant) #:use-module (guix build-system gnu)) @@ -70,13 +72,23 @@ (sha256 (base32 "0v0xsf14xwlj125y9fd8lrhsaych4d8liv8gr746zng6g225szb2")))) (build-system gnu-build-system) + ;; When cross-compiling, this package needs a source directory of a + ;; native-build of itself. (native-inputs - `(("python" ,python-minimal))) + `(("python" ,python-minimal) + ,@(if (%current-target-system) + `(("icu4c-build-root" ,icu4c-build-root)) + '()))) (inputs `(("perl" ,perl))) (arguments `(#:configure-flags - '("--enable-rpath") + (list + "--enable-rpath" + ,@(if (%current-target-system) + '((string-append "--with-cross-build=" + (assoc-ref %build-inputs "icu4c-build-root"))) + '())) #:phases (modify-phases %standard-phases (add-after 'unpack 'chdir-to-source @@ -105,6 +117,25 @@ C/C++ part.") (license x11) (home-page "http://site.icu-project.org/"))) +(define-public icu4c-build-root + (package + (inherit icu4c) + (name "icu4c-build-root") + (arguments + (substitute-keyword-arguments (package-arguments icu4c) + ((#:tests? _ '()) + #f) + ((#:out-of-source? _ '()) + #t) + ((#:phases phases) + `(modify-phases ,phases + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (copy-recursively "../build" out) + #t))))))) + (native-inputs '()))) + (define-public java-icu4j (package (name "java-icu4j") From patchwork Mon Sep 2 15:32:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15227 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 8F7881734D; Mon, 2 Sep 2019 16:35:08 +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 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 5227417329 for ; Mon, 2 Sep 2019 16:35:08 +0100 (BST) Received: from localhost ([::1]:37574 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oME-000224-OO for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:35:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42167) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oLS-0001Ph-Tn for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4oLQ-0002wL-U7 for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:18 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49927) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oLQ-0002um-DY for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:16 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oLQ-0006UD-77 for guix-patches@gnu.org; Mon, 02 Sep 2019 11:34:16 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 14/48] gnu: glibc-utf8-locales: 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:16 +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.156743845124888 (code B ref 36477); Mon, 02 Sep 2019 15:34:16 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:34:11 +0000 Received: from localhost ([127.0.0.1]:58738 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLK-0006T0-B4 for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:10 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:36440) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLC-0006Pc-IS for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:03 -0400 Received: by mail-wr1-f67.google.com with SMTP id y19so14465339wrd.3 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:34:02 -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=oR0O2ITFHC3dR1dw6cRrC8+PxeIBzLUwTsqQ352esIE=; b=qGJvIFCM5PK3O6oHlpQsOMg/ffkloXtnHFg72PJ9MDV0x81ahykhawuuKUEXOdEfUV Lks8QnLz07RN/lPv4pM4MaP85zbsJpsluKdT//VvWOotKjZQWjQjDtAOAXFsU53ldZbb /PCarDiv1ioH/+ohImubv0/R6Jf54Wx6WrSXAQtkh+naXflUEdLkImidau2YjisKbMtn yJCRvDIwLzE5+TvhTH4pTl8aIbbMuAnr7vvAqIfOhfy2q4WVmtlAhBoN2kmYjL/nUifF OfYHGljX+PQfBXOagfRaFOacOzRFO8DaoWnRBe4Rf76CvryrjF6PfutmNHU6Ijfg3dGW 7Spw== 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=oR0O2ITFHC3dR1dw6cRrC8+PxeIBzLUwTsqQ352esIE=; b=CYuDZhvk8Emjk7U4X/MuQVdIOt7mj7r24QzKnye6X2HQ7uNWl68lIwM2f00XG8WNrY wK6FDOqFomcxdcZoekg6RMnW8Z9NuvOscsezN/wjhUWtNkqR6kbecOSfvbZGdj/w+PI6 KSCF03GGmmQ3K9MUG98+AYfz6LbTpXQ3//feUdxfeOI1VoM0SnRAzn2O8M5VHay6WMv+ 19gnkvKJ1ZhtL2GcKFdyNV5mPRleWLwuCUFzxbmrxGMDbTRpUQIV1sfxUS1OfBUrGxru zaB/Z0IJ8Sf5keLdtGQ70UnGqIOeIu8zt5UpRVy7r1krnzCcMpqIvnWHYq6Qd8bj713v XACA== X-Gm-Message-State: APjAAAX2CsnMChnxEQCmBs7O7hlxsV/HVpxNIyfYj+n7ixKgQCJ5gu5U 5OOug5Mdy6/f2zqAL6M/ov7W8b/F X-Google-Smtp-Source: APXvYqw/wYT4q803rB7XjEL6qabShQ79K2U5WPAWR7Sl5xVyjkTSFX7Zso+h5mOEXozxmO24pr+oSQ== X-Received: by 2002:adf:f48e:: with SMTP id l14mr20767463wro.234.1567438436874; Mon, 02 Sep 2019 08:33:56 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.33.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:33:56 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:32:59 +0200 Message-Id: <20190902153333.11190-15-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/base.scm (glibc-utf8-locales)[inputs]: Move to ... [native-inputs]: ... here, in order to fix cross-compilation. * gnu/packages/commencement.scm (glibc-utf8-locales-final)[inputs]: Move to ... [native-inputs]: ... here, in order to fix cross-compilation. --- gnu/packages/base.scm | 4 ++-- gnu/packages/commencement.scm | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 791647d848..ebaa93f092 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1112,8 +1112,8 @@ to the @code{share/locale} sub-directory of this package.") ;; tests---e.g., in Guile's i18n tests. '("de_DE" "el_GR" "en_US" "fr_FR" "tr_TR")) #t)))) - (inputs `(("glibc" ,glibc) - ("gzip" ,gzip))) + (native-inputs `(("glibc" ,glibc) + ("gzip" ,gzip))) (synopsis "Small sample of UTF-8 locales") (description "This package provides a small sample of UTF-8 locales mostly useful in diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 69d1f87605..615d97dbd5 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2350,11 +2350,12 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ;; function.) (package (inherit glibc-utf8-locales) - (inputs `(("glibc" ,glibc-final) - ("gzip" - ,(package-with-explicit-inputs gzip %boot4-inputs - (current-source-location) - #:guile %bootstrap-guile)))))) + (native-inputs + `(("glibc" ,glibc-final) + ("gzip" + ,(package-with-explicit-inputs gzip %boot4-inputs + (current-source-location) + #:guile %bootstrap-guile)))))) (define-public ld-wrapper ;; The final 'ld' wrapper, which uses the final Guile and Binutils. From patchwork Mon Sep 2 15:33:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15259 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 89AE01734D; Mon, 2 Sep 2019 16:38:42 +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 1A5E917329 for ; Mon, 2 Sep 2019 16:38:42 +0100 (BST) Received: from localhost ([::1]:37678 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oPh-0005wF-IW for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:38:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42599) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oMF-0002Dg-TQ for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4oMC-0004FH-8W for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50025) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oMC-0004F6-4I for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oMC-0006cY-0T for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 15/48] gnu: boost: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Sep 2019 15:35:03 +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.156743846925083 (code B ref 36477); Mon, 02 Sep 2019 15:35:03 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:34:29 +0000 Received: from localhost ([127.0.0.1]:58762 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLV-0006VV-CC for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:27 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:45018) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLD-0006Pe-LO for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:08 -0400 Received: by mail-wr1-f66.google.com with SMTP id 30so3508332wrk.11 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:34:03 -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=qd3oR80x1Kco8K4vFHHAoiwrzSHulBUBLrAi7hpOrVk=; b=TdnAQxUR8xgOqEOh0t3GPE78a8aTJ2G10yVBnVs3kjNlJnT+vxytX2iLaPJYGF6FZ9 BFIvyCn/G6aH2ElNskF1OyUt3vBb5YNF2zxWsjid5iigLOpf9TA/mQsfgAbFhZLW08I+ gbQsNeBcA+Hlbuvhm6hYbl+3GY4o74dUasgOrarX5wkLdga5yPGo6hfkrXXDw3cZOHv4 evar0JcSOVkZtkxgqMr2HnsK4U5Kn6ts9YG7BN4L4i1pYBrUqDsWKbqAPNOEuaw2sElq Fa4V9fcCmOwKF6PRFvnw0acNOwT5T552ZBEY3DQqQrbrA8I02CJ1PuUZ53QZ+tRpHVrg ecPQ== 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=qd3oR80x1Kco8K4vFHHAoiwrzSHulBUBLrAi7hpOrVk=; b=En7KddxGslexS5knccA7la/hIFvhnOBgV8+MJ6ZITygwwBHvgqK87SzAqS3djL28Bv EU090pqhXKl7YE9Ic10tIPVPh57qgvlgtWfRalS4Dr3ZbDZ2fsG4IA7k72pWPTbpJXnY 9RRQ1ZLjK5ld0HOn0aDrO/3NWiksLDL4bpN1opT3PglmC4Wa+j/nAJKc/9hq6qi7jpiT T3Qf/wzwMdiFwls1x+KVm3h7a2ph6ZuS3nF6rGreZC2CYwAt9qQ1YiPKPuRD2j1hCQro IlXtHbe14s/G8vFICcj0C30QlO9f7CDHj1zaMN93A7k9jsMhpznd0uZnDfwQuYth4rVC HavA== X-Gm-Message-State: APjAAAX3nzLK5fDBz/Rd2+zrahKbo3OmNg+3w8zkiTaIRJyEP7i+Ym22 S1F+pzlgDOkohVl+nWI6pzZKa6J9 X-Google-Smtp-Source: APXvYqxC7amPP72e32fSo2Zpfbos+FReAidiT+gmffQDVJoEKKaofPi8wKqN0E8Pr3CB0vjNnHp1tw== X-Received: by 2002:a5d:46c4:: with SMTP id g4mr20153092wrs.189.1567438437864; Mon, 02 Sep 2019 08:33:57 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.33.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:33:57 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:33:00 +0200 Message-Id: <20190902153333.11190-16-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/patches/boost-dumpversion.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/boost.scm (boost)[source]: Apply it, [native-inputs]: add python unless cross-compiling, [arguments]: pass cross-compilation mandatory flags and fill a user-config.jam file pointing to cross-compiler. Disable python support that is broken when cross-compiling. Disable provide-libboost_python when cross-compiling. --- gnu/local.mk | 1 + gnu/packages/boost.scm | 59 +++++++++++++++----- gnu/packages/patches/boost-dumpversion.patch | 24 ++++++++ 3 files changed, 71 insertions(+), 13 deletions(-) create mode 100644 gnu/packages/patches/boost-dumpversion.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3550479ae6..ae53257a77 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -710,6 +710,7 @@ dist_patch_DATA = \ %D%/packages/patches/binutils-loongson-workaround.patch \ %D%/packages/patches/blender-2.79-newer-ffmpeg.patch \ %D%/packages/patches/blender-2.79-python-3.7-fix.patch \ + %D%/packages/patches/boost-dumpversion.patch \ %D%/packages/patches/byobu-writable-status.patch \ %D%/packages/patches/calibre-no-updates-dialog.patch \ %D%/packages/patches/calibre-remove-test-bs4.patch \ diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index a2253a9efc..4e1e68204f 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2018, 2019 Ricardo Wurmus ;;; Copyright © 2018 Maxim Cournoyer ;;; Copyright © 2018 Efraim Flashner +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -54,6 +55,8 @@ (string-append "https://dl.bintray.com/boostorg/release/" version "/source/boost_" version-with-underscores ".tar.bz2")))) + (patches + (search-patches "boost-dumpversion.patch")) (sha256 (base32 "0y47nc7w0arwgj4x1phadxbvl7wyfcgknbz5kv8lzpl98wsyh2j3")))) @@ -62,7 +65,9 @@ ("zlib" ,zlib))) (native-inputs `(("perl" ,perl) - ("python" ,python-2) + ,@(if (%current-target-system) + '() + `(("python" ,python-2))) ("tcsh" ,tcsh))) (arguments `(#:tests? #f @@ -76,7 +81,24 @@ ;; Set the RUNPATH to $libdir so that the libs find each other. (string-append "linkflags=-Wl,-rpath=" - (assoc-ref %outputs "out") "/lib")) + (assoc-ref %outputs "out") "/lib") + ,@(if (%current-target-system) + `("--user-config=user-config.jam" + ;; Python is not supported when cross-compiling. + "--without-python" + "binary-format=elf" + "target-os=linux" + ,@(cond + ((string-prefix? "arm" (%current-target-system)) + '("abi=aapcs" + "address-model=32" + "architecture=arm")) + ((string-prefix? "aarch64" (%current-target-system)) + '("abi=aapcs" + "address-model=64" + "architecture=arm")) + (else '()))) + '())) #:phases (modify-phases %standard-phases (delete 'bootstrap) @@ -94,6 +116,14 @@ (setenv "SHELL" (which "sh")) (setenv "CONFIG_SHELL" (which "sh")) + ,@(if (%current-target-system) + `((call-with-output-file "user-config.jam" + (lambda (port) + (format port + "using gcc : cross : ~a-c++ ;" + ,(%current-target-system))))) + '()) + (invoke "./bootstrap.sh" (string-append "--prefix=" out) ;; Auto-detection looks for ICU only in traditional @@ -108,17 +138,20 @@ (replace 'install (lambda* (#:key make-flags #:allow-other-keys) (apply invoke "./b2" "install" make-flags))) - (add-after 'install 'provide-libboost_python - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - ;; Boost can build support for both Python 2 and Python 3 since - ;; version 1.67.0, and suffixes each library with the Python - ;; version. Many consumers only check for libboost_python - ;; however, so we provide it here as suggested in - ;; . - (with-directory-excursion (string-append out "/lib") - (symlink "libboost_python27.so" "libboost_python.so")) - #t)))))) + ,@(if (%current-target-system) + '() + '((add-after 'install 'provide-libboost_python + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + ;; Boost can build support for both Python 2 and + ;; Python 3 since version 1.67.0, and suffixes each + ;; library with the Python version. Many consumers + ;; only check for libboost_python however, so we + ;; provide it here as suggested in + ;; . + (with-directory-excursion (string-append out "/lib") + (symlink "libboost_python27.so" "libboost_python.so")) + #t)))))))) (home-page "https://www.boost.org") (synopsis "Peer-reviewed portable C++ source libraries") diff --git a/gnu/packages/patches/boost-dumpversion.patch b/gnu/packages/patches/boost-dumpversion.patch new file mode 100644 index 0000000000..7df779cfe6 --- /dev/null +++ b/gnu/packages/patches/boost-dumpversion.patch @@ -0,0 +1,24 @@ +This issue is described here: https://github.com/openwrt/packages/pull/8685 +and has not been solved as of 1.70.0 release. + +--- a/tools/build/src/tools/common.jam ++++ b/tools/build/src/tools/common.jam +@@ -973,18 +973,6 @@ + } + } + +- # From GCC 5, versioning changes and minor becomes patch +- if $(tag) = gcc && [ numbers.less 4 $(version[1]) ] +- { +- version = $(version[1]) ; +- } +- +- # Ditto, from Clang 4 +- if ( $(tag) = clang || $(tag) = clangw ) && [ numbers.less 3 $(version[1]) ] +- { +- version = $(version[1]) ; +- } +- + # On intel, version is not added, because it does not matter and it is the + # version of vc used as backend that matters. Ideally, we should encode the + # backend version but that would break compatibility with V1. From patchwork Mon Sep 2 15:33:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15251 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 6779B1734D; Mon, 2 Sep 2019 16:37:29 +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 0A73A17348 for ; Mon, 2 Sep 2019 16:37:29 +0100 (BST) Received: from localhost ([::1]:37652 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oOV-0004gP-F8 for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:37:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42502) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oMB-00028L-QP for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4oMA-0004CF-K0 for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50021) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oMA-0004Bz-Gb for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oMA-0006c9-9z for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 16/48] gnu: eudev: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Sep 2019 15:35:02 +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.156743846025004 (code B ref 36477); Mon, 02 Sep 2019 15:35:02 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:34:20 +0000 Received: from localhost ([127.0.0.1]:58755 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLT-0006V1-HZ for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:20 -0400 Received: from mail-wr1-f49.google.com ([209.85.221.49]:36631) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLE-0006Pg-Oq for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:05 -0400 Received: by mail-wr1-f49.google.com with SMTP id y19so14465443wrd.3 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:34:04 -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=aDAa2BlU6B/fitBrTPKqzMNRl1YlSbVrJswXkqmObQE=; b=ETW2HYRsJCFjKviWPLNtCKmwJnax+s2F53qTtJRU5vFWWRUbrBOKACHfO5cnFYIj0H 41qvsxDq5STr/bpLc7cSg7aW9ePpZT9Gj0fwkgX8ZKC4aM6Tbhlc5IZP9Uon7Csup0FS ERBycmYC+ur93u95NwHqsuZxjIwXyccxKI/HOBU79BAW9qkCcMGmOIkPORhdZcVSDm74 ynMxynaeBhHtae6nqRrh1hy6/bQL3ss4kmywPN8xb2GFEz23bSHsr2QQ2bWSXaB8geGh uRsu0Ace7ifiVr6PaFm43QsDEajhrsR96Kv/u7MS8WoiLaYF5aOUZidTJ2jS5Mba+cwz dcxg== 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=aDAa2BlU6B/fitBrTPKqzMNRl1YlSbVrJswXkqmObQE=; b=pF0CwR1MGlP1SDUik+WjQwHIk9J39Q6BbscQtkPimRYuVkBHG4oMls0fmG7iIK/ntr yx8ELTnCC8g5zPaTVAde40GrSz4BOkcpt36jfyyG0G5DIm5gXHhKT9wud76ICx97M7DA eQPsYE/tWykHf0zAXMNZHvOeMfhpxzHHLkRwjW4fy0mSX2VbA3XN2qPog1TY5RqkNyx/ lEwxZtiYF5uH4HykI3hEEuvi8jCQsY818WeIu0F6QhOCNnF5bi4YoqVFl8p+TFIodGZr IA5+pfx8t89w+g/+AsbuCIlqsdsaVvWhXjj85Edy3U4JMJ7Pq5B7lAcaVilH30ok483s biDA== X-Gm-Message-State: APjAAAW1TwTgKILftfcbf7bxnXOoTFXzfrODXtTVR4NdUbIVuMqSpG9l dqRYizFwF6ENpKhAGXr/gPAK9SaU X-Google-Smtp-Source: APXvYqy5X7tzbEosLWV7bBRmfC8oRwhVkRlsWqOitu/Hdn3TLU1Rkc+W7rqB4g/I6xe39U57uVyb+A== X-Received: by 2002:a5d:6588:: with SMTP id q8mr16713900wru.184.1567438438970; Mon, 02 Sep 2019 08:33:58 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.33.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:33:58 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:33:01 +0200 Message-Id: <20190902153333.11190-17-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/linux.scm (eudev)[arguments]: Look for xsltproc in both native-inputs and inputs. Also, do not run udevadm when cross-compiling. We need to find another way to generate hwdb.bin file for cross-built systems. --- gnu/packages/linux.scm | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index bf1e00421f..0225f8c376 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2564,7 +2564,7 @@ from the module-init-tools project.") (patches (search-patches "eudev-rules-directory.patch")))) (build-system gnu-build-system) (arguments - '(#:phases + `(#:phases (modify-phases %standard-phases (add-after 'unpack 'make-source-writable (lambda _ @@ -2573,19 +2573,25 @@ from the module-init-tools project.") (for-each make-file-writable (find-files ".")) #t)) (add-before 'bootstrap 'patch-file-names - (lambda* (#:key inputs #:allow-other-keys) + (lambda* (#:key inputs native-inputs #:allow-other-keys) (substitute* "man/make.sh" (("/usr/bin/xsltproc") - (string-append (assoc-ref inputs "xsltproc") + (string-append (assoc-ref + (or native-inputs inputs) "xsltproc") "/bin/xsltproc"))) #t)) (add-after 'install 'build-hwdb (lambda* (#:key outputs #:allow-other-keys) ;; Build OUT/etc/udev/hwdb.bin. This allows 'lsusb' and ;; similar tools to display product names. + ;; + ;; XXX: This can't be done when cross-compiling. Find another way + ;; to generate hwdb.bin for cross-built systems. (let ((out (assoc-ref outputs "out"))) - (invoke (string-append out "/bin/udevadm") - "hwdb" "--update"))))) + ,@(if (%current-target-system) + '(#t) + '((invoke (string-append out "/bin/udevadm") + "hwdb" "--update"))))))) #:configure-flags (list "--enable-manpages"))) (native-inputs `(("autoconf" ,autoconf) From patchwork Mon Sep 2 15:33:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15229 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 6AB971734D; Mon, 2 Sep 2019 16:35:37 +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 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 2CB0A17329 for ; Mon, 2 Sep 2019 16:35:37 +0100 (BST) Received: from localhost ([::1]:37590 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oMi-0002JQ-4N for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:35:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42516) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oMC-000292-9y for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4oMB-0004DQ-6w for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50023) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oMB-0004D5-4D for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oMB-0006cJ-0V for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 17/48] gnu: lvm2: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Sep 2019 15:35:02 +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.156743846125013 (code B ref 36477); Mon, 02 Sep 2019 15:35:02 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:34:21 +0000 Received: from localhost ([127.0.0.1]:58757 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLU-0006VF-A2 for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:20 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:40845) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLF-0006Ph-Oo for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:06 -0400 Received: by mail-wm1-f65.google.com with SMTP id t9so15056838wmi.5 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:34:05 -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=bT9wjUOMiQhRKjfvHRtEPKAeNdFX83u0rDJyRcK/lfo=; b=gGhkyz2XXExPpwINZCflOMplo57KyLX2AWu/Y/w6tMa6pb53+jLR+l+jWqsPCHV0pT s3cY7cW+iW7OB3S633Rnohj03zniw0nbu6CsrpPuW1y6Q+uvPKOYwiEUih2q/8vMPzow WzL/Tfzy2uSSHIceqQcjoLWxSR9zHrHk0vp/hI/4UT9HHV2Z0sU2yyRagGBU2ObFnmPQ CILLpaAfupbNdwnGTBd6YmPU7AbFDGcKQ13F0wNwfn+gm1L6scR72hB1SCZZ8d+eBVWK FPPZrcaD3lGhy13VID76MnMFaHoHBYfKmRRywx/0s96A+rlXNe27qdhFDZsxJLMEqDw5 Mnng== 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=bT9wjUOMiQhRKjfvHRtEPKAeNdFX83u0rDJyRcK/lfo=; b=UwWl0ij4oXSyyhzZf7HtKjtW8B5LFak6+6OkjZ+Oy4FEvGY8gumuKiagI00TCstuJc 0xwIqwCiOsfXoFc3U5ePFxZeoTgFu6zQxjlroUsMC2Bso51bEg4tiZE39dxT3Tm57T5Y e8d/b/VqvdeXdequizx/QzExc1m1rM7yN/E7eI6Wpd+HAJTrgkkh9st1xc1d+CUCK1b5 qKFOtzLZXC3Ym6C5y2YysomYA4JQlXub+3u38k/a/W1Yge0/1cIF8P8HeLojz+D+/lFE zCUwC65CBj+kqT7rSZOIUdvNyyZJPUy7hf9ZbfEEgvCOmcMhOrVuJ8opxJ+0WymV5vxN l4+Q== X-Gm-Message-State: APjAAAWw8Va/3EEJ0WjYOFbvfOzLIvZMWzSx7UUvA2fzvaJyaRa/GvhT Wc1omqQVDb35UinvalFdEsG6Tzm9 X-Google-Smtp-Source: APXvYqz2Poxfrx8v3E3yzsaxN04TmOh40/yio+86WH0wflFyJrC/Tk6KEOTBtS9+D5neM/3j60zc7Q== X-Received: by 2002:a1c:1f89:: with SMTP id f131mr35362015wmf.140.1567438439944; Mon, 02 Sep 2019 08:33:59 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.33.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:33:59 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:33:02 +0200 Message-Id: <20190902153333.11190-18-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/linux.scm (lvm2)[arguments]: Add cross-compilation specific configure-flags. --- gnu/packages/linux.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 0225f8c376..afa860830b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2654,7 +2654,7 @@ time.") (inputs `(("udev" ,eudev))) (arguments - '(#:phases + `(#:phases (modify-phases %standard-phases (add-after 'configure 'set-makefile-shell (lambda _ @@ -2689,7 +2689,12 @@ time.") (assoc-ref %outputs "out") "/lib,-rpath=" (assoc-ref %outputs "out") - "/lib/device-mapper")) + "/lib/device-mapper") + ;; This is needed when cross-compiling. + ,@(if (%current-target-system) + '("ac_cv_func_malloc_0_nonnull=yes" + "ac_cv_func_realloc_0_nonnull=yes") + '())) ;; The tests use 'mknod', which requires root access. #:tests? #f)) From patchwork Mon Sep 2 15:33:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15256 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 1F06A1734D; Mon, 2 Sep 2019 16:38:23 +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 CEC0E17329 for ; Mon, 2 Sep 2019 16:38:22 +0100 (BST) Received: from localhost ([::1]:37668 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oPN-0005Ro-QA for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:38:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42582) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oMF-0002DF-B9 for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4oME-0004JJ-6N for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50027) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oMD-0004HM-3U for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oMC-0006co-W3 for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 18/48] gnu: nghttp2: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Sep 2019 15:35:04 +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.156743847025121 (code B ref 36477); Mon, 02 Sep 2019 15:35:04 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:34:30 +0000 Received: from localhost ([127.0.0.1]:58775 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLe-0006Ww-3p for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:30 -0400 Received: from mail-wr1-f53.google.com ([209.85.221.53]:36967) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLG-0006Pv-Pc for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:10 -0400 Received: by mail-wr1-f53.google.com with SMTP id z11so14453341wrt.4 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:34:06 -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=Hg86Or2key+gbohgqErU2PmhMrs9VhmbwRrk3kAC8I4=; b=l6Eds4xhG1V10PXm5/FWpR/e1QYXWzFURoKgS3cNyhJq/HU4HV/YUy++miKdMS7X0k 2MxIKEezaHJv7dwlFpc2XWXO7mrAO7OzssOtAgFWcudn4MeG4IzTtruygkMfeSC8eUEN iULI+TDz/mJKPUluN2ZSGFx1XXbS45oX1iWJNXLfWZFq8Fx3ngzPXQioaFrA7ptFbON0 qUG9C4fj7Mx+lN2QwDj2wApHKi4AO5gQiZFgeiJgBOfygAMSBm+2TSoctRSKsY9UoI1x TiaTytPlF6DRGqSb+7GtPbft0ehji4cLyD+OtOJsFXE90LMPiI44e1iFcLex0zrfzLQ7 Blig== 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=Hg86Or2key+gbohgqErU2PmhMrs9VhmbwRrk3kAC8I4=; b=T/c74r1WVzJ88mIlt5CnKCgFvY86WAKlNKNl/h3PfP4kys+nWNMA8HwFoyCI+ELvWs 4CVev5/KdCsaS2BM1uP7fzX7xCeUcMOedsIoEhdSBXeaVWaHEcbwFVBbjswzLIXsGSFA J+HpR8HMln+Rk5UZB20ceQPCf2/cvF+hhL3q0B2mH9+fMu/II661stFfrCZYXpm8LUqw BbWBxFASz1QK5nU8BMJ3X8oR43De62S3Y6mJvEtCym2XieUE7AkITjCVLrSpxDD20jik rzItZCat7ZPidGCbRPNjf1iQjwQrwc9i4UdNGQq8b0tf8HS3Ir7fpiZxDlWCwhaD92kE R9FQ== X-Gm-Message-State: APjAAAWAqwrp38PsSrtJEPzHLOrrvMcbwvDJ3zI95PoEBfTIjbxehxJs STGHDPP/pFiTAWDpiKTrv57YczN2 X-Google-Smtp-Source: APXvYqxAQLQXkXy1gFOvhMmRgtn0O4xOdk612f5PN1+1mckIsi1zb7+G8mJtHjEMlloeDZXDjQvLxg== X-Received: by 2002:adf:fd03:: with SMTP id e3mr28389274wrr.291.1567438440928; Mon, 02 Sep 2019 08:34:00 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.33.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:34:00 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:33:03 +0200 Message-Id: <20190902153333.11190-19-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: Pierre-Moana Levesque Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From: Pierre-Moana Levesque * gnu/packages/web.scm (nghttp2)[arguments]: In set-timezone-directory phase, search in both inputs and native-inputs. --- gnu/packages/web.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 8e4424be8d..c5ec216a72 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -36,6 +36,7 @@ ;;; Copyright © 2019 Hartmut Goebel ;;; Copyright © 2019 Jakob L. Kreuze ;;; Copyright © 2019 Mathieu Othacehe +;;; Copyright © 2019 Pierre-Moana Levesque ;;; ;;; This file is part of GNU Guix. ;;; @@ -6441,9 +6442,10 @@ derivation by David Revoy from the original MonsterID by Andreas Gohr.") (assoc-ref outputs "lib"))) #t)) (add-before 'check 'set-timezone-directory - (lambda* (#:key inputs #:allow-other-keys) - (setenv "TZDIR" (string-append (assoc-ref inputs "tzdata") - "/share/zoneinfo")) + (lambda* (#:key inputs native-inputs #:allow-other-keys) + (setenv "TZDIR" (string-append + (assoc-ref (or native-inputs inputs) "tzdata") + "/share/zoneinfo")) #t))))) (home-page "https://nghttp2.org/") (synopsis "HTTP/2 protocol client, proxy, server, and library") From patchwork Mon Sep 2 15:33:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15253 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 4BB251734D; Mon, 2 Sep 2019 16:37:41 +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 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 14CA417329 for ; Mon, 2 Sep 2019 16:37:41 +0100 (BST) Received: from localhost ([::1]:37660 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oOh-0004x2-KN for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:37:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42530) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oMC-00029k-OZ for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4oMB-0004EP-OO for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50024) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oMB-0004E5-Kl for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oMB-0006cR-G1 for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 19/48] gnu: bdb: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Sep 2019 15:35:03 +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.156743846125020 (code B ref 36477); Mon, 02 Sep 2019 15:35:03 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:34:21 +0000 Received: from localhost ([127.0.0.1]:58760 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLU-0006VQ-QO for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:21 -0400 Received: from mail-wr1-f46.google.com ([209.85.221.46]:33264) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLH-0006QP-OE for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:08 -0400 Received: by mail-wr1-f46.google.com with SMTP id u16so14480425wrr.0 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:34:07 -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=3EcgO52Zak7elerfXoIDCPEpo/QGSntGgGGeWWtNTXU=; b=TUEg3Lmm+3rswRYkmam8wXgJAA6j79SFrS9Ch6Km6SURBaSeg+hB87Mp/wq8aPMcV9 e/2POfJDns8t5kYT+G+1edktyjKewsC7qPvI3vuNxyG7MW6GqC0BzTZ3fH/18q0NrzIo pdcsFHO/xqsQj8WdRep6ZCuoFkTLMsRC4x5hoGJ3j3Qtil+k5FYos/dJORY+Enze2J44 YbNdJX36uVSG4UTJB2HZGpqg/s0HxJZHJpPOjf9E+t741aBxYeRAoBtl7YtGdQMS2sox mJoMIVVGdeOP5dSrtGeNSamqpJWfz/pcxCaTzQ3DhBy5mJYiUMkv1tUA4IjSkduvr19w Dncg== 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=3EcgO52Zak7elerfXoIDCPEpo/QGSntGgGGeWWtNTXU=; b=AXTdsS82ds/vQSkI0n/wYDTaVfXKW3k3nfUWQY6YMLSw8ChotljynTUqaSbMVWGTlf nuwXNbBCT2So6+YchbOVi3nxUuelR6ExfJaiXi7x3YOELJ/PnJUrP87BTvNqwEaJRRRH /2fitZArX1OmvgAA2NxVY/Gkofovv65UnBkbCR9cSFeAkvIx8Rfxv4iaMQvAvMpLmuSy CnZfRIdIlBNPBrImCFArNY08yjhna6pmQ63fQ5SWhv+ucIF5mcuHYv/yG0IVHUiYtDm2 GIYjSYn2n5z8RyMIEZJl68rP+K7Ec0RfTqGTrsnKSou8RXB1lj18nN8r6F9d5Lb5rxSM KfaA== X-Gm-Message-State: APjAAAV2KPygEdnuDHiFWe+P//EADXwPLAb16Z9WNIz9ZE6pD2x8otAL ivoAfKybBLSnGjN/lCr0s0AwJ4c3 X-Google-Smtp-Source: APXvYqy8/Ief2J1XFIlVq35p2vcwCpeB912KOzaxaGEL0YF6679E+GZ53ez6AKgC4yR8niw4y/KiEQ== X-Received: by 2002:a5d:460e:: with SMTP id t14mr38921526wrq.171.1567438441931; Mon, 02 Sep 2019 08:34:01 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.34.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:34:01 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:33:04 +0200 Message-Id: <20190902153333.11190-20-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/dbm.scm (bdb-4.8)[arguments]: Pass host argument to configure when cross-compiling. --- gnu/packages/dbm.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/dbm.scm b/gnu/packages/dbm.scm index 5191c475c2..84c5817a79 100644 --- a/gnu/packages/dbm.scm +++ b/gnu/packages/dbm.scm @@ -55,7 +55,7 @@ #:phases (modify-phases %standard-phases (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) + (lambda* (#:key target outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) (doc (assoc-ref outputs "doc"))) ;; '--docdir' is not honored, so we need to patch. @@ -74,6 +74,10 @@ '("--build=aarch64-unknown-linux-gnu") '()) + ,@(if (%current-target-system) ; cross building + '((string-append "--host=" target)) + '()) + ;; Remove 7 MiB of .a files. "--disable-static" From patchwork Mon Sep 2 15:33:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15228 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 73D121734D; Mon, 2 Sep 2019 16:35:22 +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 25F0517329 for ; Mon, 2 Sep 2019 16:35:22 +0100 (BST) Received: from localhost ([::1]:37584 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oMT-0002Dw-Dp for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:35:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42550) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oMD-0002BO-Vj for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4oMC-0004GM-Nx for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50026) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oMC-0004Fx-JX for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oMC-0006ch-GI for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 20/48] gnu: openldap: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Sep 2019 15:35:04 +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.156743847025109 (code B ref 36477); Mon, 02 Sep 2019 15:35:04 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:34:30 +0000 Received: from localhost ([127.0.0.1]:58771 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLd-0006WW-50 for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:30 -0400 Received: from mail-wr1-f54.google.com ([209.85.221.54]:40228) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLI-0006Qi-Pz for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:09 -0400 Received: by mail-wr1-f54.google.com with SMTP id c3so14448102wrd.7 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:34:08 -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=M9kLbK9Yufkwn6OkKkwWXAXth9AIGN5tOPh0rJyG59M=; b=MFqUqdWrnt+GROBz6HAUDvwbhYUeY9KvejtJufzBeQyVDuAZkaZx+72laVA+xk9xfc Rhw8iSuxEZSdNBn2O2MPplD4b9WRTMthmSTpolFVfJYaoqAr1xhm8kX0JfXZL6Y3XpQN phHeVhQZJZoe5kNolar8Fqi1w8OmHfXhmRpGc5xmmBh9j6lCQeqpR0YPnIxNERB7DeBi dDfr+nrk2hDaEkQrbeHsN2rJDolvHnxCKcj3rNE78+c8uZZNwXLBJbGquhkJOi3ZyD1S k25N8TNsLrWChzHUl61h3nkoemlwPCFY+PjcgN7fN2E2JknGgWNGxk24xXv6T2NOoCF7 R5MA== 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=M9kLbK9Yufkwn6OkKkwWXAXth9AIGN5tOPh0rJyG59M=; b=V5bab0BQaK4Q/Xv3YeHBuoNwe0L8/15PyZboolUB8B2VGGk8Lg6OtuVwWSvy2aCZij OY2hxMO/o1Sw4MLzak2eH9sYXrgSN5s8LB3wdDs51av4y0MEqOKS3j73wUM4D4haNo7A PBPvsg7B/651UI4h40pGGUBxhMW5X7L0quVimCE/kKIEG1uDI0BaxrG1xR6WWdNcBG4L XI3W2EwiW2j0M8UEc1+our/l1nE9otYnUXvB3bFYYt9B0MUA88vlwNRjjqaz/AVX9gQ4 kEINjws0WXZubuvARwxTnuwMrytz1YoaIdlnulRkZmcxUW87m0jYJmLJm9+/BvjySg6F X2wg== X-Gm-Message-State: APjAAAV9AkHDj9OOgrIpT75i2ZHj/QBNX0WZX9n43IkIEHnybMUW8rto LW1gpMU+5dUAauKKzE6S6VxvD4il X-Google-Smtp-Source: APXvYqze3/ES+TQFbrv8yZURmcrYHrzbcgcK0LAoD3wSHgIf2yCRztPQQW93Ze6H86PmLJj8bBsdaw== X-Received: by 2002:a5d:6911:: with SMTP id t17mr36644707wru.255.1567438442980; Mon, 02 Sep 2019 08:34:02 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.34.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:34:02 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:33:05 +0200 Message-Id: <20190902153333.11190-21-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/openldap.scm (openldap)[inputs]: Move groff from here to ... [native-inputs]: ... here. Also add bdb and automake. [arguments]: Add cross-compilation specific configure-flags. Do not strip when cross-compiling. Add a new fix-configure phase to update outdated config.sub and config.guess. Add a fix-cross-gcc phase to set CC variable to cross-compiler name when cross-compiling. --- gnu/packages/openldap.scm | 38 +++++++++++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/gnu/packages/openldap.scm b/gnu/packages/openldap.scm index 2f80920ed4..2c9b0d428e 100644 --- a/gnu/packages/openldap.scm +++ b/gnu/packages/openldap.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2017, 2018, 2019 Ricardo Wurmus ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -50,6 +51,7 @@ #:use-module (gnu packages) #:use-module ((guix licenses) #:select (openldap2.8 lgpl2.1+ gpl3+ psfl)) #:use-module (guix packages) + #:use-module (guix utils) #:use-module (guix download) #:use-module (guix build-system gnu) #:use-module (guix build-system python)) @@ -79,16 +81,46 @@ (inputs `(("bdb" ,bdb-5.3) ("cyrus-sasl" ,cyrus-sasl) ("gnutls" ,gnutls) - ("groff" ,groff) ("icu4c" ,icu4c) ("libgcrypt" ,libgcrypt) ("zlib" ,zlib))) - (native-inputs `(("libtool" ,libtool))) + (native-inputs `(("libtool" ,libtool) + ("groff" ,groff) + ("bdb" ,bdb-5.3) + ;; For up to date 'config.guess' and 'config.sub'. + ("automake" ,automake))) (arguments `(#:tests? #f - #:configure-flags '("--disable-static") + #:configure-flags + '("--disable-static" + ,@(if (%current-target-system) + '("--with-yielding_select=yes" + "ac_cv_func_memcmp_working=yes") + '())) + ;; Disable install stripping as it breaks cross-compiling. + #:make-flags '("STRIP=") #:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-configure + (lambda* (#:key inputs native-inputs #:allow-other-keys) + ;; Replace outdated config.sub and config.guess: + (with-directory-excursion "build" + (for-each (lambda (file) + (install-file (string-append + (assoc-ref + (or native-inputs inputs) "automake") + "/share/automake-" + ,(version-major+minor + (package-version automake)) + "/" file) ".")) + '("config.sub" "config.guess"))) + #t)) + ,@(if (%current-target-system) + '((add-before 'configure 'fix-cross-gcc + (lambda* (#:key target #:allow-other-keys) + (setenv "CC" (string-append target "-gcc")) + #t))) + '()) (add-after 'install 'patch-sasl-path ;; Give -L arguments for cyrus-sasl to avoid propagation. (lambda* (#:key inputs outputs #:allow-other-keys) From patchwork Mon Sep 2 15:33:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15261 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 50C031734D; Mon, 2 Sep 2019 16:38:48 +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 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 1F38A17329 for ; Mon, 2 Sep 2019 16:38:48 +0100 (BST) Received: from localhost ([::1]:37686 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oPn-000653-LZ for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:38:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42570) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oME-0002CS-Oq for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4oMD-0004Id-Nh for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50028) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oMD-0004IU-Kq for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oMD-0006cw-Hh for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 21/48] gnu: swig: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Sep 2019 15:35: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.156743847125130 (code B ref 36477); Mon, 02 Sep 2019 15:35:05 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:34:31 +0000 Received: from localhost ([127.0.0.1]:58777 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLe-0006X8-Ks for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:30 -0400 Received: from mail-wr1-f50.google.com ([209.85.221.50]:35597) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLK-0006RA-0H for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:10 -0400 Received: by mail-wr1-f50.google.com with SMTP id g7so14486416wrx.2 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:34:09 -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=2EZ6hLkwUZ00Nl7nd2uvqj1PaCk3VL9cVVF16tNjJ6Q=; b=Lnmu9pTQy9xlC0k6i01C389Ud4sacKPHZ9D6aBQx7MEtehB9LyCpMayzOX4ituI29w e3wDOnDAw7NTTOifs37jfaxpt7rKrD7SrbmRCaSMVm9XDSuH3HHx3LjjV7s4gSa989Ez RyIWYigesG8MMjyqFBOI9AYbqmvG06d1OEtyLKmwaLwoa2DfQ/gay7Mg95T+glXdBrga YTAn/no9QYIj9lXqTaXRdu/f6oanjIJWUyHL9PlXao5tSplTXav1Ntm4gxxSN67sgq2V Go/s7+25TbOBR1AWOVAtU/jEKaF75nfqBlrJMZaHUmIViz7sw3v7Ir5Xz6lGpQGrJmgP ND4Q== 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=2EZ6hLkwUZ00Nl7nd2uvqj1PaCk3VL9cVVF16tNjJ6Q=; b=RRryzIbItCPnpGAoUpA78Hp3YdKuMZcYkINd9Sjsu5lWGgmXvjq+wy+ul+AI8qBfpe 35/DYyj5i8wmnluCpn2azEJsGkYG8zg0MPLaIpbHMV6ohEzDmOq8H3ykxBxZvbBBU/go ldePi4hn+lQLIkDU6kzORScWFDERehLzd4rHhNfRn8//BjIVzE3BigbAqlYC0RTh7e2I yB3fJCFf7HUR7+DTs4H64HW9X0mNbLP0lxGaqS5HfLsgfVPDGaFaXVBi3yaOBdJTLADa 29jJaK8LM68osIRy7S7lAD2EDYCwqpqoiNmMLVt3BLGvOIXTN6Rz0OaJdWyHWcXAmhyt J5ww== X-Gm-Message-State: APjAAAW2zp+N9tvTJ7YDoXfOT5bWdf2vldMLe854OQO9drZp20G9yAlk wVG4VDoScgFkw3D+XuTpkHedV0PX X-Google-Smtp-Source: APXvYqzN0EoIDOIuLgchn++oHS/QgscV59b0Qzyqe4+QVP9XVH3yvodLPzFA0/T2poiIL1MEJhjaLw== X-Received: by 2002:adf:cd86:: with SMTP id q6mr5748995wrj.44.1567438443999; Mon, 02 Sep 2019 08:34:03 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.34.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:34:03 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:33:06 +0200 Message-Id: <20190902153333.11190-22-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/swig.scm (swig)[inputs]: Add pcre that is needed when cross-compiling. --- gnu/packages/swig.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/swig.scm b/gnu/packages/swig.scm index b1b17fc68d..90d698a8b4 100644 --- a/gnu/packages/swig.scm +++ b/gnu/packages/swig.scm @@ -62,6 +62,7 @@ (native-inputs `(("boost" ,boost) ("pcre" ,pcre "bin"))) ;for 'pcre-config' (inputs `(;; Provide these to run the corresponding tests. + ("pcre" ,pcre) ("guile" ,guile-2.0) ("perl" ,perl))) ;; FIXME: reactivate input python as soon as the test failures From patchwork Mon Sep 2 15:33:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15231 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 BF3671734D; Mon, 2 Sep 2019 16:35:59 +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 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 80D4517329 for ; Mon, 2 Sep 2019 16:35:59 +0100 (BST) Received: from localhost ([::1]:37596 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oN4-0002py-Jf for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:35:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42613) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oMG-0002Ee-He for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4oME-0004Jc-9T for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50029) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oME-0004JD-6T for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oME-0006d3-2V for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 22/48] gnu: git: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Sep 2019 15:35:06 +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.156743847125138 (code B ref 36477); Mon, 02 Sep 2019 15:35:06 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:34:31 +0000 Received: from localhost ([127.0.0.1]:58779 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLe-0006XH-U9 for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:31 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:34887) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLL-0006Rb-2v for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:11 -0400 Received: by mail-wr1-f65.google.com with SMTP id g7so14486489wrx.2 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:34:11 -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=4Y/ydxnmL4y0uCr03V0jUgPtiBT/HQ4Ex9qdOFEtzwE=; b=V5XrbOf9CAaaihrEL0EdOBve8kJFn/0tWnPXD/l7jP4U5eMAYR4juGS58JYpq7byqc ZznqtnIK1Ygx13f2646WTNG5niJ26h3Cqg9c+J6ZL9s+5wFi43b3QGtWVWpzxjgICIwj YvalFYQ0Hsjku3fQ62R11SNbiJzmBnmmldudbwPOfnWWdruSjBKS+ZF1a8eBLZ8MUX0s OBX/gLPcPQegAqAF7sAdaHqL9Zjh9FJgYGde0gUSSJ4Au6H5Gq+N6i7B7Hf1479Aj2/P QxhrDu0np3fQ0gUrrRHWPWQEl+Y6/AY3BjSTt2svQsK4DIGPq35AdSVudbUg3TvsD3OT S4Hw== 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=4Y/ydxnmL4y0uCr03V0jUgPtiBT/HQ4Ex9qdOFEtzwE=; b=Kh37Pf2lKEmMl9t01to0bCM6P+bKl7QTdaL6FJNsRspVd/V4Kuq2/m131WDnisCrwa jfvPNm2GoPheLupD7WRffUN0TkU1pP4/AiBe4owOM2m/l4e2z3gFgtWz3+NE1A3GZHCe sysDX5zECoqVRc65xjcc5IQMkR9CdJBD42XzkWuQrES7r4JJo6BLcWXSmqupoLAw9pgk X5Lg4yU8BGGPPb+HoDBMegnLDxxWR/wtYFWgEIluaGXetBsYDsgnSyod7kJgcq6ZCybY czCQhFNYTuG1k9YKYC5SizN4TE0ggxg9EeTebvNsYhQZ21jdEstPquB5UR0sHpmLgjg8 6cMg== X-Gm-Message-State: APjAAAWsEkxKJdrhsVCRK3jnyEe3D+ZdQ94Zn/qeXaFJ2ibZrDWoY2IZ 4jGtd5M0Bu8dVVibzPcOkIlNDHsJ X-Google-Smtp-Source: APXvYqz6uUz3L0PeQYTLUAtGySdfE1C6TPaSpfIOzuWvaJzcB/cZkoaKX9srq98iYClcLawJdL//iw== X-Received: by 2002:a5d:6588:: with SMTP id q8mr16714705wru.184.1567438445182; Mon, 02 Sep 2019 08:34:05 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.34.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:34:04 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:33:07 +0200 Message-Id: <20190902153333.11190-23-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/version-control.scm (git-cross-configure-flags): New variable, (git)[arguments]: add it to configure-flags. Also add cross curl-config script to PATH. (git-minimal): Add previous variable to configure-flags. --- gnu/packages/version-control.scm | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 192fa666d9..947873e6d5 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -141,6 +141,10 @@ changes to project files over time. It supports both a distributed workflow as well as the classic centralized workflow.") (license license:gpl2+))) +(define git-cross-configure-flags + '("ac_cv_fread_reads_directories=yes" + "ac_cv_snprintf_returns_bogus=no")) + (define-public git (package (name "git") @@ -233,7 +237,10 @@ as well as the classic centralized workflow.") ;; absolute file name to 'wish'. #:configure-flags (list (string-append "--with-tcltk=" (assoc-ref %build-inputs "tk") - "/bin/wish8.6")) ; XXX + "/bin/wish8.6") ; XXX + ,@(if (%current-target-system) + git-cross-configure-flags + '())) #:modules ((srfi srfi-1) (srfi srfi-26) @@ -250,6 +257,15 @@ as well as the classic centralized workflow.") (remove (cut string-prefix? bash-full <>) path) ":")) #t))) + ;; Add cross curl-config script to PATH when cross-compiling. + ,@(if (%current-target-system) + '((add-before 'configure 'add-cross-curl-config + (lambda* (#:key inputs #:allow-other-keys) + (setenv "PATH" + (string-append (assoc-ref inputs "curl") "/bin:" + (getenv "PATH"))) + #t))) + '()) (add-after 'configure 'patch-makefiles (lambda _ (substitute* "Makefile" @@ -506,7 +522,10 @@ everything from small to very large projects with speed and efficiency.") (string-append out "/share/gitweb")) #t))))) ((#:configure-flags flags) - ''()) + `(list + ,@(if (%current-target-system) + git-cross-configure-flags + '()))) ((#:disallowed-references lst '()) `(,perl ,@lst)))) (outputs '("out")) From patchwork Mon Sep 2 15:33:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15230 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 E8E8C1734D; Mon, 2 Sep 2019 16:35:55 +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 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 B650317329 for ; Mon, 2 Sep 2019 16:35:55 +0100 (BST) Received: from localhost ([::1]:37592 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oN0-0002iQ-PJ for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:35:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42608) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oMG-0002EM-Ci for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4oMF-0004Lr-AP for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50031) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oMF-0004L7-5j for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oMF-0006dI-2C for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 23/48] gnu: make-linux-libre: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Sep 2019 15:35:07 +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.156743847125153 (code B ref 36477); Mon, 02 Sep 2019 15:35:07 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:34:31 +0000 Received: from localhost ([127.0.0.1]:58783 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLf-0006XW-IY for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:31 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:35330) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLL-0006Rq-Ts for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:15 -0400 Received: by mail-wm1-f67.google.com with SMTP id n10so4386893wmj.0 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:34:11 -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=BLVterHn1ZjqgF7EPe9bVrpAit+Ue7YIkov6w1wQdhQ=; b=dKVuujmqU1c89INce8dKw+jRu6H+IFQe0D/p/khuIlz+rXzjGZbY+hvvko/nQ+tkxQ AqIJ411tpuTDOSeAPGGsN3AJqsFCEKTWptkOF0a7XHC6QdhhABa0dfqripiJm9/3KdbJ dhkzEd7m3tJGECWmqKWO5blQKH8hrtwIa+hne6Ay/H5WBQu7UxTkk1NnBHG3Id4b1Mzk YRJjo9pxCNi4d/+PddxRARQlhpkOCH0OB5OMHfUL3TYtr0zMYkgFnBbcXIRYQhbdumUJ FuyexGVPOUhrhwyKM7RICI8aK6aWDypNNq9IaG8eLqtKKN9o9D5bQxizqzJOAX0v9GFG pG3g== 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=BLVterHn1ZjqgF7EPe9bVrpAit+Ue7YIkov6w1wQdhQ=; b=gBnySOIMO16JAna2VmYtVJdgf121c3wo9ZTGasa1pXEdg7Fy9Hs1OzDNFNjYBy1j4x mJ/eIQTSd2g8g7H6c461xdN4T7fZmav8VUf/sDcf/6i06LNCtpz8WknKmwHIr4HcZoS1 FOFykxydJU30PCDQKW+EwcnmFx2ST7/KNO4nggJOiQGo7yCRf77rJRFBddgbu9Ui1U7R Csw6pemKEtStSfTyDgTuC0CfiJX0QunOsu7AILSFwjz2Xojq391d+xWm0vH1b4CExgTh Y7cShGVf05gwnhuVsnnp4TnFjk6fcmgFptWfu1GnEfOPdn6IuJaIYSUfsX5Xgh5mTi3K ViHQ== X-Gm-Message-State: APjAAAUqLfvGkKnIZuHmMkD+4ZXqjR54KHYNy/VxFCgDZ9XNqlzbI0Su Kj1cBvF0pmHDQ7KwHFEEipIGsQAu X-Google-Smtp-Source: APXvYqzZv5stxdlPr482OG5k7zXufKciYM4H8Rns9lJAAo0P1RlxTLccLCG+/CfpxI+k7n82Bj5wLA== X-Received: by 2002:a7b:cf09:: with SMTP id l9mr35839387wmg.20.1567438446225; Mon, 02 Sep 2019 08:34:06 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.34.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:34:05 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:33:08 +0200 Message-Id: <20190902153333.11190-24-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/linux.scm (make-linux-libre)[arguments]: Unset CROSS_CPATH to make sure that cross-libc is not found. Otherwise, some of its header would conflict with the one from linux (stdint.h and linux/types.h). --- gnu/packages/linux.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index afa860830b..9c1ba6d5b9 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -665,6 +665,9 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration." (replace 'configure (lambda* (#:key inputs native-inputs target #:allow-other-keys) ;; Avoid introducing timestamps + ,@(if (%current-target-system) + '((unsetenv "CROSS_CPATH")) + '()) (setenv "KCONFIG_NOTIMESTAMP" "1") (setenv "KBUILD_BUILD_TIMESTAMP" (getenv "SOURCE_DATE_EPOCH")) From patchwork Mon Sep 2 15:33:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15233 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 532141734D; Mon, 2 Sep 2019 16:36:08 +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 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 20F5017329 for ; Mon, 2 Sep 2019 16:36:08 +0100 (BST) Received: from localhost ([::1]:37602 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oNC-000300-Oi for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:36:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42630) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oMH-0002FT-6B for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4oMF-0004OX-Pg for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50032) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oMF-0004NX-LW for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oMF-0006dP-I4 for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 24/48] gnu: procps: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Sep 2019 15:35:07 +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.156743847225160 (code B ref 36477); Mon, 02 Sep 2019 15:35:07 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:34:32 +0000 Received: from localhost ([127.0.0.1]:58785 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLf-0006Xe-TW for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:32 -0400 Received: from mail-wr1-f42.google.com ([209.85.221.42]:44847) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLN-0006SC-7j for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:16 -0400 Received: by mail-wr1-f42.google.com with SMTP id 30so3508778wrk.11 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:34:13 -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=9hjR3+4eM0GBKFqxXfhhnIEaiXyPg25y/KMRDi4m/rs=; b=l9eja4to7LLAGf6z6OesIMsQI+8VqZVAsqCvY1LD7ZcfhakBWWrQuFcx7iSEWRi7M6 +KLfGwcDvr4ESaRdKOEtM3s9i6q3PJnWlyiL7JZgAUdepARJFFsiNIqohhyiEp+nR/aD FTrZytbWpiWSXpcyoTGx1BsuyLYlz9hNSLnACDs8b4+wwXOB/sJKrynCAcsDPhs6nPIG XYRy1CPTFDrCLyLAOizVZLOU7zteMuPocYkjw7qDDifxQFggXWSaBn6GyfLnUBdXFhvC va4S1eLR+kOg3Ty51ijZrCTSUsxmahRAGAYVRLdsOpEdcl4INabVrx8SXEoIf3RjSSTn VPmA== 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=9hjR3+4eM0GBKFqxXfhhnIEaiXyPg25y/KMRDi4m/rs=; b=BBu388fIDl8TnTlKu7tdRWZFhtCY9GLHp4A+uLvTZhRnMnCtVqycMpAUlL9cqmLgQ0 eXe+0mc+K1RuGYkJ6McMEt9u2EeXHCqbDGmgnNiLNF6rxSyAVBkoj4X/XFRV9rgJardA gBvWtNqQY9h0Cp5F42lmaGETGZ3wXiHB6SOGzhyXAVheyaEfZYaGsEqMAJIae9yp3839 iQtQKMBE7M7fuA8tsaMSmIS0VFtjVRNKuYezlupF5qaT2xh4LJX+4/tpxwA2Zt86NIQJ Y9p4wDvISdEhfAfPz3OrO5bOrQIRh/8DU2J76TmNHsHnVFsqRJ3QjIz8ZPlumPm0LRXy hdSA== X-Gm-Message-State: APjAAAWAWL8wS+B5h7AUENftzTckCjXmKrbV2+YVNVk1Y5hK69EoBRGB TVjdlaZPxak90R9HQ2TQ0jVcYkoB X-Google-Smtp-Source: APXvYqwakvs/k6HdUWwoXhVpb5xDEPP+9B9un8EMuKMX+QJgYn78SA6iOjn+Q1TKws96bAvXcfYR6Q== X-Received: by 2002:adf:fd03:: with SMTP id e3mr28390100wrr.291.1567438447411; Mon, 02 Sep 2019 08:34:07 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.34.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:34:06 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:33:09 +0200 Message-Id: <20190902153333.11190-25-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/linux.scm (procps)[arguments]: Add configure flags needed from cross-compilation. --- gnu/packages/linux.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 9c1ba6d5b9..874fa819e5 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1138,10 +1138,16 @@ by Robert Shea and Robert Anton Wilson.") "0r84kwa5fl0sjdashcn4vh7hgfm7ahdcysig3mcjvpmkzi7p9g8h")))) (build-system gnu-build-system) (arguments - '(#:modules ((guix build utils) + `(#:modules ((guix build utils) (guix build gnu-build-system) (srfi srfi-1) (srfi srfi-26)) + ,@(if (%current-target-system) + '(#:configure-flags + (list + "ac_cv_func_malloc_0_nonnull=yes" + "ac_cv_func_realloc_0_nonnull=yes")) + '()) #:phases (modify-phases %standard-phases (add-after From patchwork Mon Sep 2 15:33:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15258 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 5C0CD1734D; Mon, 2 Sep 2019 16:38: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 1A65217329 for ; Mon, 2 Sep 2019 16:38:33 +0100 (BST) Received: from localhost ([::1]:37672 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oPY-0005hT-Ap for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:38:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42605) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oMG-0002EE-7C for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4oME-0004Ke-Pu for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50030) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oME-0004KQ-Mr for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oME-0006dB-JO for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 25/48] gnu: doxygen: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Sep 2019 15:35:06 +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.156743847125145 (code B ref 36477); Mon, 02 Sep 2019 15:35:06 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:34:31 +0000 Received: from localhost ([127.0.0.1]:58781 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLf-0006XP-85 for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:31 -0400 Received: from mail-wr1-f53.google.com ([209.85.221.53]:42695) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLO-0006Sc-6B for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:15 -0400 Received: by mail-wr1-f53.google.com with SMTP id b16so14430106wrq.9 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:34:14 -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=czHKW4TdSXROEWA29LMwHzb1inQWIOdBRxWArsNGNuY=; b=ABxDA0+7VCZQYExcsy5Am8fLV/ol1tYwMOPiMBGfBoQO3gtRDBW3v3Ga4P4mPdhx09 MRmBlt/DgQDfz1e2HaJ1jTxkHAVgKbX4BJyCLMHZ9AKuvGc4ozBY37SRIy5ZJdtvLkEw AbTVla8y6xVAHwM4Tgy6jSDDwHeGwBw+AXJa8xDwTSo9RgN4mOI98TToTW1m/CQKGNe2 5tcQrN8lOrRDYBywgBKCMw6JrV/G2ZHsQLFGHq3zhiTwIgMIaALmURD3hAX9RcQLISNg w1LbXzU0/tAk3zkmUHWb/Ao8RlLUKUbH4S9KeAmbLRp2pedtkiR6+2Uw2a0p36ouRI9a CsJA== 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=czHKW4TdSXROEWA29LMwHzb1inQWIOdBRxWArsNGNuY=; b=t0gmZDnSgBvHiuDHiDaYXJQ3l6169Rm03wltU5W2mJbSP7XIUsaOp3GL7j5aMX0Un8 9frfjlDI0cZXZeRs4TzwbesA7RGjMl+6bqoHPXbEoN0WKCiSzWPDQHzq4CehJkSaTUaH F77QLbNnsy8a6hyF2gfWiniaN29UpHWKyKpVBEPLl/DzIe8J2z2JVtjLRJ+pKEWqpkX+ dvv9J7awfmJuw0BUtGYBtoG7S2OSQJxNdiUV5kg0fpLEyoIlJsWALau9mGrB6g3uypP3 NConL0t9XQKP70Xwrc/fcZslwjwNbCpPiKLW4bZhM06Bl7BfLh73SBcXJRSKFIWsccMb wfgQ== X-Gm-Message-State: APjAAAWPvOdpN2KMNI+hAebucj0neGtlYtWG4+3DuH9hOfJBExkL9lHI oAtVAV2/DTGISymOsjO7GNHr+DHw X-Google-Smtp-Source: APXvYqyVyroqnCZ3BBeUL0p2FloMbHHgM4T2TmCQ1QOqGfFKbKEVH2hpksNh2/UEbTz9xCw3jHgrSA== X-Received: by 2002:a5d:46c4:: with SMTP id g4mr20154301wrs.189.1567438448470; Mon, 02 Sep 2019 08:34:08 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.34.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:34:07 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:33:10 +0200 Message-Id: <20190902153333.11190-26-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/documentation.scm (doxygen)[arguments]: Force cmake to use iconv.h from cross-libc. --- gnu/packages/documentation.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index 19c42b00eb..eda8ca3368 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2017 Kei Kebreau ;;; Copyright © 2017 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -31,6 +32,7 @@ #:use-module (guix build-system cmake) #:use-module (gnu packages) #:use-module (gnu packages autotools) + #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages python) #:use-module (gnu packages bison) @@ -145,7 +147,15 @@ markup) can be customized and extended by the user.") (inputs `(("bash" ,bash-minimal))) (arguments - `(#:test-target "tests" + ;; Force cmake to use iconv header from cross-libc instead of the one + ;; from native libc. + `(,@(if (%current-target-system) + '(#:configure-flags + (list (string-append "-DICONV_INCLUDE_DIR=" + (assoc-ref %build-inputs "cross-libc") + "/include"))) + '()) + #:test-target "tests" #:phases (modify-phases %standard-phases (add-before 'configure 'patch-sh (lambda* (#:key inputs #:allow-other-keys) From patchwork Mon Sep 2 15:33:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15266 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 31C6C1734D; Mon, 2 Sep 2019 16:39:23 +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 BF1F517329 for ; Mon, 2 Sep 2019 16:39:22 +0100 (BST) Received: from localhost ([::1]:37704 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oQM-0006RC-BH for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:39:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42779) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oMN-0002Np-EZ for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4oMK-0004g3-M7 for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:14 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50041) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oMK-0004eg-AE for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:12 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oMK-0006eX-5Z for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 26/48] gnu: guile-sqlite3: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Sep 2019 15:35:12 +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.156743848925288 (code B ref 36477); Mon, 02 Sep 2019 15:35:12 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:34:49 +0000 Received: from localhost ([127.0.0.1]:58811 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLp-0006ZW-S5 for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:49 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:47020) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLP-0006Sx-78 for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:24 -0400 Received: by mail-wr1-f68.google.com with SMTP id h7so13115808wrt.13 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:34:15 -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=JfxmM9/3xpeOOvigmlE2zqbOCm4RWsvNg6lyp2tkml4=; b=TVKiFFoAte3jF3NNCfMhWEl6JW1t4SpFPOIfaZEKLteE7sQ9Mp01c0otV09Y/g5p+e hlgDWHcAXQujJMuu0SaF8xGXzWFIy7dNMFEr/CqjKn2wSSudvCxUINH3nYZb5xB6rvIV IxCjZcdFrYdbqG1SV+l4kM/JoA7MgTEK9oYxmlJ6dLncwmeR2a0u3SeF/Ms42dKwEAAJ pZIqVlTj2cMmRepgZWwPGl68M1FR30iSokSCK+cqGXGwGwFF8IPw9Hc1G6BdmZU05/mP tFV2cJNIwUPT6kg9nT8b5Q9yLPdE6x4ky4j4bi/8A1VdIyeH8a73E4jbqXNEFYZq/5Qm dBOg== 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=JfxmM9/3xpeOOvigmlE2zqbOCm4RWsvNg6lyp2tkml4=; b=Rgfo4fntJSoQSLe+uKms4ZwC6loXR3Rx+5BrDJtqHWuIufZo82LtmF/b2pQZfcWbys WXz4STuzc5oqQPo3rsKeoNVAYlKmGCDFVEZmSbCmJ7bBVnJqthOAHP0hnv0OnaCrYh99 SUZVaksge4dmnNPXOsqF8NSF50AeKbJZdFtQ5JoMZEsWBqYmA6HFKQ/mAWPknohECbGP 1TQTmmsjASDTH6LhhF2lW4THm/rQ/7dfemPS+BZxid38esnOAQ2Y5YHDP39GQeLMGL5F DYwKGbowomH4zpseSUFIxLHGjejTLrrYwz21X+fRqZbtMycsLZ86SVH1/jb054EC9gE0 ZgtQ== X-Gm-Message-State: APjAAAV+ef8DF/WRso5hnuJpLj4qVzPys0Dd4J6EpxTcPtLYJrOv1TxO cLSw+tzNeRuTgN3mo31K4zdy7bUG X-Google-Smtp-Source: APXvYqyhS2vn4RBvgQqvKO/eMalunlMsMyR0x8icYX35BO9Ix5/cYvSB0VomougUzGT2uEN5mZrRPQ== X-Received: by 2002:a5d:6911:: with SMTP id t17mr36645457wru.255.1567438449484; Mon, 02 Sep 2019 08:34:09 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.34.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:34:08 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:33:11 +0200 Message-Id: <20190902153333.11190-27-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/patches/guile-sqlite3-fix-cross-compilation.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/guile.scm (guile-sqlite3)[source]: Apply previous patch, [native-inputs]: add guile. --- gnu/local.mk | 1 + gnu/packages/guile.scm | 7 ++- .../guile-sqlite3-fix-cross-compilation.patch | 55 +++++++++++++++++++ 3 files changed, 61 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/guile-sqlite3-fix-cross-compilation.patch diff --git a/gnu/local.mk b/gnu/local.mk index ae53257a77..2cf92e4478 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -928,6 +928,7 @@ dist_patch_DATA = \ %D%/packages/patches/guile-relocatable.patch \ %D%/packages/patches/guile-rsvg-pkgconfig.patch \ %D%/packages/patches/guile-emacs-fix-configure.patch \ + %D%/packages/patches/guile-sqlite3-fix-cross-compilation.patch \ %D%/packages/patches/gstreamer-buffer-reset-offset.patch \ %D%/packages/patches/gtk2-respect-GUIX_GTK2_PATH.patch \ %D%/packages/patches/gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch \ diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index b07a570654..713390ada1 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2016, 2019 Ricardo Wurmus ;;; Copyright © 2017 Andy Wingo ;;; Copyright © 2017 Marius Bakke -;;; Copyright © 2017 Mathieu Othacehe +;;; Copyright © 2017, 2019 Mathieu Othacehe ;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; Copyright © 2017, 2018 Amirouche ;;; Copyright © 2018 Danny Milosavljevic @@ -521,11 +521,14 @@ Guile's foreign function interface.") (sha256 (base32 "1nv8j7wk6b5n4p22szyi8lv8fs31rrzxhzz16gyj8r38c1fyp9qp")) - (file-name (string-append name "-" version "-checkout")))) + (file-name (string-append name "-" version "-checkout")) + (patches + (search-patches "guile-sqlite3-fix-cross-compilation.patch")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) + ("guile" ,guile-2.2) ("pkg-config" ,pkg-config))) (inputs `(("guile" ,guile-2.2) diff --git a/gnu/packages/patches/guile-sqlite3-fix-cross-compilation.patch b/gnu/packages/patches/guile-sqlite3-fix-cross-compilation.patch new file mode 100644 index 0000000000..9ea9a47677 --- /dev/null +++ b/gnu/packages/patches/guile-sqlite3-fix-cross-compilation.patch @@ -0,0 +1,55 @@ +From a6e9e62a77ecc5012929613e20da23b2636450a5 Mon Sep 17 00:00:00 2001 +From: Mathieu Othacehe +Date: Mon, 25 Mar 2019 11:00:38 +0100 +Subject: [PATCH] cross compile + +--- + build-aux/guile.am | 2 +- + configure.ac | 19 ++++++++++++------- + 2 files changed, 13 insertions(+), 8 deletions(-) + +diff --git a/build-aux/guile.am b/build-aux/guile.am +index dc1e63f..3126372 100644 +--- a/build-aux/guile.am ++++ b/build-aux/guile.am +@@ -16,4 +16,4 @@ EXTRA_DIST = $(SOURCES) $(NOCOMP_SOURCES) + GUILE_WARNINGS = -Wunbound-variable -Warity-mismatch -Wformat + SUFFIXES = .scm .go + .scm.go: +- $(AM_V_GEN)$(top_builddir)/env $(GUILE_TOOLS) compile $(GUILE_WARNINGS) -o "$@" "$<" ++ $(AM_V_GEN)$(top_builddir)/env $(GUILE_TOOLS) compile $(GUILE_TARGET) $(GUILE_WARNINGS) -o "$@" "$<" +diff --git a/configure.ac b/configure.ac +index f648fcb..2d34d0a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -21,15 +21,20 @@ PKG_CHECK_MODULES([SQLITE], [sqlite3]) + SQLITE_LIBDIR="`"$PKG_CONFIG" sqlite3 --variable libdir`" + AC_SUBST([SQLITE_LIBDIR]) + +-AC_MSG_CHECKING([whether '$SQLITE_LIBDIR/libsqlite3' is usable]) +-GUILE_CHECK([retval], +- [(dynamic-func \"sqlite3_open_v2\" ++if test "$cross_compiling" = "no"; then ++ AC_MSG_CHECKING([whether '$SQLITE_LIBDIR/libsqlite3' is usable]) ++ GUILE_CHECK([retval], ++ [(dynamic-func \"sqlite3_open_v2\" + (dynamic-link \"$SQLITE_LIBDIR/libsqlite3\"))]) +-if test "$retval" != 0; then +- AC_MSG_RESULT([no]) +- AC_MSG_ERROR([failed to load '$SQLITE_LIBDIR/libsqlite3']) ++ if test "$retval" != 0; then ++ AC_MSG_RESULT([no]) ++ AC_MSG_ERROR([failed to load '$SQLITE_LIBDIR/libsqlite3']) ++ else ++ AC_MSG_RESULT([yes]) ++ fi + else +- AC_MSG_RESULT([yes]) ++ GUILE_TARGET="--target=$host_alias" ++ AC_SUBST([GUILE_TARGET]) + fi + + AC_CONFIG_FILES([Makefile sqlite3.scm]) +-- +2.17.1 + From patchwork Mon Sep 2 15:33:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15267 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 4CA8E1734D; Mon, 2 Sep 2019 16:39:29 +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 836A617329 for ; Mon, 2 Sep 2019 16:39:28 +0100 (BST) Received: from localhost ([::1]:37706 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oQS-0006V8-0z for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:39:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42727) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oML-0002KV-AF for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4oMI-0004ak-Ej for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50037) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oMI-0004a9-9H for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oMI-0006e1-3S for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 27/48] gnu: guile-gcrypt: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Sep 2019 15:35:10 +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.156743848025246 (code B ref 36477); Mon, 02 Sep 2019 15:35:10 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:34:40 +0000 Received: from localhost ([127.0.0.1]:58799 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLj-0006Yc-2w for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:40 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:37260) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLQ-0006Tc-Ut for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:22 -0400 Received: by mail-wm1-f65.google.com with SMTP id d16so15057846wme.2 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:34:16 -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=kCGs/Y6CEahz95Yz/59s7XpjfVQl8u+eWQldsTZxVQY=; b=ZvBNnLslqm1hMJbxhlw/6xWM9lJnyepBAriTcV94tAfxuFbtr5GZX52GiqTPTAB111 PvlgpONFeVffiJijar7M3sbUMgTd91JP8ICVewMgtTCC4hGL/RTS9sK9FrW8vNx1b6wM pAon5tHxcRXpdKyaSk3I9fo7Evd9hczmysbE+PforGmFMhmZoqsFTNvn1CzvHSwEEQD3 CxcxaHHuFi5bfMib/NizC+1LaPJQUxBO4PLUsHe3nkb9jah0QDOGHDGg01BxSklABfH5 Q5WZAs4Ir+1lZAGHwnqKUg7p93rNaljG51J1wqKSpCmaBZXujwPjRPUUzeWP9EgrdSbl S8Sg== 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=kCGs/Y6CEahz95Yz/59s7XpjfVQl8u+eWQldsTZxVQY=; b=C1l+doVW4Na8SuxP0d6cmib54/YZgR4ux7aehJBmD0Kz5VEkcw1XTAJqJjwvP/dIPA PLQX5/oDtxTDEZC6h4H1hXerPtpBC8e59wxnwSOv033Ah4k+IemgG3SDosZIL/5Xs48E +PgPfoJN4qWLEycf/Sd7IaucwL58BGivxO6edzzHIa3JgTABtMEPjENodWw2rpoRh6Qz o2gXpUKiXGUN+j8stHus/aMzCbZNl+dDj1Il5NkaBhZ8dA3CLgvUTB+VHcIH9ediUeF6 Kjup+9sHQszAtyVi1Px1wjqesQqjAB0eP0QPafSdlLgSB+9weaw6c+mIaFrqENVnRm0a 6L+g== X-Gm-Message-State: APjAAAXeTv8AkB1ccKytrB3ErdTBmaqz4SZUfhImzCZ730dIvcD9hTmH NiKeTQ2uCQQNtPIBnv9dpCjUJZYY X-Google-Smtp-Source: APXvYqzEdqkVBJTcQRLXH0WBaiH/nHnMkHFpnK2HUzrYkIE3x4cVJUWys9DHMjmI3l9cdyeG1q3BeA== X-Received: by 2002:a1c:720e:: with SMTP id n14mr27715900wmc.54.1567438450739; Mon, 02 Sep 2019 08:34:10 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.34.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:34:10 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:33:12 +0200 Message-Id: <20190902153333.11190-28-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/patches/guile-gcrypt-fix-cross-compilation.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/gnupg.scm (guile-gcrypt)[source]: Apply previous patch, [native-inputs]: add guile, [arguments]: add libgcrypt-config to PATH when cross-compiling. --- gnu/local.mk | 1 + gnu/packages/gnupg.scm | 22 +- .../guile-gcrypt-fix-cross-compilation.patch | 431 ++++++++++++++++++ 3 files changed, 452 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/guile-gcrypt-fix-cross-compilation.patch diff --git a/gnu/local.mk b/gnu/local.mk index 2cf92e4478..bc31682035 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -928,6 +928,7 @@ dist_patch_DATA = \ %D%/packages/patches/guile-relocatable.patch \ %D%/packages/patches/guile-rsvg-pkgconfig.patch \ %D%/packages/patches/guile-emacs-fix-configure.patch \ + %D%/packages/patches/guile-gcrypt-fix-cross-compilation.patch \ %D%/packages/patches/guile-sqlite3-fix-cross-compilation.patch \ %D%/packages/patches/gstreamer-buffer-reset-offset.patch \ %D%/packages/patches/gtk2-respect-GUIX_GTK2_PATH.patch \ diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index c7e6aabf79..69da60b972 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2017 Petter ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Marius Bakke +;;; Copyright © 2018 Björn Höfling ;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. @@ -477,13 +478,30 @@ gpgpme starting with version 1.7.") (sha256 (base32 "1lhgh3105yi0ggrjsjibv4wp1ipz8s17pa820hk2wln3rc04wpvf")) - (file-name (string-append name "-" version "-checkout")))) + (file-name (string-append name "-" version "-checkout")) + (patches + (search-patches "guile-gcrypt-fix-cross-compilation.patch")))) (build-system gnu-build-system) + (arguments + ;; When cross-compiling, the bash script libgcrypt-config provided by + ;; libgcrypt must be accessible during configure phase. + `(,@(if (%current-target-system) + '(#:phases + (modify-phases %standard-phases + (add-before 'configure 'add-libgrypt-config + (lambda _ + (setenv "PATH" (string-append + (assoc-ref %build-inputs "libgcrypt") + "/bin:" + (getenv "PATH"))) + #t)))) + '()))) (native-inputs `(("pkg-config" ,pkg-config) ("autoconf" ,autoconf) ("automake" ,automake) - ("texinfo" ,texinfo))) + ("texinfo" ,texinfo) + ("guile" ,guile-2.2))) (inputs `(("guile" ,guile-2.2) ("libgcrypt" ,libgcrypt))) diff --git a/gnu/packages/patches/guile-gcrypt-fix-cross-compilation.patch b/gnu/packages/patches/guile-gcrypt-fix-cross-compilation.patch new file mode 100644 index 0000000000..cdf15b39b0 --- /dev/null +++ b/gnu/packages/patches/guile-gcrypt-fix-cross-compilation.patch @@ -0,0 +1,431 @@ +From 4ec6cb5209461452f7ebb0aae3ae916e28198dc9 Mon Sep 17 00:00:00 2001 +From: Mathieu Othacehe +Date: Sun, 18 Aug 2019 09:42:39 +0200 +Subject: [PATCH] build: Fix cross-compilation. + +--- + Makefile.am | 2 +- + configure.ac | 7 ++++++- + gcrypt/common.scm | 42 ++++++++++++++++++++++++++++-------------- + gcrypt/hash.scm | 28 +++++++++++----------------- + gcrypt/hmac.scm | 40 +++++++++++++++++++--------------------- + gcrypt/pk-crypto.scm | 41 ++++++++++++++++++----------------------- + gcrypt/random.scm | 7 ++++--- + 7 files changed, 87 insertions(+), 80 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 0537256..7a3d1b2 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -39,7 +39,7 @@ $(guile_install_go_files): install-nobase_modDATA + GUILE_WARNINGS = -Wunbound-variable -Warity-mismatch -Wformat + SUFFIXES = .scm .go + .scm.go: +- $(AM_V_GEN)$(top_builddir)/pre-inst-env $(GUILE_TOOLS) compile $(GUILE_WARNINGS) -o "$@" "$<" ++ $(AM_V_GEN)$(top_builddir)/pre-inst-env $(GUILE_TOOLS) compile $(GUILE_TARGET) $(GUILE_WARNINGS) -o "$@" "$<" + + moddir=$(prefix)/share/guile/site/$(GUILE_EFFECTIVE_VERSION) + godir = $(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/site-ccache +diff --git a/configure.ac b/configure.ac +index e7ef6cf..7d0f569 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -73,6 +73,11 @@ AC_SUBST([LIBGCRYPT]) + AC_SUBST([LIBGCRYPT_PREFIX]) + AC_SUBST([LIBGCRYPT_LIBDIR]) + +-GUIX_ASSERT_LIBGCRYPT_USABLE ++if test "$cross_compiling" = "no"; then ++ GUIX_ASSERT_LIBGCRYPT_USABLE ++else ++ GUILE_TARGET="--target=$host_alias" ++ AC_SUBST([GUILE_TARGET]) ++fi + + AC_OUTPUT +diff --git a/gcrypt/common.scm b/gcrypt/common.scm +index 189003f..a42f609 100644 +--- a/gcrypt/common.scm ++++ b/gcrypt/common.scm +@@ -21,7 +21,8 @@ + #:use-module (system foreign) + #:use-module (ice-9 match) + #:export (gcrypt-version +- libgcrypt-func ++ libgcrypt->pointer ++ libgcrypt->procedure + error-source error-string)) + + ;;; Commentary: +@@ -31,34 +32,47 @@ + ;;; + ;;; Code: + +-(define libgcrypt-func +- (let ((lib (dynamic-link %libgcrypt))) +- (lambda (func) +- "Return a pointer to symbol FUNC in libgcrypt." +- (dynamic-func func lib)))) ++(define (libgcrypt->pointer name) ++ "Return a pointer to symbol FUNC in libgcrypt." ++ (catch #t ++ (lambda () ++ (dynamic-func name (dynamic-link %libgcrypt))) ++ (lambda args ++ (lambda _ ++ (throw 'system-error name "~A" (list (strerror ENOSYS)) ++ (list ENOSYS)))))) ++ ++(define (libgcrypt->procedure return name params) ++ "Return a pointer to symbol FUNC in libgcrypt." ++ (catch #t ++ (lambda () ++ (let ((ptr (dynamic-func name (dynamic-link %libgcrypt)))) ++ ;; The #:return-errno? facility was introduced in Guile 2.0.12. ++ (pointer->procedure return ptr params ++ #:return-errno? #t))) ++ (lambda args ++ (lambda _ ++ (throw 'system-error name "~A" (list (strerror ENOSYS)) ++ (list ENOSYS)))))) + + (define gcrypt-version + ;; According to the manual, this function must be called before any other, + ;; and it's not clear whether it can be called more than once. So call it + ;; right here from the top level. +- (let* ((ptr (libgcrypt-func "gcry_check_version")) +- (proc (pointer->procedure '* ptr '(*))) +- (version (pointer->string (proc %null-pointer)))) ++ (let ((proc (libgcrypt->procedure '* "gcry_check_version" '(*)))) + (lambda () + "Return the version number of libgcrypt as a string." +- version))) ++ (pointer->string (proc %null-pointer))))) + + (define error-source +- (let* ((ptr (libgcrypt-func "gcry_strsource")) +- (proc (pointer->procedure '* ptr (list int)))) ++ (let ((proc (libgcrypt->procedure '* "gcry_strsource" (list int)))) + (lambda (err) + "Return the error source (a string) for ERR, an error code as thrown + along with 'gcry-error'." + (pointer->string (proc err))))) + + (define error-string +- (let* ((ptr (libgcrypt-func "gcry_strerror")) +- (proc (pointer->procedure '* ptr (list int)))) ++ (let ((proc (libgcrypt->procedure '* "gcry_strerror" (list int)))) + (lambda (err) + "Return the error description (a string) for ERR, an error code as + thrown along with 'gcry-error'." +diff --git a/gcrypt/hash.scm b/gcrypt/hash.scm +index dad06e4..1b3fa67 100644 +--- a/gcrypt/hash.scm ++++ b/gcrypt/hash.scm +@@ -50,13 +50,13 @@ + (identifier-syntax 2)) + + (define bytevector-hash +- (let ((hash (pointer->procedure void +- (libgcrypt-func "gcry_md_hash_buffer") +- `(,int * * ,size_t)))) ++ (let ((proc (libgcrypt->procedure void ++ "gcry_md_hash_buffer" ++ `(,int * * ,size_t)))) + (lambda (bv type size) + "Return the hash TYPE, of SIZE bytes, of BV as a bytevector." + (let ((digest (make-bytevector size))) +- (hash type (bytevector->pointer digest) ++ (proc type (bytevector->pointer digest) + (bytevector->pointer bv) (bytevector-length bv)) + digest)))) + +@@ -67,30 +67,24 @@ + (cut bytevector-hash <> GCRY_MD_SHA256 (/ 256 8))) + + (define open-sha256-md +- (let ((open (pointer->procedure int +- (libgcrypt-func "gcry_md_open") +- `(* ,int ,unsigned-int)))) ++ (let ((proc (libgcrypt->procedure int ++ "gcry_md_open" ++ `(* ,int ,unsigned-int)))) + (lambda () + (let* ((md (bytevector->pointer (make-bytevector (sizeof '*)))) +- (err (open md GCRY_MD_SHA256 0))) ++ (err (proc md GCRY_MD_SHA256 0))) + (if (zero? err) + (dereference-pointer md) + (throw 'gcrypt-error err)))))) + + (define md-write +- (pointer->procedure void +- (libgcrypt-func "gcry_md_write") +- `(* * ,size_t))) ++ (libgcrypt->procedure void "gcry_md_write" `(* * ,size_t))) + + (define md-read +- (pointer->procedure '* +- (libgcrypt-func "gcry_md_read") +- `(* ,int))) ++ (libgcrypt->procedure '* "gcry_md_read" `(* ,int))) + + (define md-close +- (pointer->procedure void +- (libgcrypt-func "gcry_md_close") +- '(*))) ++ (libgcrypt->procedure void "gcry_md_close" '(*))) + + + (define (open-sha256-port) +diff --git a/gcrypt/hmac.scm b/gcrypt/hmac.scm +index 0d8cc61..b9e1a9e 100644 +--- a/gcrypt/hmac.scm ++++ b/gcrypt/hmac.scm +@@ -42,11 +42,11 @@ + (format port "#" + (pointer-address (mac->pointer mac))))) + +- + (define %gcry-mac-open +- (pointer->procedure int (libgcrypt-func "gcry_mac_open") +- `(* ,int ,unsigned-int *))) ; gcry_mac_hd_t *HD, int ALGO, +- ; unsigned int FLAGS, gcry_ctx_t CTX ++ (libgcrypt->procedure int "gcry_mac_open" ++ ;; gcry_mac_hd_t *HD, int ALGO, ++ ;; unsigned int FLAGS, gcry_ctx_t CTX ++ `(* ,int ,unsigned-int *))) + + (define mac-algorithms-mapping + (alist->hashq-table +@@ -59,9 +59,8 @@ + (hashq-ref mac-algorithms-mapping sym)) + + (define mac-algo-maclen +- (let ((proc (pointer->procedure +- int (libgcrypt-func "gcry_mac_get_algo_maclen") +- `(,int)))) ++ (let ((proc (libgcrypt->procedure ++ int "gcry_mac_get_algo_maclen" `(,int)))) + (lambda (sym) + "Get expected length in bytes of mac yielded by algorithm SYM" + (proc (mac-algo-ref sym))))) +@@ -76,8 +75,7 @@ + (throw 'gcry-error 'mac-open err)))) + + (define %gcry-mac-setkey +- (pointer->procedure int (libgcrypt-func "gcry_mac_setkey") +- `(* * ,size_t))) ++ (libgcrypt->procedure int "gcry_mac_setkey" `(* * ,size_t))) + + (define (mac-setkey mac key) + "Set the KEY on object MAC +@@ -96,9 +94,9 @@ In our case, KEY is either a string or a bytevector." + (throw 'gcry-error 'mac-setkey err)))) + + (define mac-close +- (let ((proc (pointer->procedure +- void (libgcrypt-func "gcry_mac_close") +- '(*)))) ; gcry_mac_hd_t H ++ (let ((proc (libgcrypt->procedure void ++ "gcry_mac_close" ++ '(*)))) ; gcry_mac_hd_t H + (lambda (mac) + "Release all resources of MAC. + +@@ -106,9 +104,9 @@ Running this on an already closed might segfault :)" + (proc (mac->pointer mac))))) + + (define mac-write +- (let ((proc (pointer->procedure +- int (libgcrypt-func "gcry_mac_write") +- `(* * ,size_t)))) ++ (let ((proc (libgcrypt->procedure int ++ "gcry_mac_write" ++ `(* * ,size_t)))) + (lambda (mac obj) + "Writes string or bytevector OBJ to MAC" + (let* ((bv (match obj +@@ -124,9 +122,9 @@ Running this on an already closed might segfault :)" + (throw 'gcry-error 'mac-write err)))))) + + (define mac-read +- (let ((proc (pointer->procedure +- int (libgcrypt-func "gcry_mac_read") +- `(* * *)))) ++ (let ((proc (libgcrypt->procedure int ++ "gcry_mac_read" ++ `(* * *)))) + (lambda (mac algorithm) + "Get bytevector representing result of MAC's written, signed data" + (define (int-bv* n) +@@ -148,9 +146,9 @@ Running this on an already closed might segfault :)" + ;; rather than the gcry_error_t type. + + (define mac-verify +- (let ((proc (pointer->procedure +- int (libgcrypt-func "gcry_mac_verify") +- `(* * ,size_t)))) ++ (let ((proc (libgcrypt->procedure int ++ "gcry_mac_verify" ++ `(* * ,size_t)))) + (lambda (mac bv) + "Verify that BV matches result calculated in MAC + +diff --git a/gcrypt/pk-crypto.scm b/gcrypt/pk-crypto.scm +index be664a3..5d614a0 100644 +--- a/gcrypt/pk-crypto.scm ++++ b/gcrypt/pk-crypto.scm +@@ -81,7 +81,7 @@ + 16)))) + + (define finalize-canonical-sexp! +- (libgcrypt-func "gcry_sexp_release")) ++ (libgcrypt->pointer "gcry_sexp_release")) + + (define-inlinable (pointer->canonical-sexp ptr) + "Return a that wraps PTR." +@@ -96,8 +96,9 @@ + sexp)) + + (define string->canonical-sexp +- (let* ((ptr (libgcrypt-func "gcry_sexp_new")) +- (proc (pointer->procedure int ptr `(* * ,size_t ,int)))) ++ (let ((proc (libgcrypt->procedure int ++ "gcry_sexp_new" ++ `(* * ,size_t ,int)))) + (lambda (str) + "Parse STR and return the corresponding gcrypt s-expression." + +@@ -115,8 +116,9 @@ + (identifier-syntax 3)) + + (define canonical-sexp->string +- (let* ((ptr (libgcrypt-func "gcry_sexp_sprint")) +- (proc (pointer->procedure size_t ptr `(* ,int * ,size_t)))) ++ (let ((proc (libgcrypt->procedure size_t ++ "gcry_sexp_sprint" ++ `(* ,int * ,size_t)))) + (lambda (sexp) + "Return a textual representation of SEXP." + (let loop ((len 1024)) +@@ -134,8 +136,7 @@ + read-string))) + + (define canonical-sexp-car +- (let* ((ptr (libgcrypt-func "gcry_sexp_car")) +- (proc (pointer->procedure '* ptr '(*)))) ++ (let ((proc (libgcrypt->procedure '* "gcry_sexp_car" '(*)))) + (lambda (lst) + "Return the first element of LST, an sexp, if that element is a list; + return #f if LST or its first element is not a list (this is different from +@@ -146,8 +147,7 @@ the usual Lisp 'car'.)" + (pointer->canonical-sexp result)))))) + + (define canonical-sexp-cdr +- (let* ((ptr (libgcrypt-func "gcry_sexp_cdr")) +- (proc (pointer->procedure '* ptr '(*)))) ++ (let ((proc (libgcrypt->procedure '* "gcry_sexp_cdr" '(*)))) + (lambda (lst) + "Return the tail of LST, an sexp, or #f if LST is not a list." + (let ((result (proc (canonical-sexp->pointer lst)))) +@@ -156,8 +156,7 @@ the usual Lisp 'car'.)" + (pointer->canonical-sexp result)))))) + + (define canonical-sexp-nth +- (let* ((ptr (libgcrypt-func "gcry_sexp_nth")) +- (proc (pointer->procedure '* ptr `(* ,int)))) ++ (let ((proc (libgcrypt->procedure '* "gcry_sexp_nth" `(* ,int)))) + (lambda (lst index) + "Return the INDEXth nested element of LST, an s-expression. Return #f + if that element does not exist, or if it's an atom. (Note: this is obviously +@@ -174,8 +173,7 @@ different from Scheme's 'list-ref'.)" + (sizeof size_t))) + + (define canonical-sexp-length +- (let* ((ptr (libgcrypt-func "gcry_sexp_length")) +- (proc (pointer->procedure int ptr '(*)))) ++ (let ((proc (libgcrypt->procedure int "gcry_sexp_length" '(*)))) + (lambda (sexp) + "Return the length of SEXP if it's a list (including the empty list); + return zero if SEXP is an atom." +@@ -194,8 +192,7 @@ return zero if SEXP is an atom." + (not (char-set-contains? char-set:digit (string-ref str 0))))))) + + (define canonical-sexp-nth-data +- (let* ((ptr (libgcrypt-func "gcry_sexp_nth_data")) +- (proc (pointer->procedure '* ptr `(* ,int *)))) ++ (let ((proc (libgcrypt->procedure '* "gcry_sexp_nth_data" `(* ,int *)))) + (lambda (lst index) + "Return as a symbol (for \"sexp tokens\") or a bytevector (for any other + \"octet string\") the INDEXth data element (atom) of LST, an s-expression. +@@ -266,8 +263,7 @@ Return #f if DATA does not conform." + (values #f #f)))) + + (define sign +- (let* ((ptr (libgcrypt-func "gcry_pk_sign")) +- (proc (pointer->procedure int ptr '(* * *)))) ++ (let ((proc (libgcrypt->procedure int "gcry_pk_sign" '(* * *)))) + (lambda (data secret-key) + "Sign DATA, a canonical s-expression representing a suitable hash, with + SECRET-KEY (a canonical s-expression whose car is 'private-key'.) Note that +@@ -281,8 +277,7 @@ DATA must be a 'data' s-expression, as returned by + (throw 'gcry-error 'sign err)))))) + + (define verify +- (let* ((ptr (libgcrypt-func "gcry_pk_verify")) +- (proc (pointer->procedure int ptr '(* * *)))) ++ (let ((proc (libgcrypt->procedure int "gcry_pk_verify" '(* * *)))) + (lambda (signature data public-key) + "Verify that SIGNATURE is a signature of DATA with PUBLIC-KEY, all of + which are gcrypt s-expressions." +@@ -291,8 +286,7 @@ which are gcrypt s-expressions." + (canonical-sexp->pointer public-key)))))) + + (define generate-key +- (let* ((ptr (libgcrypt-func "gcry_pk_genkey")) +- (proc (pointer->procedure int ptr '(* *)))) ++ (let ((proc (libgcrypt->procedure int "gcry_pk_genkey" '(* *)))) + (lambda (params) + "Return as an s-expression a new key pair for PARAMS. PARAMS must be an + s-expression like: (genkey (rsa (nbits 4:2048)))." +@@ -303,8 +297,9 @@ s-expression like: (genkey (rsa (nbits 4:2048)))." + (throw 'gcry-error 'generate-key err)))))) + + (define find-sexp-token +- (let* ((ptr (libgcrypt-func "gcry_sexp_find_token")) +- (proc (pointer->procedure '* ptr `(* * ,size_t)))) ++ (let ((proc (libgcrypt->procedure '* ++ "gcry_sexp_find_token" ++ `(* * ,size_t)))) + (lambda (sexp token) + "Find in SEXP the first element whose 'car' is TOKEN and return it; + return #f if not found." +diff --git a/gcrypt/random.scm b/gcrypt/random.scm +index 5391f94..ea6f9d3 100644 +--- a/gcrypt/random.scm ++++ b/gcrypt/random.scm +@@ -33,7 +33,8 @@ + (define %gcry-very-strong-random 2) + + (define %gcry-randomize +- (pointer->procedure void (libgcrypt-func "gcry_randomize") ++ (libgcrypt->procedure void ++ "gcry_randomize" + `(* ,size_t ,int))) ; buffer, length, level + + (define* (gen-random-bv #:optional (bv-length 50) +@@ -44,8 +45,8 @@ + bv)) + + (define %gcry-create-nonce +- (pointer->procedure void (libgcrypt-func "gcry_create_nonce") +- `(* ,size_t))) ; buffer, length ++ (libgcrypt->procedure void "gcry_create_nonce" ++ `(* ,size_t))) ; buffer, length + + + (define* (gen-random-nonce #:optional (bv-length 50)) +-- +2.20.1 + From patchwork Mon Sep 2 15:33:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15260 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 D45B71734D; Mon, 2 Sep 2019 16:38:44 +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 5F19517329 for ; Mon, 2 Sep 2019 16:38:44 +0100 (BST) Received: from localhost ([::1]:37684 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oPj-000602-T9 for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:38:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42656) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oMH-0002GV-Sn for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4oMG-0004RZ-BE for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50033) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oMG-0004Qc-6V for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oMG-0006dX-23 for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 28/48] gnu: libtool: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Sep 2019 15:35:08 +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.156743847325183 (code B ref 36477); Mon, 02 Sep 2019 15:35:08 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:34:33 +0000 Received: from localhost ([127.0.0.1]:58788 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLh-0006Xn-8d for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:33 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:33295) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLR-0006Tj-Aj for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:18 -0400 Received: by mail-wm1-f68.google.com with SMTP id r17so12227703wme.0 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:34:17 -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=6rgnidP1c1WnyztbQAYAHBDpHNviswxFnrUVkVp3c9U=; b=Js9rjFKUm+pHIRuCPgFIPt8bdaAk9E8o51NNKm1pkZJG7KrovwdaOSqSynQwEfn/EA WxkNoHdZUTXOj+AeWVKr1hzOQIzj7Vq6mEuHi9Fo/bl9phft4KJKs0Cfw7lM0PXD+RLT /Azy3yzYw/TaYKXH++kcjxGreEe2D/GzRTJLbxIdopNQLtgUA/6gWIhBVg1GQw5Yvi23 kShxIBLky2jy3c/15FqVY06pd0wPZ6vWhSbVgsz2eMjl3ufYk6GtDB+Pb8efdESie9Hv AogEvvesj+0eGlVHYNXhpjvbd8b4XfSrhrRMpmjo0TQt149M6Ui5ctpFvGv7GBe/8S74 nSYQ== 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=6rgnidP1c1WnyztbQAYAHBDpHNviswxFnrUVkVp3c9U=; b=W1g5KOQe9qNo+rqKr0a5PiolyOvKW+tWfTLwWTVYUtb7ImxnCC89C2lQkXdKLKwCtX 9RTLL3da+HyDKep7C3OPvbWCj/uZMbZJg4SOlScBYKQ+HhIThZmPCw1w9CPY1bU+PG2E O4tth1en9bCUrBscuylwxqXW1uOutFOz/WjkUrpMnGnfldl0Og0kRwvZrcTf3LYZxfju cz/OQT3dcy5k10k3XF+79qQLB5sVjeEx/g5aS6QMinXcOcbIkdeMfKm50NI27avjNdB8 Ki/h4ObwqN+yk8KwPNDeCrElEY66EBJiAAC+q3VaLb91pjBGKC8A1BNb1DKSoj9bZP+I K9oA== X-Gm-Message-State: APjAAAWYg0DtHbxHFrq36K3wJkwRj0iyjOLTdrfFpsW3d8V9PYae5h9J 2H35t/uOLohx26AdkpROyX42Q8lp X-Google-Smtp-Source: APXvYqxIJjzI95JG4X1FoEfb/M9AGGJwW62dSrwytdN36Wh10tJ4jjOioe7ok7778mlVxmo0RdqGFQ== X-Received: by 2002:a1c:9a46:: with SMTP id c67mr8143431wme.115.1567438451613; Mon, 02 Sep 2019 08:34:11 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.34.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:34:11 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:33:13 +0200 Message-Id: <20190902153333.11190-29-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: Pierre-Moana Levesque Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From: Pierre-Moana Levesque * gnu/packages/autotools.scm (libtool)[arguments]: Do not run tests and use bash from native-inputs when cross-compiling. --- gnu/packages/autotools.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm index ceb70dfee7..98f31f6bca 100644 --- a/gnu/packages/autotools.scm +++ b/gnu/packages/autotools.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2017, 2019 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Ricardo Wurmus +;;; Copyright © 2019 Pierre-Moana Levesque ;;; ;;; This file is part of GNU Guix. ;;; @@ -354,21 +355,22 @@ Makefile, simplifying the entire process for the developer.") ;; XXX: There are test failures on mips64el-linux starting from 2.4.4: ;; . - #:tests? ,(not (string-prefix? "mips64" - (or (%current-target-system) + ;; Also, do not run tests when cross compiling + #:tests? ,(not (or (%current-target-system) + (string-prefix? "mips64" (%current-system)))) #:phases (modify-phases %standard-phases (add-before 'check 'pre-check - (lambda* (#:key inputs #:allow-other-keys) + (lambda* (#:key inputs native-inputs #:allow-other-keys) ;; Run the test suite in parallel, if possible. (setenv "TESTSUITEFLAGS" (string-append "-j" (number->string (parallel-job-count)))) ;; Patch references to /bin/sh. - (let ((bash (assoc-ref inputs "bash"))) + (let ((bash (assoc-ref (or native-inputs inputs) "bash"))) (substitute* "tests/testsuite" (("/bin/sh") (string-append bash "/bin/sh"))) From patchwork Mon Sep 2 15:33:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15237 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 EDCAE1734D; Mon, 2 Sep 2019 16:36:23 +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 AD61A17329 for ; Mon, 2 Sep 2019 16:36:23 +0100 (BST) Received: from localhost ([::1]:37612 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oNS-0003FK-V5 for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:36:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42687) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oMJ-0002IR-Aa for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4oMH-0004UO-07 for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50034) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oMG-0004T3-OM for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oMG-0006de-KL for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 29/48] gnu: texinfo-4: Fix cross compilation Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Sep 2019 15:35:08 +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.156743847425194 (code B ref 36477); Mon, 02 Sep 2019 15:35:08 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:34:34 +0000 Received: from localhost ([127.0.0.1]:58792 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLh-0006Y5-Pj for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:34 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:51474) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLS-0006Tn-9P for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:19 -0400 Received: by mail-wm1-f65.google.com with SMTP id k1so15053906wmi.1 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:34:18 -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=D5OnrboWQ1nkSf8HkR5A2ChVg84h8Cq2BRx6QZNx8RU=; b=haceCxKwXF6xtHbM7oz9BvTa9PAna8xjqavpQR6n0gEyVIlJhld1SBX86vUUniMTzW SKuoU1s2TNatW1bpk0RVV/F/RV9HZ9qsU2O0NBkjhCHrzidq/mRRDLPX11glYVd8SlXu TOBHmUV1Wx4FM+xdtaCaMuaLB3F1mAmTyQ+/am9DVFHxwgNCDwgEbc/ncracfDAlKgt3 nAc2rcCzszzYDbrjjSsl4r9iRX8oXpqf3An47w8+qdUARdxEsxmDH+joHWNQDylBBWYK nUemTc8B2Wz++yHlnwUfuAx/80jpe7HTUnVzHBTPGK2DpKpAwXqRW9mEPHkttP4ht5uK 0hqw== 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=D5OnrboWQ1nkSf8HkR5A2ChVg84h8Cq2BRx6QZNx8RU=; b=MqmuVsrWvYBGce5YmVg5ldxNR7vplyOXAQMyIXRys3ROKlyolhJkILHcL9bljPW4X4 uO0zEMLGmQMR4/QFLD/41GRQLm98pQg/PQOG5EhJ73K/c4393cy1giAeyncuE0LJbVkN ZKOaYt7q70zStP+fFJFxHayv2KIUz+hIpMbrKGXElWD3tm0Wu6NLSXDSMPVNMyzWNEZq r8+9js5IEo80KvechyJSE1bv7FwHtB44FxFyC2bgmV5Iw8uJBaIXjRinDtRTFagGXbnt ZVXLtNcsNi56W4qBoNuO3rHm05QyUOF6594+ehelIuo7zPxfmCYJ4TGs3abN3FqabrzH e3Sw== X-Gm-Message-State: APjAAAWa/+iex0792hVLxiDNcm4kfvTvmgBZYo7Tdw1lmVRSOoSPqQeb mbfK51qUpHEAT10ygAv6OkYSggMa X-Google-Smtp-Source: APXvYqz1FoIRCXhPtz1gJxn03x/nsvy8oIGlejnJfYfd0X1o0a2GgLNWd+QFmzFSabPBasrNJ5yALw== X-Received: by 2002:a7b:cf0a:: with SMTP id l10mr5052761wmg.4.1567438452595; Mon, 02 Sep 2019 08:34:12 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.34.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:34:12 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:33:14 +0200 Message-Id: <20190902153333.11190-30-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: Pierre-Moana Levesque Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From: Pierre-Moana Levesque * gnu/packages/texinfo.scm (texinfo-4)[native-inputs]: Add automake and native-inputs from texinfo package, [arguments]: Replace outdated config.sub and config.guess by the ones taken from automake above. Also make sure native tools are built before build phase. --- gnu/packages/texinfo.scm | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index 19f87a4de9..fde1a12a91 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -21,9 +21,11 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages texinfo) + #:use-module (gnu packages autotools) #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (gnu packages) #:use-module (gnu packages compression) @@ -106,8 +108,37 @@ is on expressing the content semantically, avoiding physical markup commands.") (sha256 (base32 "1rf9ckpqwixj65bw469i634897xwlgkm5i9g2hv3avl6mv7b0a3d")))) - (native-inputs '()) - (inputs `(("ncurses" ,ncurses) ("xz" ,xz))))) + (inputs `(("ncurses" ,ncurses) + ("xz" ,xz))) + (native-inputs + `(("automake" ,automake) + ,@(package-native-inputs texinfo))) + (arguments + (substitute-keyword-arguments (package-arguments texinfo) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'fix-configure + (lambda* (#:key inputs native-inputs #:allow-other-keys) + ;; Replace outdated config.sub and config.guess. + (with-directory-excursion "build-aux" + (for-each + (lambda (file) + (install-file (string-append + (assoc-ref + (or native-inputs inputs) "automake") + "/share/automake-" + ,(version-major+minor + (package-version automake)) + "/" file) ".")) + '("config.sub" "config.guess"))) + #t)) + ;; Build native version of tools before running 'build phase. + ,@(if (%current-target-system) + `((add-before 'build 'make-native-gnu-lib + (lambda* (#:key inputs #:allow-other-keys) + (invoke "make" "-C" "tools/gnulib/lib") + #t))) + '()))))))) (define-public info-reader ;; The idea of this package is to have the standalone Info reader without From patchwork Mon Sep 2 15:33:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15263 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 350691734D; Mon, 2 Sep 2019 16:38:56 +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 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 022B017329 for ; Mon, 2 Sep 2019 16:38:56 +0100 (BST) Received: from localhost ([::1]:37692 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oPu-0006Cs-GM for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:38:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42675) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oMI-0002HV-It for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4oMH-0004Wo-CH for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50035) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oMH-0004Va-7m for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oMH-0006dm-4g for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 30/48] packages: Set outputs field as thunked. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Sep 2019 15:35:09 +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.156743847425201 (code B ref 36477); Mon, 02 Sep 2019 15:35:09 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:34:34 +0000 Received: from localhost ([127.0.0.1]:58794 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLi-0006YJ-6X for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:34 -0400 Received: from mail-wm1-f49.google.com ([209.85.128.49]:35793) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLT-0006Tp-At for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:19 -0400 Received: by mail-wm1-f49.google.com with SMTP id n10so4387245wmj.0 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:34:19 -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=BdPZS6mt/3o0dctz9JlOGfKDFh4tjhphGSATVcB7Hlk=; b=PYm3PD1CjqwDD8gdrrhnVL3uIB8a6N+DPOkr79nSW1LtOuStnkphOfV4lfmSxVhA2b HSIZYhn9l4CAzeWjuMHb8T7UASrdJYr3s/+4eOj0l2tzggMmA1TOJ6Wa6w8x0ZdnrQYx lY3GMlf1fBhngA5QSbOaQo0ePeka891m3T2iwIlO7E3ttm0K3nn3Qe7/zxkNagnSTTi9 T4taL2yTfb189DMvNPI7zzeYOBK4uQko2laEE9JBHZNuGVg7POBqQWrnI5ZP+wp52fMQ uQ/y1nqidwtzhHvANfgcBrBp7SBHNxlR5Ng387PvZznZRqJIdDPE6QLHEuDT69Y0IjzN 1lVg== 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=BdPZS6mt/3o0dctz9JlOGfKDFh4tjhphGSATVcB7Hlk=; b=M3OfYhhZoyru9zQMJgWRIILiXYP7IO5t8HITt+Z/kuTQYW6cCOcVuyvZqWeGj5qCFl FxT+MSfqd0mT+WBBp6SUdKSbdwlS2x56tgvlelA9yDGHDzdm7rRC/v4X641OsvvDQ27h eStyvPaR0MS3hHPtfEwYnc55RvsFIOg5JPbCf6SJ4F5Ppu0mSMNbl0SCmozjN/GP6NZM //nsN++CEWNaxmxrL30R1oQmX/wxP62jnuaskkkLKNA07mNEKbkON9I+X/pdEU3Wt9Ht SbZV1/og5CGFZuaTBchwkUtr8iK8XQgTAGWXW8VG5FsKhhRaLyGPCboTverORHiZaqyf CSnA== X-Gm-Message-State: APjAAAVUmdQFiZjjQ4Q6ArdsCFAlXl1w1l7aNDsNiVvLLPS3R/SfK0Ms jQGw0sC97JCCWZYIddGZTxwPML6f X-Google-Smtp-Source: APXvYqy/VSLEzgH3iAU1wpdZ1/XKIccI4ytHkLOBXm1yVHfXIR0RkLBhTf3W5TJ3kLrF8nizmGvz2g== X-Received: by 2002:a7b:c0d4:: with SMTP id s20mr8637421wmh.110.1567438453546; Mon, 02 Sep 2019 08:34:13 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.34.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:34:13 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:33:15 +0200 Message-Id: <20190902153333.11190-31-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 This allows for instance to use %current-target-system to enable/disable some outputs in a package. * guix/packages.scm (): Set outputs field as thunked, (package->bag): adapt make-bag call accordingly. --- guix/packages.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guix/packages.scm b/guix/packages.scm index ac965acd2f..6889dbf116 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -266,7 +266,7 @@ name of its URI." (default '()) (thunked)) (outputs package-outputs ; list of strings - (default '("out"))) + (default '("out")) (thunked)) ; lists of ; , @@ -1046,7 +1046,7 @@ and return it." #:source source #:inputs (append (inputs self) (propagated-inputs self)) - #:outputs outputs + #:outputs (outputs self) #:native-inputs (native-inputs self) #:arguments (args self)) (raise (if target From patchwork Mon Sep 2 15:33:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15236 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 22F371734D; Mon, 2 Sep 2019 16:36:23 +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 CC83E17329 for ; Mon, 2 Sep 2019 16:36:22 +0100 (BST) Received: from localhost ([::1]:37616 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oNS-0003Kq-Ah for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:36:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42718) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oMK-0002Jt-RT for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4oMJ-0004ct-AU for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50039) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oMJ-0004cV-7r for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oMJ-0006eI-4u for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 31/48] gnu: libnl: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Sep 2019 15:35:11 +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.156743848125262 (code B ref 36477); Mon, 02 Sep 2019 15:35:11 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:34:41 +0000 Received: from localhost ([127.0.0.1]:58807 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLp-0006ZH-1W for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:41 -0400 Received: from mail-wr1-f50.google.com ([209.85.221.50]:36990) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLU-0006Ty-B0 for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:23 -0400 Received: by mail-wr1-f50.google.com with SMTP id z11so14454017wrt.4 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:34:20 -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=0+GuQDDI58k33AT968scC+piSTN9/sNYcscllq3AvvI=; b=ldwGYlyrhlEpwefKrEWwfqafG7Bf/5eHElk4/dmT2GWHZRG0DCYIRguRuWpPU+2Ovb 35cNIEYS9xAzipcoldrzo1QBM0Z3eB4UZbjTTau+rp5qfl3HjnytTA97sEgHnwcpN66I Fbb2UXZ8fuxexNEtbZWn/9Y2iZCeGrYVI7WRtp0Fd6AQda1ekI2UwfeGlZ6CZ3ERdyCY j1M6DGUH/WgtIndwje4tohuaad31kIJZbSqdEACROnonLk6lKHjSbsuZpH2PHQR4dohK mI3hi4hgTekLrp9zm3p86r8tWEfvtO0WHY7bIzsS0NN3nWkHoK/4dLM/pzA4i8IMKfvg SVDA== 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=0+GuQDDI58k33AT968scC+piSTN9/sNYcscllq3AvvI=; b=l3rYM19NADds4C+Y9N2pBA/pZssH05SdYcGN4q99rnNCinwXtJR0m83Nq8IdCDh5XI cWx1EZeXYmn/ZC8GawtzHYqXVdBz2ef+vN3P8HW30RrUhpCtLrqXRtlucNbN2DTI0q1a /KgN9PoBwXnDx46e4YNiHG+4TTmJwymHVqug8OPliiT7IEVjgBFB35ZyoKHoBjJumXPH FbINEQrmc8XKFbDB2DlpTjgnLk6orezGWtPPNu5VJzsThQEJbof9vDcRxVaB7jY3+ics WXdbCeKUvfLq2f0+BGgb/wU1yhdswIzQAVsmzIt+r+/FglCJB/9PdVUGc9AgxqpphrrX RwrA== X-Gm-Message-State: APjAAAWRBf7HGmj3QAQWxpgAxWLpxsT1At206HCi9y1WET2BnbHpBghz mDHV0Hq/Zzhjl7bKT1QzMCHLrWPX X-Google-Smtp-Source: APXvYqyakYHVphvD19yg0hfFCwlMSsmQruD8VHqEScsMPTWBTju3UfdrmZBgtKaZaUfF4a2EBjon4A== X-Received: by 2002:a5d:68cd:: with SMTP id p13mr30288136wrw.18.1567438454555; Mon, 02 Sep 2019 08:34:14 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.34.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:34:14 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:33:16 +0200 Message-Id: <20190902153333.11190-32-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: Pierre-Moana Levesque Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From: Pierre-Moana Levesque * gnu/packages/linux.scm (libnl)[inputs]: Add python-2 and python-3 unless cross-compiling, [outputs]: disable python2 and python3 outputs when cross-compiling, [arguments]: Disable install-python phase when cross-compiling. In install-doc phase, search libnl3-doc in both inputs and native-inputs. --- gnu/packages/linux.scm | 49 +++++++++++++++++++++++++----------------- 1 file changed, 29 insertions(+), 20 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 874fa819e5..9c38bbcfc0 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -36,6 +36,7 @@ ;;; Copyright © 2019 Maxim Cournoyer ;;; Copyright © 2019 Stefan Stefanović ;;; Copyright © 2019 Pierre Langlois +;;; Copyright © 2019 Pierre-Moana Levesque ;;; ;;; This file is part of GNU Guix. ;;; @@ -1949,36 +1950,44 @@ transparently through a bridge.") (string-join (string-split version #\.) "_") "/libnl-doc-" version ".tar.gz")) (sha256 - (base32 "1m5cnzviv31gjnz6fz5rgyl6ah4dbp2akm49j9973sgwl36gs8jx")))))) - (inputs - `(("python-2" ,python-2) - ("python-3" ,python-3))) - (outputs '("out" "doc" "python2" "python3")) + (base32 "1m5cnzviv31gjnz6fz5rgyl6ah4dbp2akm49j9973sgwl36gs8jx")))) + ,@(if (%current-target-system) + '() + '(("python-2" ,python-2) + ("python-3" ,python-3))))) + (outputs `("out" "doc" + ,@(if (%current-target-system) + '() + '("python2" "python3")))) (arguments `(#:modules ((guix build gnu-build-system) (guix build utils) (srfi srfi-1)) #:phases (modify-phases %standard-phases - (add-after 'install 'install-python - (lambda* (#:key outputs #:allow-other-keys) - (define (python-inst python) - (invoke python "setup.py" "build") - (invoke python "setup.py" "install" - (string-append "--prefix=" - (assoc-ref %outputs python))) - (invoke python "setup.py" "clean")) - (setenv "LDFLAGS" (format #f "-Wl,-rpath=~a/lib" - (assoc-ref %outputs "out"))) - (with-directory-excursion "./python" - (for-each python-inst '("python2" "python3"))) - #t)) + ,@(if (%current-target-system) + '() + ;; Cross building Python extensions is not supported. + '((add-after 'install 'install-python + (lambda* (#:key outputs #:allow-other-keys) + (define (python-inst python) + (invoke python "setup.py" "build") + (invoke python "setup.py" "install" + (string-append "--prefix=" + (assoc-ref %outputs python))) + (invoke python "setup.py" "clean")) + (setenv "LDFLAGS" (format #f "-Wl,-rpath=~a/lib" + (assoc-ref %outputs "out"))) + (with-directory-excursion "./python" + (for-each python-inst '("python2" "python3"))) + #t)))) (add-after 'install 'install-doc - (lambda* (#:key inputs outputs #:allow-other-keys) + (lambda* (#:key native-inputs inputs outputs #:allow-other-keys) (let ((dest (string-append (assoc-ref outputs "doc") "/share/doc/libnl"))) (mkdir-p dest) - (invoke "tar" "xf" (assoc-ref inputs "libnl3-doc") + (invoke "tar" "xf" + (assoc-ref (or native-inputs inputs) "libnl3-doc") "--strip-components=1" "-C" dest))))))) (home-page "https://www.infradead.org/~tgr/libnl/") (synopsis "NetLink protocol library suite") From patchwork Mon Sep 2 15:33:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15265 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 580B31734D; Mon, 2 Sep 2019 16:39:07 +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 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 15B4017329 for ; Mon, 2 Sep 2019 16:39:07 +0100 (BST) Received: from localhost ([::1]:37700 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oQ6-0006L4-IR for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:39:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42709) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oMK-0002JL-FW for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4oMH-0004Xe-QP for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50036) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oMH-0004XM-NL for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oMH-0006dt-JL for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 32/48] gnu: crda: Fix cross-compilation Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Sep 2019 15:35:09 +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.156743847525213 (code B ref 36477); Mon, 02 Sep 2019 15:35:09 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:34:35 +0000 Received: from localhost ([127.0.0.1]:58797 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLi-0006YQ-Gd for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:35 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:33384) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLV-0006UH-HC for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:22 -0400 Received: by mail-wr1-f65.google.com with SMTP id u16so14481189wrr.0 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:34:21 -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=aklKo+dbX0aVxf0JJx7CZaktBU7tPb8ga9itqxLwWIA=; b=WCBbLlxsmklPHhYkAXgEo+3P36/zrmkwllJDBFbVJnHPt/qVV73/cBBbR/lFACKq0w i+cgHzE37yNvUVezaHuj4ElCMX5gl4mH0id43d1GaMAopf2e4w8NqLWE723jmp14hsmf 1XtmRnTT4vMrSt33GSVVJbj80pF0RKW/LPwmADR+tIltiMW2nTcbWUSY6H+IBUolP3VC BCSuzK4wnldMsovR01fKYCxOTYFTmH5yQZfpJ4DwefOXBqAxzIM3B61yj9ujU4MkRf5q NHqE+hdZjyvhmBW8atBNKRxoLi6ZkDRQRHM2VOOolxX09tDb3oCATPO06HzLdmvSMOkQ 5xvw== 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=aklKo+dbX0aVxf0JJx7CZaktBU7tPb8ga9itqxLwWIA=; b=IN02Z7CxOlh/0f/W77ca2vxWwCvj7ud/Egfuq/qQbiWRkV3oZA9MlLJ7CS1xWi9lA3 Y0w+1IT/aRSa/h/+zC/R6/kq2Pcrqprn3378qy4vJdFrMJZUUFbeNhLc6lNQ6VXO1k9s 8TdX+d/i2GdBocR/ChRO+Fm/zMTfHFWCmUqWmgrHEIHmKnNxjcKTOHZPWsx+zeavDgMd e1p7+zrc1feEEsvfFOVg3IkeJ+bCRT1H+BzPX2CGUDkOagBbbZ3FwFpi1DWwurf/RKfg Rd5Bn0deeKObKRRSjTaKqYKWPBcEp5GzR/YRTH+F8vAI24V/BSCot1Ll67heLtH0RJBO lSQA== X-Gm-Message-State: APjAAAX2WZRp/K+07z/ONsMg2qQNJwBBuy30BGh2ySjb/bzW+0b0Bp9W GKcPfsnsyIz5SNYF95avWUHHsuVS X-Google-Smtp-Source: APXvYqx/bFZ9op9LR/QKbLrsNU534OnrQOEXoEllFx03pOyPN1y0+uZcXf9XcPJf7jkguKaCHxrN4g== X-Received: by 2002:adf:e3ce:: with SMTP id k14mr34485332wrm.303.1567438455766; Mon, 02 Sep 2019 08:34:15 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.34.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:34:15 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:33:17 +0200 Message-Id: <20190902153333.11190-33-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: Pierre-Moana Levesque Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From: Pierre-Moana Levesque * gnu/packages/linux.scm (crda)[arguments]: Patch Makefile to use cross pkg-config when cross-compiling. Also search for wireless-regdb in both native-inputs and inputs. Set CC variable to cross-compiler when cross-compiling. --- gnu/packages/linux.scm | 67 ++++++++++++++++++++++++++---------------- 1 file changed, 42 insertions(+), 25 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 9c38bbcfc0..ed2d21859d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2796,13 +2796,23 @@ interface.") (patches (search-patches "crda-optional-gcrypt.patch")))) (build-system gnu-build-system) (arguments - '(#:phases (modify-phases %standard-phases + `(#:phases (modify-phases %standard-phases (delete 'configure) (add-after 'unpack 'gzip-determinism (lambda _ (substitute* "Makefile" (("gzip") "gzip --no-name")) #t)) + ,@(if (%current-target-system) + '((add-after + 'unpack 'fix-pkg-config + (lambda* (#:key target #:allow-other-keys) + (substitute* + "Makefile" + (("pkg-config") + (string-append target "-pkg-config"))) + #t))) + '()) (add-before 'build 'no-werror-no-ldconfig (lambda _ @@ -2812,37 +2822,44 @@ interface.") #t)) (add-before 'build 'set-regulator-db-file-name - (lambda* (#:key inputs #:allow-other-keys) + (lambda* (#:key native-inputs inputs #:allow-other-keys) ;; Tell CRDA where to find our database. - (let ((regdb (assoc-ref inputs "wireless-regdb"))) + (let ((regdb (assoc-ref (or native-inputs inputs) + "wireless-regdb"))) (substitute* "crda.c" (("\"/lib/crda/regulatory.bin\"") (string-append "\"" regdb "/lib/crda/regulatory.bin\""))) #t)))) #:test-target "verify" - #:make-flags (let ((out (assoc-ref %outputs "out")) - (regdb (assoc-ref %build-inputs "wireless-regdb"))) - (list "CC=gcc" "V=1" - - ;; Disable signature-checking on 'regulatory.bin'. - ;; The reason is that this simplifies maintenance - ;; on our side (no need to manage a distro key - ;; pair), and we can guarantee integrity of - ;; 'regulatory.bin' by other means anyway, such as - ;; 'guix gc --verify'. See - ;; - ;; for a discssion. - "USE_OPENSSL=0" - - (string-append "PREFIX=" out) - (string-append "SBINDIR=" out "/sbin/") - (string-append "UDEV_RULE_DIR=" - out "/lib/udev/rules.d") - (string-append "LDFLAGS=-Wl,-rpath=" - out "/lib -L.") - (string-append "REG_BIN=" regdb - "/lib/crda/regulatory.bin"))))) + #:make-flags (let ((out (assoc-ref %outputs "out")) + (regdb (assoc-ref %build-inputs "wireless-regdb")) + (target ,(%current-target-system))) + (list + (string-append + "CC=" (if target + (string-append target "-gcc") "gcc")) + "V=1" + + ;; Disable signature-checking on 'regulatory.bin'. + ;; The reason is that this simplifies maintenance + ;; on our side (no need to manage a distro key + ;; pair), and we can guarantee integrity of + ;; 'regulatory.bin' by other means anyway, such as + ;; 'guix gc --verify'. See + ;; + ;; for a discssion. + "USE_OPENSSL=0" + + (string-append "PREFIX=" out) + (string-append "SBINDIR=" out "/sbin/") + (string-append "UDEV_RULE_DIR=" + out "/lib/udev/rules.d") + (string-append "LDFLAGS=-Wl,-rpath=" + out "/lib -L.") + (string-append "REG_BIN=" regdb + "/lib/crda/regulatory.bin") + "all_noverify")))) (native-inputs `(("pkg-config" ,pkg-config) ("python" ,python-2) ("wireless-regdb" ,wireless-regdb))) From patchwork Mon Sep 2 15:33:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15234 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 47B451734D; Mon, 2 Sep 2019 16:36:12 +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 07D5A17329 for ; Mon, 2 Sep 2019 16:36:12 +0100 (BST) Received: from localhost ([::1]:37610 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oNH-000368-BK for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:36:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42708) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oMK-0002JI-EZ for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4oMI-0004br-PO for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50038) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oMI-0004bg-Mn for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oMI-0006e8-JD for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 33/48] gnu: guile-xcb: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Sep 2019 15:35:10 +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.156743848125254 (code B ref 36477); Mon, 02 Sep 2019 15:35:10 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:34:41 +0000 Received: from localhost ([127.0.0.1]:58805 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLo-0006Z9-KU for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:40 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:33389) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLW-0006UV-Gx for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:22 -0400 Received: by mail-wr1-f68.google.com with SMTP id u16so14481253wrr.0 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:34:22 -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=RbuilhkFq4wYLkhYBMifi+T0mOz0cKmWGvKEx3gmQ7U=; b=FXV/M85u6HMQt2ZRIXieaogrWbceBIax++6opFdHZYwbFqIgWEb0XU6kENJ0B7+RzX qSSuvcCb26nySv5s2VGUP4QWEfyx2cXVsPTEi3IH1oGfj8KUBQdhz3M16A7BDKid/h7j s2S1QGdrHkuS6h4D/nsIHEEKt6hJTHxcgVFPiI09NlHyE6r27ityHue0VQhUdvT/tJSz NpiwbvnBqsfr8GSf5zDNcI+c8Zn17MIBo1toCn526qt2c9l8j8cRaum+hVpZyOAqSs0I JWu7HxnH2tklRECqY8caCV7DoRjT5ahrRDg4dMMlE/GgpWdhGHVWPEfS/1PoumNnHJ2G B5dg== 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=RbuilhkFq4wYLkhYBMifi+T0mOz0cKmWGvKEx3gmQ7U=; b=hkBEi8zhI21i99m1XcGaweMyvy3Ysbnh4IpKmJlY1TsDjCGrT8RPP5Oj62cnW3zWJG mWFB+OoyNTNAGWDKYl6rPgJPaR6GMSDswZIq93VZhUT3y2t3iB92F5NZCsjuAowsdHrR vy51usjNigHuSOAbmDAeERAiZAlhjLNbbkEswpcbq1gP7g6IqtajSQCQWezorgic2Y9m aOGd3NzHsJyEenTHssApmEL9gSOLOJKhayepBmgYE0YbAvLQHMmzQ0o/fEQA/oBfPZs7 4OhyvdSvY+9RhmvsI9uGjvChPI4E7EFaUpRHhqn5C1kV4qYCBJ9zC5ZguJLpb7XTuSPU Xglw== X-Gm-Message-State: APjAAAXHVc5zSucFamGr4RzL8sV8Crn8dz1RfUl22MR65rCdXc4soAiZ nieqw/t6apeaHc+PbCAme5llctEU X-Google-Smtp-Source: APXvYqx+mpWl7LNm9WjTKl0sL6AmI6BVUbqGBYLqsztynEJzwdOHy9BeexOcOYlDmtY54oS6syL0bw== X-Received: by 2002:adf:fc03:: with SMTP id i3mr30410920wrr.48.1567438456840; Mon, 02 Sep 2019 08:34:16 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.34.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:34:16 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:33:18 +0200 Message-Id: <20190902153333.11190-34-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: Pierre-Moana Levesque Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From: Pierre-Moana Levesque * gnu/packages/guile-wm.scm (guile-xcb)[native-inputs]: Add guile. --- gnu/packages/guile-wm.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/guile-wm.scm b/gnu/packages/guile-wm.scm index 2955c06a0d..6d17413901 100644 --- a/gnu/packages/guile-wm.scm +++ b/gnu/packages/guile-wm.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2016 Alex ter Weele ;;; Copyright © 2017, 2019 Ricardo Wurmus ;;; Copyright © 2017 ng0 +;;; Copyright © 2019 Pierre-Moana Levesque ;;; ;;; This file is part of GNU Guix. ;;; @@ -57,7 +58,8 @@ "--with-guile-site-ccache-dir=" (assoc-ref %outputs "out") "/lib/guile/2.2/site-ccache")))) - (native-inputs `(("pkg-config" ,pkg-config) + (native-inputs `(("guile" ,guile-2.2) + ("pkg-config" ,pkg-config) ("texinfo" ,texinfo))) (inputs `(("guile" ,guile-2.2) ("xcb" ,xcb-proto))) From patchwork Mon Sep 2 15:33:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15239 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 9510E1734D; Mon, 2 Sep 2019 16:36: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 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 627B917329 for ; Mon, 2 Sep 2019 16:36:33 +0100 (BST) Received: from localhost ([::1]:37620 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oNc-0003Y2-Hx for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:36:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42742) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oML-0002LJ-UN for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4oMK-0004fK-G1 for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50040) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oMJ-0004dv-PS for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:12 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oMJ-0006eP-K0 for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 34/48] gnu: guile-wm: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Sep 2019 15:35:11 +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.156743848225269 (code B ref 36477); Mon, 02 Sep 2019 15:35:11 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:34:42 +0000 Received: from localhost ([127.0.0.1]:58809 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLp-0006ZP-G2 for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:41 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:43794) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLX-0006Ui-Gt for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:23 -0400 Received: by mail-wr1-f68.google.com with SMTP id y8so14424861wrn.10 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:34:23 -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=Tr0sOugmVwyaTXR3L2Jn4JxWg2hDSaaB+Mv8mWbmnHk=; b=rYD5ytoWGwb0PM6CaON+PbtpdkTRuBYANncAgsB3ke0qMdpjOUBI+kvvgDib8EHGER CVq2WQfTBdZEXegrPG09WUy6i1Suczw0HMUwESxpj/BmoMNyopjOjqBgc1pHfJ05VH49 W6Bh1KwkKvlYsHyqRJdZXoGsFYaiafpYMe64tOIM0Xd5No52q80RCropjdH+IdhE8sw8 izV5FIG/FyCb7B3kpkdmoL/D4L0JU+hcKwPgQV7KUqCeFfVci9yUYBwvHPLmYjD12IOt 9pieAMIQ2oiBRjd2uf+YCqRHb3XO+rydTOM7nNgK/BpA3YcAw6gbblzNSET5HZyxiwDq kx8A== 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=Tr0sOugmVwyaTXR3L2Jn4JxWg2hDSaaB+Mv8mWbmnHk=; b=iZE0+t6i85KtE9hPIU0EM0/CvahwJO9qJeVz3GrlLyoAM/NgF72+ZRuGL4FUkf0lCS t/ofutoKs/e+yPU53jrI4Lh9MDEJVhOp1wH6ID719vxiS67smsnUKPXEr4pMQTwkn9mI RTaoLxjifCvlg/AzjeiofJy88lyD8f/lH8SDRcTpv+lgrpdRMlUPnsNT2H3sEyrHZEHh UsQautTMdnpZx0C+fg4MRZpvj6SjA5NKmRidIi8OlGHHY1tGKXMQXGgs9oz9rwMhV2sK AMV2LDSq1WR2SFSIK44JhhjrnQJOajcMTEF0fCiaPvTNqQnQnZHMs12i9PfRjrKhnptP Y4Jg== X-Gm-Message-State: APjAAAWxY5KL7z9hinVm+zExZELtmJXRo5ui2GGTc+0VVJy4aWiR8UZ0 1tLWi53CaNzq8WHIJj0b8YbKQzcX X-Google-Smtp-Source: APXvYqzcrmu22umKqijBc+z4/l87iLAgvj4l/BydNp0LOGpAk+3i01qqPoTIwf0jBTwoQYIzobX85A== X-Received: by 2002:a5d:46c4:: with SMTP id g4mr20155360wrs.189.1567438457831; Mon, 02 Sep 2019 08:34:17 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.34.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:34:17 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:33:19 +0200 Message-Id: <20190902153333.11190-35-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: Pierre-Moana Levesque Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From: Pierre-Moana Levesque * gnu/packages/guile-wm.scm (guile-wm): Add guile and guile-xcb to native-inputs. --- gnu/packages/guile-wm.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/guile-wm.scm b/gnu/packages/guile-wm.scm index 6d17413901..3a6eebc91a 100644 --- a/gnu/packages/guile-wm.scm +++ b/gnu/packages/guile-wm.scm @@ -174,7 +174,9 @@ dependencies.") Type=Application~%" ,name ,synopsis %output)))) #t))))) - (native-inputs `(("pkg-config" ,pkg-config) + (native-inputs `(("guile" ,guile-2.2) + ("guile-xcb" ,guile-xcb) + ("pkg-config" ,pkg-config) ("texinfo" ,texinfo))) (inputs `(("guile" ,guile-2.2) ("guile-xcb" ,guile-xcb))) From patchwork Mon Sep 2 15:33:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15240 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 EF84C1734D; Mon, 2 Sep 2019 16:36:35 +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 B4F1E17329 for ; Mon, 2 Sep 2019 16:36:35 +0100 (BST) Received: from localhost ([::1]:37622 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oNe-0003ZO-Qq for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:36:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42762) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oMM-0002M7-F8 for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4oML-0004hV-0a for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:14 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50042) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oMK-0004gW-SH for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:12 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oMK-0006eg-NR for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 35/48] gnu: cmake: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Sep 2019 15:35:12 +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.156743849025295 (code B ref 36477); Mon, 02 Sep 2019 15:35:12 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:34:50 +0000 Received: from localhost ([127.0.0.1]:58813 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLx-0006Zu-Ty for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:50 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:40291) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLY-0006Uz-JZ for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:25 -0400 Received: by mail-wr1-f65.google.com with SMTP id c3so14448894wrd.7 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:34:24 -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=0MAPnUr8Tohay1gp24tM41PzXsX2DlTuOBJ6lWAXYq8=; b=YetFmPsb6X2BJT0if18QxKxyKr/wGEjOhc7J++CRdtabTTmd9BOoezx2BS6JKfF1lt PxtQYFN/oPtVCeeM8sIH1pNk5w9n6adMvLrhhrscnAePssNr73We2LVagPLtrIHyiEjR k2i8Sy1a0caY0N218o4NfNp3KZmXpVtwYn6SzGMKO39KZPDysj+GW23Dyt2b0iUNBjT3 Cs6r6zAEDGYSz2/1xiaAgnfqcR+hjWia+s+BwSiB/Mr8DGtJ+QNAY0CwwGA/tMoCqfNz 1/WpCwlL5bjx9B3ch20uQ5BYH24MiwwyYXRu+qEz4qDerxlNRSZVC0hUI9LiCPq+WZFX WghQ== 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=0MAPnUr8Tohay1gp24tM41PzXsX2DlTuOBJ6lWAXYq8=; b=YiOiO8fdpcsOGgECU/RZshESX0REGkao+UuAiQJWhR9ZMgZhCqU03ZA7KzdwW7qreD BqxyNn/vUcsCvNfkpuJ28zlpv+yTU8ZL5MNo8kwquww8L5ZZ1Elb9ZsepJsK9MG0OmeF 4qakmIXUhY1UrsgBigWq1636vvkLXBKwuHRH+akaHzdI7DkfiXx0boIl+GR4HWF2QLaP guM9FkbCxNvuGlnmg9BoJJfphAnczUinbqG9Gv6ksvx5+EhXwPO5yKf6ZY//PMHLTydz Hwsf6CaAkDTWhl+5KFr5CRf2pHn3XWQgMcgMVcuPIu36k+wQm1O5SbBfzp/wYsarqHAB +8tw== X-Gm-Message-State: APjAAAW2++0Xp7nRKoU/8sEOTuiiov0IQXrBnFSxEj461Li7u848ve0w eV/PGtuKJ+CRqSrKX8HGfQu92wFj X-Google-Smtp-Source: APXvYqziaGxFh0at2e9YvCOlB8WUIcsigY72VHLKvvcUfaEGK4FkMQBhyy1WfKvqbfaIIP9jyi4EWg== X-Received: by 2002:a5d:6911:: with SMTP id t17mr36646559wru.255.1567438458920; Mon, 02 Sep 2019 08:34:18 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.34.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:34:18 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:33:20 +0200 Message-Id: <20190902153333.11190-36-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: Pierre-Moana Levesque Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From: Pierre-Moana Levesque * gnu/packages/cmake.scm (cmake-minimal)[inputs]: Move all inputs to ... [native-inputs]: ... here, except for ncurses. --- gnu/packages/cmake.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index 9bf0273f00..cae66f2525 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2018 Arun Isaac ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2019 Maxim Cournoyer +;;; Copyright © 2019 Pierre-Moana Levesque ;;; ;;; This file is part of GNU Guix. ;;; @@ -145,16 +146,17 @@ (replace 'configure (lambda* (#:key (configure-flags '()) #:allow-other-keys) (apply invoke "./configure" configure-flags)))))) - (inputs + (native-inputs `(("bzip2" ,bzip2) ("curl" ,curl) ("expat" ,expat) ("file" ,file) ("libarchive" ,libarchive) ("libuv" ,libuv) - ("ncurses" ,ncurses) ; required for ccmake ("rhash" ,rhash) ("zlib" ,zlib))) + (inputs + `(("ncurses" ,ncurses))) ; required for ccmake (native-search-paths (list (search-path-specification (variable "CMAKE_PREFIX_PATH") From patchwork Mon Sep 2 15:33:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15262 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 EA5521734D; Mon, 2 Sep 2019 16:38:51 +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 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 B424317329 for ; Mon, 2 Sep 2019 16:38:51 +0100 (BST) Received: from localhost ([::1]:37690 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oPr-00068T-7T for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:38:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42790) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oMN-0002Ny-JU for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4oML-0004jn-H3 for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:15 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50043) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oML-0004in-AY for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:13 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oML-0006eo-70 for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:13 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 36/48] gnu: console-setup: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Sep 2019 15:35:13 +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.156743849025303 (code B ref 36477); Mon, 02 Sep 2019 15:35:13 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:34:50 +0000 Received: from localhost ([127.0.0.1]:58815 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLy-0006a1-98 for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:50 -0400 Received: from mail-wr1-f45.google.com ([209.85.221.45]:43776) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLZ-0006VL-S6 for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:26 -0400 Received: by mail-wr1-f45.google.com with SMTP id y8so14424950wrn.10 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:34:25 -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=2hUwGhd40iT1PoZDCsybzx2mAEWdbIGvIb4CBmaOLOU=; b=r5kRVLtFZCj5CF3IrzNRAQ1Fbnh1mSjeyh/ck/01LQh9ZliXrnO8lEjm0tgbOjN89O mPIMHPIxQGAooTjoQXsWK3odnyzOPe2hD/uqFDe8r8yTcM/nrpTm3FHtviz4Qv3bAUX5 vlF0MkgcJ0jnV9odiJSyElWa2L1V5kPLnSQUkKa83z9D5y0ZTJByuy91dKr0ZdIXEbWl Fshnszzb3YGqObHDyywviZSDCXPwV81gcBWuUPbW+5HpNQxhsvRQ+zsPopJnyuaWgqgy w/kcyL31A2MnynhZF0QDKsyP6QnJZIatbYlq4ESm5KnxyXrIrRBqwUwX3dqtdgehWqHV ynmg== 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=2hUwGhd40iT1PoZDCsybzx2mAEWdbIGvIb4CBmaOLOU=; b=q9pQ+2JhFScE8KTHLOBAlN1O6h+6vh9+e39bR5k3JGj57n8yBcjUJ70b4aHqwBarTU ipIRWnMfO9tKe4bbCo1x5ZJyiSTklpRlhV/JdwmGHLcqCODJsvvkx1e1Calun1Rg7Ybq rDD+tra9hCoXDkttMzPMLLKgM0/0H7SSVliVgXIrHv0iGLrf90KJXmqg6NP//1ZJ9U3I 48Vdlh9+uExgL8+enMkEidnI0ddNBVRNCNMtKxzzPuQGdtze3nQFhUhw7z8BIUh6lziz eaQECEqEA8CtIERO/EfviSwY35ItcN8bNJZGZu9kQUyyo8y32+3/e+NTmg775OcOa7SO XnYQ== X-Gm-Message-State: APjAAAUise/ERKmvdowokCrXYRaJy/IccYYLhz2TKpo2yFuLChODQ3k4 Gy0GGp5l8eGE2GdCNhUBjyviSccQ X-Google-Smtp-Source: APXvYqxStFWxzMMd8j0tZ0L3pZw7s30aEoDOTk52iXZR4fdTIGd9ikdkmGUQI4Wuiisf6K7ekb9D4g== X-Received: by 2002:adf:ce8e:: with SMTP id r14mr22251276wrn.35.1567438460008; Mon, 02 Sep 2019 08:34:20 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.34.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:34:19 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:33:21 +0200 Message-Id: <20190902153333.11190-37-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/xorg.scm (console-setup)[native-inputs]: Add perl, [arguments]: search for bash in both native-inputs and inputs. --- gnu/packages/xorg.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index d5d983a8d2..ecd8c29f21 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6412,25 +6412,28 @@ output.") " "))) #t)) (add-before 'build 'make-doubled-bdfs - (lambda* (#:key inputs #:allow-other-keys) + (lambda* (#:key native-inputs inputs #:allow-other-keys) (invoke "make" "-C" "Fonts" "doubled_bdfs" (string-append "SHELL=" - (assoc-ref inputs "bash") + (assoc-ref (or native-inputs inputs) + "bash") "/bin/bash")))) (replace 'install - (lambda* (#:key inputs outputs #:allow-other-keys) + (lambda* (#:key native-inputs inputs outputs #:allow-other-keys) (let ((out (assoc-ref %outputs "out"))) (invoke "make" "install-linux" (string-append "prefix=" out) (string-append "SHELL=" - (assoc-ref inputs "bash") + (assoc-ref (or native-inputs inputs) + "bash") "/bin/bash")))))))) (native-inputs `(("pkg-config" ,pkg-config) ("bdftopcf" ,bdftopcf) ("bdfresize" ,bdfresize) - ("sharutils" ,sharutils))) ;for 'uuencode' + ("sharutils" ,sharutils) ;for 'uuencode' + ("perl" ,perl))) (inputs `(("perl" ,perl))) ;used by 'ckbcomp' (synopsis "Set up the Linux console font and keyboard") From patchwork Mon Sep 2 15:33:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15241 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 B23511734D; Mon, 2 Sep 2019 16:36:44 +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 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 7598B17329 for ; Mon, 2 Sep 2019 16:36:44 +0100 (BST) Received: from localhost ([::1]:37626 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oNn-0003pI-Si for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:36:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42772) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oMN-0002NA-23 for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4oML-0004kp-TP for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:14 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50044) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oML-0004ka-QK for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:13 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oML-0006ev-Mg for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:13 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 37/48] gnu: mdadm: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Sep 2019 15:35:13 +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.156743849125311 (code B ref 36477); Mon, 02 Sep 2019 15:35:13 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:34:51 +0000 Received: from localhost ([127.0.0.1]:58817 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLy-0006a4-JL for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:50 -0400 Received: from mail-wm1-f49.google.com ([209.85.128.49]:39670) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLb-0006Vc-16 for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:29 -0400 Received: by mail-wm1-f49.google.com with SMTP id n2so13671027wmk.4 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:34:26 -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=udBFUCNutACftLpZ59EMTMbN6CgXVp9+ZHfQ4Mho5Lk=; b=cWN6nYFariykjcNfLpivgrtW0sQ3XDyP865agnOtRd8vhodRtqLHuhBvWzL7/jfDnR cuSVlwzphVG+ONC9Z1g7xKNj9kBdc6RaBe+zgdgURX+LlYT0kHDgii4PthqDYDK+ad/d QNR84HbLGoFwq6bXneLrnX7sDld8sKpd3+VeKxOl41T7ZO84B+jzlCd9DhB4IWPG7/jp 6W1vHUqTWLObHmWnhm/UmOzFu7waglSWvPyVvuT5froLK2aXm0zbvVQJR6N1V3gsNrAK eiu+5Ry/bk0VT9ceLZsw0NNn+BewlQKq0h6y4CGT/ptxTvG5Idw3hdHisSo/qnARrSbw UzUg== 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=udBFUCNutACftLpZ59EMTMbN6CgXVp9+ZHfQ4Mho5Lk=; b=QTK03phyR6ReAleYkbjWplIoqLE8rJPgf6pAM1Yvp+hhZaggaPLaKgmE7S8mnW6oVP 9fLqEI9OPJ+9IL+kPXxQJomog4tWepvzzR0fEpN2DfH3UUUmp4MykEZx1+tQ+YhY6wRc jUvl2ZKaexAPYnB/EhiyHt6nDFgwk4ht7MsiAQDWAqsfaLnUIqrW0do2umSZZJACp+QR JK191KC5kaRWWoO2ySqOsI4QFWqTRwruQZMKJIEhz5XWXwX1LOM0pvbMsEPKSAZeg5we e97a0h9GSjGNctTDQLpCrlXExhPP9AbACRTb3oyZtGpT75Ep2I8j27inTTDRrpBBbcBy XMoQ== X-Gm-Message-State: APjAAAWkFKf8j8aBba0HBZ+zJueTiN+cwPCzuSkobiNVi7t3pxo2lsL7 cNq0yGApEl5rkmMr1AzEKIegSz3P X-Google-Smtp-Source: APXvYqzw+vVHKQF5ebB+a4M90etInwbPz+rw/VgaSjc7btsAZukg4U/0zOS+FPA17vNoK4p9Dq5J6w== X-Received: by 2002:a7b:cb81:: with SMTP id m1mr36053460wmi.124.1567438461339; Mon, 02 Sep 2019 08:34:21 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.34.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:34:20 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:33:22 +0200 Message-Id: <20190902153333.11190-38-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/linux.scm (mdadm)[arguments]: Search for coreutils in both native-inputs and inputs. --- gnu/packages/linux.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index ed2d21859d..47e6c1da53 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3528,8 +3528,9 @@ MPEG-2 and audio over Linux IEEE 1394.") #:phases (modify-phases %standard-phases (add-before 'build 'patch-program-paths - (lambda* (#:key inputs #:allow-other-keys) - (let ((coreutils (assoc-ref inputs "coreutils"))) + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (let ((coreutils (assoc-ref (or native-inputs inputs) + "coreutils"))) (substitute* "udev-md-raid-arrays.rules" (("/usr/bin/(readlink|basename)" all program) (string-append coreutils "/bin/" program)))) From patchwork Mon Sep 2 15:33:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15244 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 E3F851734D; Mon, 2 Sep 2019 16:37:03 +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 AD0C417329 for ; Mon, 2 Sep 2019 16:37:03 +0100 (BST) Received: from localhost ([::1]:37638 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oO6-00045n-MK for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:37:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42818) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oMO-0002Oc-Kw for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4oMN-0004pD-Fr for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:16 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50045) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oMN-0004mH-BC for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:15 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oMM-0006f2-5u for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:14 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 38/48] gnu: grub: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Sep 2019 15:35:14 +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.156743849225320 (code B ref 36477); Mon, 02 Sep 2019 15:35:14 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:34:52 +0000 Received: from localhost ([127.0.0.1]:58819 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLz-0006aC-TV for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:52 -0400 Received: from mail-wm1-f44.google.com ([209.85.128.44]:36764) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLc-0006Vn-3h for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:29 -0400 Received: by mail-wm1-f44.google.com with SMTP id p13so15109903wmh.1 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:34:28 -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=WL7fLKNr1JLrU6WnaMLxQEHw/j7lWiyZabyrZtNEyqE=; b=KN6SLWwvdchkgTSl33I42ZTBsNCH3I9dIXfKY9bqGpdWAOfM7JtuAsbdDSbdoEzh1B Wh9yVwkiWrEk3DVxdxVA/5xQWDzv17tx9n7BNhhY0sAPV+XspOaTMoJqwZauh8JdIULI g6PP7r3mOlHgBjR/Fd8htTDJvtJc/zUsQwKgN7/2wimpWu+pXMqBLVxUcS7IuEeF5vtD +kjUWBIvNNl1xJHMc/FLpmPnmxGjGeOWElaDoSo6G6SOWLNDOQJ/kuSScBB8qh+XGZ7H F3RBETE4xoWSRHDwrAZoY/0HxJfhR5bxDQOk+Ul6Js7imAvgtOgEK1ShcQn474+tS+Z+ 3kKA== 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=WL7fLKNr1JLrU6WnaMLxQEHw/j7lWiyZabyrZtNEyqE=; b=uThqVIxcObIoQs0M7GksQ+9mnYsAd9hyBldy9Kgatr96e3xuZL/JOddfnx+lA5xWe6 I5eO9BfGju63BTXR/kQ7ycOTiOONRiId7XkBEr8L8eJUSCu16TCKrbqEmsiPosDbMzSl FEw2moz1I5h51kk28UWQGPcmDFVndjYLxHoU9b6BRAaYjVNShB544jc0cwkfatiqSCM0 u3izMuIWExcGZpE78TDVrTLV/qbpK6+pOc9fkCZ1mkxEmJhMNq6xbKwnS37IM3Rkblr5 V5UFZps60hevpoqE1oQQKopy9id6uKpyElQ3F3pFlIzJ6Fd43G/70CLM6mznDiPRJUGC mPZw== X-Gm-Message-State: APjAAAX0yljyajsh0JVHSEmoFs5ZKS2ZEbvZNkSC4lNHQBLVPAGDLqzJ SEU5LMm+tCM7n4ASo1J0BizCg6YV X-Google-Smtp-Source: APXvYqwgZgJR2jNyqpu1baDpMvXtHgmxGiF/p/PBaAg2lCRdHi6q7W/cl4PB+EZ8FNbVN3h+CMzAXQ== X-Received: by 2002:a1c:9a46:: with SMTP id c67mr8144679wme.115.1567438462302; Mon, 02 Sep 2019 08:34:22 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.34.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:34:21 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:33:23 +0200 Message-Id: <20190902153333.11190-39-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/bootloaders.scm (grub)[arguments]: Search for unifont in both native-inputs and inputs. --- gnu/packages/bootloaders.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 41a2de9706..b235e1bc78 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -99,7 +99,7 @@ (list "PYTHON=true") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-stuff - (lambda* (#:key inputs #:allow-other-keys) + (lambda* (#:key native-inputs inputs #:allow-other-keys) (substitute* "grub-core/Makefile.in" (("/bin/sh") (which "sh"))) @@ -114,7 +114,9 @@ "/sbin/mdadm\""))) ;; Make the font visible. - (copy-file (assoc-ref inputs "unifont") "unifont.bdf.gz") + (copy-file (assoc-ref (or native-inputs inputs) + "unifont") + "unifont.bdf.gz") (system* "gunzip" "unifont.bdf.gz") ;; Give the absolute file name of 'ckbcomp'. From patchwork Mon Sep 2 15:33:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15245 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 3B63B1734D; Mon, 2 Sep 2019 16:37:05 +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 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 06B2F17329 for ; Mon, 2 Sep 2019 16:37:05 +0100 (BST) Received: from localhost ([::1]:37642 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oO7-000485-WC for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:37:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42806) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oMO-0002OK-8N for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4oMM-0004nF-Tu for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:16 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50046) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oMM-0004n4-R6 for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:14 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oMM-0006fA-OD for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:14 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 39/48] linux-initrd: Use native gzip. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Sep 2019 15:35:14 +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.156743849225327 (code B ref 36477); Mon, 02 Sep 2019 15:35:14 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:34:52 +0000 Received: from localhost ([127.0.0.1]:58821 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oM0-0006aL-7D for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:52 -0400 Received: from mail-wm1-f42.google.com ([209.85.128.42]:38740) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLd-0006Vz-2f for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:29 -0400 Received: by mail-wm1-f42.google.com with SMTP id o184so15058349wme.3 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:34:29 -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=LlWhpW15OOU45xxpjkGbwzNiPaHrdH0yvAUEHcMFAQk=; b=AtHJXQiVr8kTtl0X431Ert14DIe8bTHfT6BlS+N0guPikznembYLeRt8BnyndYHsWH 8yWe4aDxnapjKt0jYuQV/t8lcGjvT3d4seJO9cmqEw2mrmwaqF9THcPt1TUe/rY9NVhA 09N3O4lFJERenZMxovG26GvjnHCP5jQyaPETxVVVwihPDq0cUiTgs+VZTo91bxreQYmF E7sqT/w0BopiVZ3xWWHRs2K8BTJpzESnXGfTWrESTnYv2zeAxRkXAAZUDhBj3qT7Vo/q QsXWRWDLCVyLAWgV5fz4SZQS2X4AL8xO10cvkY9EpGE0/ufTT+DNTN7zb0ZAHLLpsWZX /9XQ== 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=LlWhpW15OOU45xxpjkGbwzNiPaHrdH0yvAUEHcMFAQk=; b=dX2herDp9E5jjd4nLRKaNk9Py9ORmWXSlkXq698tF4ZSoh4Z+yicaI/HVSZgQZ4xTD mhHY+Kn+TbmMCoDSpgTP8DZ0w5Hqq1qCqRfpaneB8ehAmXGJXjyHARZMurJBPSDE6Brd fP8F4yiSJEAunewa8V4wV3g4nhQm8ZMQMSTK1YQ8Rzjsotszgz9fYJQIxziXX9r55sPq vzXj4gFbalvWPADwUjYkgkazvD6nP/ZW9lR8lVHTVk/whusT7Ee2X6lkSy36XQLzA/UY Ef4uz9iYPUALoqbuMpCF5yHYjYDWF1kOAwpVRg3iFOrEu0IOQHPAt6Vuf3GKd+t3lHlm cRjg== X-Gm-Message-State: APjAAAUP4jqpqI8pxIptf6Vt6lwefn9sa2tOfWbVaNqHDpEwYMV81E24 OjEo67Z421QpuJOqovcbotg08ssZ X-Google-Smtp-Source: APXvYqy112AR5Lu60zSEx/5+zXkv9lLHqREAiKThZtqoic/0dCbbdNHQfYRrVyX7uCdCkHwzEHLFrQ== X-Received: by 2002:a1c:e709:: with SMTP id e9mr1363030wmh.65.1567438463267; Mon, 02 Sep 2019 08:34:23 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.34.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:34:22 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:33:24 +0200 Message-Id: <20190902153333.11190-40-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/system/linux-initrd.scm (expression->initrd): Pass native gzip to build-initrd procedure. --- gnu/system/linux-initrd.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm index 7e9563b923..0efb8fb222 100644 --- a/gnu/system/linux-initrd.scm +++ b/gnu/system/linux-initrd.scm @@ -99,7 +99,7 @@ the derivations referenced by EXP are automatically copied to the initrd." #:init #$init ;; Copy everything INIT refers to into the initrd. #:references-graphs '("closure") - #:gzip (string-append #$gzip "/bin/gzip"))))) + #:gzip (string-append #+gzip "/bin/gzip"))))) (file-append (computed-file name builder #:options From patchwork Mon Sep 2 15:33:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15247 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 76E271734D; Mon, 2 Sep 2019 16:37:16 +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 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 3D07E17329 for ; Mon, 2 Sep 2019 16:37:16 +0100 (BST) Received: from localhost ([::1]:37644 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oOJ-0004NP-FV for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:37:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42873) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oMQ-0002RO-QG for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4oMP-0004vE-Na for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:18 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50049) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oMP-0004sd-IN for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:17 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oMN-0006fI-DH for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:15 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 40/48] gnu: linux-libre: Enable built-in ext4 support. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Sep 2019 15:35:15 +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.156743849225334 (code B ref 36477); Mon, 02 Sep 2019 15:35:15 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:34:52 +0000 Received: from localhost ([127.0.0.1]:58823 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oM0-0006aS-Gk for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:52 -0400 Received: from mail-wr1-f50.google.com ([209.85.221.50]:35640) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLd-0006WB-Vp for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:30 -0400 Received: by mail-wr1-f50.google.com with SMTP id g7so14487485wrx.2 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:34:29 -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=qU6oLDFaC4yT+BULQmMYMm4JY47OkseXzW2BO2iaNs4=; b=JSnhaWPru3MK4CozfE+9G/u8DubnH1jzt7Uhjw2t3N/Qi7mcj62xvsuG937QKQ2eA6 OEjg/8k7RFqpw+bKl4E9xEChpuqaVprGWHqGucZajy6RtZu6IdbGH8pZ/CvLNCkIs9Oa u0BUxy5ScLQz4IKcfwFbQslIKHQ+alvcdkc0RtibMqrS/b7dXRWbZ+cI2k+qHFp+GheR aMFiDgp8wa+drAD2Zwjr33rIvL8IfoxCuT90lXmlQPldTj/XY5g4fnfzrgGJhNxbQC0q mvacRW/zw+0e9UoSAkcYjmKH+eyDPDqY0HTIYoTgs+gVdbqcL4ew7QiiDMpLapwEMCCq 47nw== 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=qU6oLDFaC4yT+BULQmMYMm4JY47OkseXzW2BO2iaNs4=; b=rAo1SXpYf4raK8xnh62VFaymvsxyIdiUqKiucv71EPY6Ku8HC3KnyC4/qx/o2TORl+ Hnt0MASG1NMwShdpLbFKR29IccvldGtG+yHImJokVyJWN9/pv7soVsbhG6zN68q1yl06 iwiZ3pEJ83ctxa9rHZO80NCrGPsJp42kzTOQeJQPof/6hB32iLGTp6Rb8gWijKbOe723 hEV+uuHa4tMQDMvJh+Kzw4FQQXE+ITvW+y3EVk/2o5HeHx1M4gfZeTBZpkpa+OT1xjyD Xr6K/ZHufeJsraRkwUc8zXjpafmDU0N8uKyfZEDI+BKGVb3ReNpLiBmuNWakO9UwyqFk TiFQ== X-Gm-Message-State: APjAAAXmVlBxEBvFg0tMH+7UmspIAkx2Gfo+GfGbKDWUuv5zy7cRU+u5 9eJRe7j+kfV8ymmPjgalBlDhsQGs X-Google-Smtp-Source: APXvYqwohPgwAzFHgSl0b8CJLbrgfucSswaaqmz0mmCnxwVPG2qqKBMCkkEEQ7fHv8Q8RQW0P873LA== X-Received: by 2002:adf:ff8e:: with SMTP id j14mr36011221wrr.141.1567438464294; Mon, 02 Sep 2019 08:34:24 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.34.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:34:23 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:33:25 +0200 Message-Id: <20190902153333.11190-41-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 When running qemu-img from (gnu system vm) with an aarch64 kernel, mounting ext4 partitions fails because no modprobe of ext4 module is made. Like for other kernel configs, provide built-in support for ext4 partitions. * gnu/packages/aux-files/linux-libre/5.2-arm64.conf: Enable built-in ext4, like in intel and armhf configs. --- gnu/packages/aux-files/linux-libre/5.2-arm64.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/aux-files/linux-libre/5.2-arm64.conf b/gnu/packages/aux-files/linux-libre/5.2-arm64.conf index bfd8c18ddb..4ad652a78f 100644 --- a/gnu/packages/aux-files/linux-libre/5.2-arm64.conf +++ b/gnu/packages/aux-files/linux-libre/5.2-arm64.conf @@ -8023,7 +8023,7 @@ CONFIG_VALIDATE_FS_PARSER=y CONFIG_FS_IOMAP=y # CONFIG_EXT2_FS is not set # CONFIG_EXT3_FS is not set -CONFIG_EXT4_FS=m +CONFIG_EXT4_FS=y CONFIG_EXT4_USE_FOR_EXT2=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y From patchwork Mon Sep 2 15:33:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15248 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 A2E371734D; Mon, 2 Sep 2019 16:37:17 +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 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 6D28517329 for ; Mon, 2 Sep 2019 16:37:17 +0100 (BST) Received: from localhost ([::1]:37646 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oOK-0004Pi-ES for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:37:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42854) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oMQ-0002Ql-89 for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4oMP-0004tk-4o for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:18 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50050) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oMP-0004tZ-1d for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:17 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oMO-0006ff-UQ for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:16 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 41/48] gexp: Use cross extensions when cross-compiling. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Sep 2019 15:35:16 +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.156743849525357 (code B ref 36477); Mon, 02 Sep 2019 15:35:16 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:34:55 +0000 Received: from localhost ([127.0.0.1]:58829 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oM2-0006ap-Js for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:54 -0400 Received: from mail-wr1-f49.google.com ([209.85.221.49]:35641) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLh-0006WI-BH for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:33 -0400 Received: by mail-wr1-f49.google.com with SMTP id g7so14487546wrx.2 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:34:33 -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=XWB/EGaWDv6QzekBaWsXiba8kcGeuqFJbTWeR6aTROM=; b=B2bHYGuF6Pebmqgc2jCri2XxucFxKVKagOgE9zAlbI+fj2xASfnsm7xdXI0OKQbCkP iDT/1G/uFTMzCoe/5ffxapEJdwCX1OlTomyR8V0IWKZAwgRnz2NrlGujYZ0du9Ec/0lj IcY7jySpynQpQo0UvTSyuuu3MEUCJkHvFuc6pY4v6cUEdxpEcYgbZEQCtis0eXR+FUmQ rwgNd6VQyZwsbc5/aGYxV3EheMzlHq6/crr8/b7r2L5szmLHabJ8zuylzJxdsGawayIp aKL6DwUUqZhk26qHC8DNx8RV/J4w3tfsdtzQwdkVXto6t+Kb5b8LvO5aS2WaSB0HKYHl 2j6Q== 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=XWB/EGaWDv6QzekBaWsXiba8kcGeuqFJbTWeR6aTROM=; b=YC1nHhZAAFd4KO2C3X/2bXi7vkDb/AdPiyD0zz3HfNbqEXAtdYCaSMX1hmkg2DVfcz iHjzHZjw0bT8K9B6BC1b8IIXDkpJsZbain5a0ZyDbGxOefheDcGSGkuyzWiVy8GAUSXr En+48nEIh2YqRgkMZC5p9sXQdG/wdWet8prsNaYkg1GVVD0nG7h4Mbn55g/vDjWXRaFX wz/0DoV3/zsqWewgTQfsMRqYLfn0n7D2VBwcRW3vh3wIDj/rRCt2vU7+dzrAWpixwuNY TkIjCen10GA+9N874cbb7LRECpmj2yRlVPDc7W/SmUKpEWurkMjVOZyIKV1MkIVHk8sZ nK4Q== X-Gm-Message-State: APjAAAXFaWqqjGSyHp7tKqatLMdNMSS/M2TdGDoFHMnTQ7Yx/ymIcw5f w1WIdQ7lhjGntV8HM3WI4PU5xiLM X-Google-Smtp-Source: APXvYqyYCt6Vds7AH9R/+rmA2BEnYYX/HUNPpD4x1dT9V4TZ0x/o52LxBJ8oTgEzZf0A/C84UmoK7Q== X-Received: by 2002:adf:d1a4:: with SMTP id w4mr38664693wrc.331.1567438465406; Mon, 02 Sep 2019 08:34:25 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.34.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:34:24 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:33:26 +0200 Message-Id: <20190902153333.11190-42-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 --- guix/gexp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guix/gexp.scm b/guix/gexp.scm index d9bdde2e42..514422cb08 100644 --- a/guix/gexp.scm +++ b/guix/gexp.scm @@ -1513,7 +1513,7 @@ are searched for in PATH. Return #f when MODULES and EXTENSIONS are empty." (string-append extension "/share/guile/site/" (effective-version))) - '((ungexp-native-splicing extensions))) + '((ungexp-splicing extensions))) %load-path))) (set! %load-compiled-path (cons (ungexp compiled) @@ -1522,7 +1522,7 @@ are searched for in PATH. Return #f when MODULES and EXTENSIONS are empty." "/lib/guile/" (effective-version) "/site-ccache")) - '((ungexp-native-splicing extensions))) + '((ungexp-splicing extensions))) %load-compiled-path))))))))) (define* (gexp->script name exp From patchwork Mon Sep 2 15:33:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15250 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 43BD117354; Mon, 2 Sep 2019 16:37:29 +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 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 F40FB17329 for ; Mon, 2 Sep 2019 16:37:28 +0100 (BST) Received: from localhost ([::1]:37650 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oOV-0004gK-C7 for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:37:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42862) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oMQ-0002Qu-GY for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4oMO-0004rJ-92 for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:18 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50047) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oMO-0004q5-2E for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:16 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oMN-0006fO-V5 for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:15 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 42/48] gexp: Pass target to compiled-modules in lower-gexp. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Sep 2019 15:35:15 +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.156743849325342 (code B ref 36477); Mon, 02 Sep 2019 15:35:15 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:34:53 +0000 Received: from localhost ([127.0.0.1]:58825 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oM0-0006aZ-Qd for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:53 -0400 Received: from mail-wr1-f50.google.com ([209.85.221.50]:35644) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLg-0006WP-46 for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:32 -0400 Received: by mail-wr1-f50.google.com with SMTP id g7so14487599wrx.2 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:34:32 -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=/D2IEq7JeyMybWRF2sAS9Sb18h3lrskN+qUB1l+f4Oo=; b=AAkOTXPd9xoxaZ0uZRGynyC68HsA1ZeyO4t6ehOGIr+fCEhO9HJUpXa4DFbQ64z4lG oFBjqy1UIUMH+X4IDZF6j/LYMPLm7KXSAPjhg7ZX8wblOVsRMu8jOcZsEPGbvV6EEuVT 7YazhrLGRHsXVWzKFCuHgQHli1y8KOJ0uumpYdPIdkVpDLNOg80MONUeTfWh84BP9ujN ECNQ+lz38aZ5s5MM6Mj2NojkZXzRtEMLb/f61XqeJa1L7nx7ALC/Ok9Gh/VCD7IYgt1f QY2Bqx5gvHzLabD6wwxhNapNNmzxiMHOieP8X/z/94d4UG1qhu8xnfqIdN2lc+hn1t0l 2dzQ== 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=/D2IEq7JeyMybWRF2sAS9Sb18h3lrskN+qUB1l+f4Oo=; b=bZCvknhcamkjuomojHOseq0Z9i9xhwlrazFrHx+ShEWWTEMXa3UE5kIX7Hw7KfoqJU vLMqfucWxofaVLam2ycfwAjiyKveTQpXgHrCWUG/ZjHER/L+49Zk+AcYpDM33Sf9IBHz V7uTXmXgIWbrdKL7l+1jTptyxrBol5RytaAxliwGIwO+OSQ3K1fTsorElmZ0n8A/O4JK mbwUOHAhQ5neKS5n8pEz945YXp6Wg/Xwsah+XCRXcuLhe3H+11V5NvuB0T9fygxAD3qF /U2LPksHq32PLoAFQQka+NqWywmkilzni6nZu8g0sVZsYY9E2YDPMQ96nxcBP+LyhCmK HFUQ== X-Gm-Message-State: APjAAAXXVwc89Xc5fViwjsTQ7LsrDI0+xcE5fq4jOxoALRyYUnF/RO17 bB7xjrt2W0jdN4iwo1Z02LOuqkU1 X-Google-Smtp-Source: APXvYqwBwoOrvZ+2GUBkJbw7OMG/Cp8xv50cBC/ktSCBkquzTY6lQMM/l1qyDn1BGNvBYTPDS0jt0A== X-Received: by 2002:adf:fd03:: with SMTP id e3mr28392543wrr.291.1567438466447; Mon, 02 Sep 2019 08:34:26 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.34.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:34:25 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:33:27 +0200 Message-Id: <20190902153333.11190-43-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 * guix/gexp.scm (lower-gexp): Pass target argument to compiled-modules. --- guix/gexp.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/guix/gexp.scm b/guix/gexp.scm index 514422cb08..afa28779c8 100644 --- a/guix/gexp.scm +++ b/guix/gexp.scm @@ -727,6 +727,7 @@ derivations--e.g., code evaluated for its side effects." (compiled (if (pair? %modules) (compiled-modules %modules #:system system + #:target target #:module-path module-path #:extensions extensions #:guile guile From patchwork Mon Sep 2 15:33:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15242 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 8D47017348; Mon, 2 Sep 2019 16:36:49 +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 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 3971217348 for ; Mon, 2 Sep 2019 16:36:49 +0100 (BST) Received: from localhost ([::1]:37632 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oNs-0003sx-F7 for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:36:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42844) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oMP-0002QG-Tt for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4oMO-0004sy-NZ for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:17 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50048) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oMO-0004sb-JI for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:16 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oMO-0006fV-EF for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:16 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 43/48] utils: Use target-arm64? and target-arm? helpers. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Sep 2019 15:35:16 +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.156743849325349 (code B ref 36477); Mon, 02 Sep 2019 15:35:16 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:34:53 +0000 Received: from localhost ([127.0.0.1]:58827 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oM1-0006ah-8z for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:53 -0400 Received: from mail-wr1-f50.google.com ([209.85.221.50]:38139) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLh-0006WS-5v for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:33 -0400 Received: by mail-wr1-f50.google.com with SMTP id l11so5631254wrx.5 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:34:33 -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=tOPPkls69kv9Lkg6E8gEaO9JlsfXS8SFgBkf0UuFSEo=; b=fdr0W0hp1JYlaNe2q6q3tU9OB2zzXTee/0BC9rGMYSj9/1v6ZrbtRoyjxznuM3HyZ/ uD4qrSg1vas2uokBbzPAkbq3eCJbWu9AGqt2KQslX+aorYhx2sjLzOataRzGiR4KUnhg 8HfV3v4fVNONAc13Xhtp5ndG08YK1yp5lhDuUxqKS8Wwpq/uXOkZwxEZWr3twxwV7nXE RzaeenBEcd3Tyak2kpTwZGfvqty6MGDx3gS7sy6H4nN5dJrhyMun/vVBg1WHLmHyYvf2 sjQVOLg/Y00qwK6s6uMQMpQU+ihW8E1heenzs/211rxcrPZCg1+F4fjg0mv3Izzc65tk fhQA== 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=tOPPkls69kv9Lkg6E8gEaO9JlsfXS8SFgBkf0UuFSEo=; b=CepLtP4czfCe8ZjJlZE9YmQJsbp4H0eo8C93DAWKboI+Z53u3OebD/wAhHIl5YPKoW 1ZyGg5vCUjpHeWobR6SPyprLBi09M7FHurIEJL1MOsbTb3dV/g0hCVAlCg7vZU+23Y4V Hfaf8VxyEK+bDyD6ketwRHwgsYUZLZEESau01uvXgiaOg949KkDkCr6munvOEVmZz/mF 7jFsmUQLQDs4055Ojm4UaWB/re0ZOuEwUH+hnYjyf+qK4obxogFl7uesrAp90MaHN8qD u82sJa/0XPT3z3OKQK1IZDQYqP8yuQFlPGxLIZA4YW1TKKCnSQcScUra0H9PyZY5zeig ZzLg== X-Gm-Message-State: APjAAAV/K58ut4CkOotDCxzCh5AaN59HY3Os+Rey6AwzP0FczmE6CsNk BP8M4h1ZNl6Y2zq2EAhYur+PbZ6A X-Google-Smtp-Source: APXvYqwJ6cu7RjE/ULKmn37i88y8cEWQj7ZRWKP8NHN6qn+sKUkt8UnvZ9rPyfoJRZFgmtEIHS0sgg== X-Received: by 2002:adf:fad0:: with SMTP id a16mr36527946wrs.195.1567438467492; Mon, 02 Sep 2019 08:34:27 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.34.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:34:27 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:33:28 +0200 Message-Id: <20190902153333.11190-44-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 * guix/utils.scm (target-arm64?, target-arm?): New exported procedures. --- guix/utils.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/guix/utils.scm b/guix/utils.scm index f480c3291f..3eb156ad4e 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -78,6 +78,8 @@ package-name->name+version target-mingw? target-arm32? + target-arm64? + target-arm? target-64bit? version-compare version>? @@ -493,6 +495,12 @@ a character other than '@'." (define (target-arm32?) (string-prefix? "arm" (or (%current-target-system) (%current-system)))) +(define (target-arm64?) + (string-prefix? "aarch64" (or (%current-target-system) (%current-system)))) + +(define (target-arm?) + (or (target-arm32?) (target-arm64?))) + (define (target-64bit?) (let ((system (or (%current-target-system) (%current-system)))) (any (cut string-prefix? <> system) '("x86_64" "aarch64" "mips64" "ppc64")))) From patchwork Mon Sep 2 15:33:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15252 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 7FE4F1734D; Mon, 2 Sep 2019 16:37:40 +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 4306B17329 for ; Mon, 2 Sep 2019 16:37:40 +0100 (BST) Received: from localhost ([::1]:37658 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oOh-0004wZ-7m for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:37:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42880) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oMR-0002Rd-3O for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4oMP-0004vJ-Nx for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:18 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50051) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oMP-0004uN-I4 for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:17 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oMP-0006fm-Dp for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:17 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 44/48] build: vm: Fix arm32 support. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Sep 2019 15:35:17 +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.156743849525364 (code B ref 36477); Mon, 02 Sep 2019 15:35:17 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:34:55 +0000 Received: from localhost ([127.0.0.1]:58831 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oM2-0006aw-U0 for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:55 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:38135) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLi-0006WU-5G for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:34 -0400 Received: by mail-wr1-f68.google.com with SMTP id l11so5631293wrx.5 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:34:34 -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=XT6qp/+wmXe73rnlmrAHfRJZYHBLVFXEAYydfmrh97E=; b=Sg0+eOvXkM/zwsMC58+Cs6/rZbYiMnmNaoqZjY0XHM9UAZFWGHZ/xHwX+eCCVdWWeZ +8fN/R4XjvXo2cDvxgmXN8Skrxx2JUbl0uLEo+ltF8PjUVeZ4j1oTloSuZD61k0xQV0v BJJwJ42nHblDcB5tanViUencStXdVnNtoTTpVcUhDrKNONwq23OIfzUcqlNdDGVNtX/C 12neVvRCI7VVHH5tstUzVGB3wFG5fIp0ntKAYPBjo0zrxXZIZChuyGMc7CWNY2lyqzXy UMjhZY/sz6reN/qCwrm/WxZ/1c5hlXt4CYOaGFhgecPr+QdfeOEv8/qQ8mclsmNp3Lce exIg== 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=XT6qp/+wmXe73rnlmrAHfRJZYHBLVFXEAYydfmrh97E=; b=TNH31gaY1LmcSFgjlZBCIBIyQeXL4j14Q6VrxafD54/n22OATPV/IYZy28zSbQkiWn YvO4lTXpglVnIZiPqv21J4B4o7Ny8pWBzuU6JFOn52cvnf7VAoZ0sR2qxl1rETzW1ik8 LFcyjzz4uowWkvloIw1DUphh+W9GoV0hP+YcgtAsE7J0SgPU9IzDzxSmBBF27hbv1TP2 QcUAljlD1cVOM3PZ2WLNAubxRF5XdjxdilhS9L28LKI85Fa9o2wK/gPnQFvUjCp9PhBM t1TAtOL/ukt+tHyxN6cocmQd8E+Es/1HRZBIefDunZwWQoLgShwSf7jxyvTdxApnBjDe RGcQ== X-Gm-Message-State: APjAAAVnjo4yz30BoTLcJYryBpDjJ/nnxtnisyMZBJ2cVLUqzEpOT67C dBqTzZEvf6vfKvPw1846+cmUMvJz X-Google-Smtp-Source: APXvYqy8iVZAMIYph/JiyvuanADzaDTAi6KGauSu4FYlfajl+HjpNo0n27jGEAs1eognMxX9O/cHug== X-Received: by 2002:adf:ef05:: with SMTP id e5mr7555731wro.127.1567438468456; Mon, 02 Sep 2019 08:34:28 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.34.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:34:27 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:33:29 +0200 Message-Id: <20190902153333.11190-45-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/build/vm.scm (load-in-linux-vm): Disable qemu highmem support on ARM32 systems. --- gnu/build/vm.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index a5d9fefa62..b85398ed24 100644 --- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -102,6 +102,14 @@ the #:references-graphs parameter of 'derivation'." ;; hardware limits imposed by other machines. ,@(if target-arm32? '("-M" "virt") '()) + ;; On ARM32, if the kernel is built without LPAE support, ECAM conflicts + ;; with VIRT_PCIE_MMIO causing PCI devices not to show up. Disable + ;; explicitely highmem to fix it. + ;; See: https://bugs.launchpad.net/qemu/+bug/1790975. + ,@(if target-arm32? + '("-machine" "highmem=off") + '()) + ;; Only enable kvm if we see /dev/kvm exists. This allows users without ;; hardware virtualization to still use these commands. KVM support is ;; still buggy on some ARM32 boards. Do not use it even if available. From patchwork Mon Sep 2 15:33:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15268 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 0772B1734D; Mon, 2 Sep 2019 16:39:35 +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 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 B455A17329 for ; Mon, 2 Sep 2019 16:39:34 +0100 (BST) Received: from localhost ([::1]:37708 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oQY-0006Z6-AJ for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:39:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42897) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oMR-0002SN-Nb for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4oMQ-0004xF-8o for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:19 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50052) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oMQ-0004wb-4T for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:18 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oMP-0006fu-Ud for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:17 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 45/48] system: vm: Add arm64 support. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Sep 2019 15:35:17 +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.156743849525371 (code B ref 36477); Mon, 02 Sep 2019 15:35:17 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:34:55 +0000 Received: from localhost ([127.0.0.1]:58833 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oM3-0006b3-8c for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:55 -0400 Received: from mail-wm1-f44.google.com ([209.85.128.44]:35823) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLj-0006Wu-5g for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:36 -0400 Received: by mail-wm1-f44.google.com with SMTP id n10so4388205wmj.0 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:34:35 -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=JesS3RUSqQBP4XclD5L5+e5n2bnMhV49weQtJOwx7EU=; b=Qy05xCRN4GUFk4xr42dzclfWE8FbDlc3HVsZO2gIAtwk6omPVi1GEKfhHCU11ZEhWK tdtJuFAwaK2Uw0UZbx3ACNOOSM8LYL/xemBVL9lLZQEVyBhVSG58SP23jZMN7kRInWkq VLBZVlfA3qtGT5NJYthhXinj8OrOQSi0OBwSdbzVjQSEvVrbxQ5KJRXefZJR8XA/q4Q/ yNg4rsN3sBOFSqZ1I2ovwSXQkQ8l87Ky8ny/4ZB+TEduIMeHInYqtQqig0UZreZdkboZ PXp28Q3W+TjlOArS+l09FPWe6/6rI0ireYrJDzWv1+9Ssdnigiq98s5raKLEildE7XUK V3Tw== 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=JesS3RUSqQBP4XclD5L5+e5n2bnMhV49weQtJOwx7EU=; b=iThf8n35qIg5P38mDBYiVxfamYg34XeO3hB7dEpAMTilB46NC5Cf8XgN/0A6CUZyY0 8lD1IVLIxCYYWyECUsSnVjWO9nlTXqrEoyiS3fWjmcmD4D0jZBioXZfIMcIjWDkP/OdS utrpet4GDi9/QrNJSrHSVUCjdKgQivTCd1H9I6qwxpBNIe55EYWF7ww7MQ73QWcwDPDP n7KaEFbNf4g+sY2CUz++BvpXVi2QOwNZESpp8ahbzjwNNL1TPXpI1qbS4ZCxueWwQmle KSiiZU2snTY6bhaSDoePk7IryeWd0TVpGrh8Woj7ToN2FDl9ivc0SC1Dg9EQIqQ3yio9 11tg== X-Gm-Message-State: APjAAAXJAZ2b6Mm+lhEGVpV5bvTjeASY5UEYsEuZSLO+r5OZnZd8VoBc EFmWjOaRpBK7hG3frf70J6E9S1ZQ X-Google-Smtp-Source: APXvYqwPEkNzEwhKbZAIIHy6JK7cJNryo89KKyzFt47VNqb6YSvMOVZwqNctOF2IOXjjaG1qOYzUAA== X-Received: by 2002:a1c:a94b:: with SMTP id s72mr15741390wme.9.1567438469421; Mon, 02 Sep 2019 08:34:29 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.34.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:34:28 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:33:30 +0200 Message-Id: <20190902153333.11190-46-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/build/vm.scm (load-in-linux-vm): Add target-arm64? argument and use it to pass correct arguments to qemu. * gnu/system/vm.scm (expression->derivation-in-linux-vm): Pass the new target-arm64? argument added above. Do not add ESP partition on all ARM targets. Do not pass grub-efi package to initialize-hard-disk on ARM targets. --- gnu/build/vm.scm | 22 +++++++++++++++++----- gnu/system/vm.scm | 17 +++++++++++------ 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index b85398ed24..e57917a9e5 100644 --- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -82,6 +82,7 @@ make-disk-image? single-file-output? target-arm32? + target-arm64? (disk-image-size (* 100 (expt 2 20))) (disk-image-format "qcow2") (references-graphs '())) @@ -97,10 +98,14 @@ access it via /dev/hda. REFERENCES-GRAPHS can specify a list of reference-graph files as produced by the #:references-graphs parameter of 'derivation'." + (define target-arm? (or target-arm32? target-arm64?)) + (define arch-specific-flags `(;; On ARM, a machine has to be specified. Use "virt" machine to avoid ;; hardware limits imposed by other machines. - ,@(if target-arm32? '("-M" "virt") '()) + ,@(if target-arm? + '("-M" "virt") + '()) ;; On ARM32, if the kernel is built without LPAE support, ECAM conflicts ;; with VIRT_PCIE_MMIO causing PCI devices not to show up. Disable @@ -110,11 +115,18 @@ the #:references-graphs parameter of 'derivation'." '("-machine" "highmem=off") '()) + ;; On ARM64, we have to specify the CPU. "max" behaves as "host" when + ;; KVM is enabled, and like a system CPU with the maximum possible + ;; feature set otherwise. + ,@(if target-arm64? + '("-cpu" "max") + '()) + ;; Only enable kvm if we see /dev/kvm exists. This allows users without ;; hardware virtualization to still use these commands. KVM support is - ;; still buggy on some ARM32 boards. Do not use it even if available. + ;; still buggy on some ARM boards. Do not use it even if available. ,@(if (and (file-exists? "/dev/kvm") - (not target-arm32?)) + (not target-arm?)) '("-enable-kvm") '()) @@ -125,11 +137,11 @@ the #:references-graphs parameter of 'derivation'." ;; The serial port name differs between emulated ;; architectures/machines. " console=" - (if target-arm32? "ttyAMA0" "ttyS0")) + (if target-arm? "ttyAMA0" "ttyS0")) ;; NIC is not supported on ARM "virt" machine, so use a user mode ;; network stack instead. - ,@(if target-arm32? + ,@(if target-arm? '("-device" "virtio-net-pci,netdev=mynet" "-netdev" "user,id=mynet") '("-net" "nic,model=virtio")))) diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index ac6e4ded92..07cee2d4f5 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -235,10 +235,12 @@ made available under the /xchg CIFS share." #:memory-size #$memory-size #:make-disk-image? #$make-disk-image? #:single-file-output? #$single-file-output? - ;; FIXME: ‘target-arm32?’ may not operate on - ;; the right system/target values. Rewrite + ;; FIXME: ‘target-arm32?’ and + ;; ‘target-arm64?’ may not operate on the + ;; right system/target values. Rewrite ;; using ‘let-system’ when available. #:target-arm32? #$(target-arm32?) + #:target-arm64? #$(target-arm64?) #:disk-image-format #$disk-image-format #:disk-image-size size #:references-graphs graphs)))))) @@ -452,10 +454,10 @@ system." ;; bootloaders if we are not targeting ARM because UEFI ;; support in U-Boot is experimental. ;; - ;; FIXME: ‘target-arm32?’ may be not operate on the right + ;; FIXME: ‘target-arm?’ may be not operate on the right ;; system/target values. Rewrite using ‘let-system’ when ;; available. - (if #$(target-arm32?) + (if #$(target-arm?) '() (list (partition ;; The standalone grub image is about 10MiB, but @@ -466,10 +468,13 @@ system." ;; when mounting. The actual FAT-ness is based ;; on file system size (16 in this case). (file-system "vfat") - (flags '(esp)))))))) + (flags '(esp))))))) + (grub-efi #$@(if (target-arm?) + '(#f) + #~(#$grub-efi)))) (initialize-hard-disk "/dev/vda" #:partitions partitions - #:grub-efi #$grub-efi + #:grub-efi grub-efi #:bootloader-package #$(bootloader-package bootloader) #:bootcfg #$bootcfg-drv From patchwork Mon Sep 2 15:33:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15255 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 CA1211734D; Mon, 2 Sep 2019 16:38:14 +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 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 79DAD17329 for ; Mon, 2 Sep 2019 16:38:14 +0100 (BST) Received: from localhost ([::1]:37666 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oPF-0005Fm-MT for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:38:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42929) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oMU-0002Vm-Mu for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4oMT-00054x-5W for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:22 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50053) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oMT-00054N-1k for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:21 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oMQ-0006g2-FM for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:19 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 46/48] system: vm: Support cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Sep 2019 15:35:18 +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.156743849625379 (code B ref 36477); Mon, 02 Sep 2019 15:35:18 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:34:56 +0000 Received: from localhost ([127.0.0.1]:58835 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oM3-0006bF-LP for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:56 -0400 Received: from mail-wr1-f52.google.com ([209.85.221.52]:45300) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLk-0006XN-BK for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:36 -0400 Received: by mail-wr1-f52.google.com with SMTP id q12so14413477wrj.12 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:34:36 -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=DKHYqcz+TrJYHtYnh41O9JXkw/xT0ZpMscZMzyf8MRU=; b=mijFHR7PYP7DzRoc6Rozrt0ETKVox82YjLzwIQLw0QJwsu7HmrEYt5D+nfUJojcyNw NK6Y0ksPNRdMrkqPPay0HSe7tyoOdBKaBtnZvVJb5ggcc3DlZp/dXjhhy2aWJVxJNFaJ y+EdkZ4fadfqUnOxAoRv7odFrR7/RA3myZ6Uxy8ZHX0IhmOH8k40cnZKMNCL6idhpdrm +of2kvUph1iEU5si2opH32SJ5JGbYIHZCW0AAGDSsKdVoyYty2Q2eoe9bf7NVdW/Ck4/ UDvgMVphaTsoCeZ4NYQk/U1SSKxRuflVq3Q69N70xsusi7uKOnOoNoAoNJH/cIRFVAhh rM2w== 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=DKHYqcz+TrJYHtYnh41O9JXkw/xT0ZpMscZMzyf8MRU=; b=jcz7YlPIpz5D8OEclGFcrT7SoQyh3ugN1SdazFRPlXd49av4dnRZtba9P+2w43wuwN MbTGIrJPBFzgmZmNEaZzwfn20xQwpcWTJPUCw6V+8w4iNm2Qb0qL4JJNWZc0GECu7g3a yyn6p+yZZ1SRMUaOiAdQ5w3E7W+0dymC7x7UlWMA2JKE2va1NSQBQU21PhiTqLwanDmi L/Ofu7rR6+11wHJPANEFhTTwS3j+GPBreZIZX3HvlDKyfCmx8zB4gp7odvLpm/sJH6xI aYNJxb0LaPUFU1axWQFvC6CTkq7iL63zGfgd8URQ4Ma9JpqKuiaHMwxVk9HBDBgeejgs vGJQ== X-Gm-Message-State: APjAAAV1cvNMu2kzAe+LRg0WlJrmi6Yv58kFW4KSEYIRPSXAQjcC9PwV abVEPW06KRfUbmFSIkjDxA/i+K4z X-Google-Smtp-Source: APXvYqwVhcrhsy9h+VEm8kkNE7yOoOu7frVPF98/+SbrqFt0/z8hq3gGkuqAuso06pu0w9hSSbq/zg== X-Received: by 2002:a5d:6a49:: with SMTP id t9mr2416794wrw.134.1567438470460; Mon, 02 Sep 2019 08:34:30 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.34.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:34:29 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:33:31 +0200 Message-Id: <20190902153333.11190-47-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/system.scm (system-linux-image-file-name): Add support for cross-built systems. Remove system argument that was ignored, (operating-system-kernel-file): adapt by removing ignored os argument. * gnu/system/vm.scm (expression->derivation-in-linux-vm): Add target argument, move qemu from inputs list to a new native-inputs list and adapt set-path-environment-variable call accordingly. Pass target to qemu-command and gexp->derivation calls. (iso9660-image): Move qemu from inputs to a new native-inputs list and adapt set-path-environment-variable accordingly. (qemu-image): Add target argument, move qemu from inputs list to a new native-inputs list and adapt set-path-environment-variable call accordingly. Pass target argument to expression->derivation-in-linux-vm call. --- gnu/system.scm | 15 ++++++++------- gnu/system/vm.scm | 25 ++++++++++++++++++------- 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/gnu/system.scm b/gnu/system.scm index 485896ba0a..85059119cc 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -439,20 +439,21 @@ from the initrd." "Return the list of swap services for OS." (map swap-service (operating-system-swap-devices os))) -(define* (system-linux-image-file-name #:optional (system (%current-system))) +(define* (system-linux-image-file-name) "Return the basename of the kernel image file for SYSTEM." ;; FIXME: Evaluate the conditional based on the actual current system. - (cond - ((string-prefix? "arm" (%current-system)) "zImage") - ((string-prefix? "mips" (%current-system)) "vmlinuz") - ((string-prefix? "aarch64" (%current-system)) "Image") - (else "bzImage"))) + (let ((target (or (%current-target-system) (%current-system)))) + (cond + ((string-prefix? "arm" target) "zImage") + ((string-prefix? "mips" target) "vmlinuz") + ((string-prefix? "aarch64" target) "Image") + (else "bzImage")))) (define (operating-system-kernel-file os) "Return an object representing the absolute file name of the kernel image of OS." (file-append (operating-system-kernel os) - "/" (system-linux-image-file-name os))) + "/" (system-linux-image-file-name))) (define* (operating-system-directory-base-entries os) "Return the basic entries of the 'system' directory of OS for use as the diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 07cee2d4f5..759745c277 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -143,7 +143,7 @@ (define* (expression->derivation-in-linux-vm name exp #:key - (system (%current-system)) + (system (%current-system)) target (linux linux-libre) initrd (qemu qemu-minimal) @@ -214,7 +214,8 @@ made available under the /xchg CIFS share." (use-modules (guix build utils) (gnu build vm)) - (let* ((inputs '#$(list qemu (canonical-package coreutils))) + (let* ((inputs '#$(list (canonical-package coreutils))) + (native-inputs '#+(list qemu)) (linux (string-append #$linux "/" #$(system-linux-image-file-name))) (initrd #$initrd) @@ -222,16 +223,19 @@ made available under the /xchg CIFS share." (graphs '#$(match references-graphs (((graph-files . _) ...) graph-files) (_ #f))) + (target #$(or (%current-target-system) (%current-system))) (size #$(if (eq? 'guess disk-image-size) #~(+ (* 70 (expt 2 20)) ;ESP (estimated-partition-size graphs)) disk-image-size))) - (set-path-environment-variable "PATH" '("bin") inputs) + (set-path-environment-variable "PATH" '("bin") + (append inputs native-inputs)) (load-in-linux-vm loader #:output #$output #:linux linux #:initrd initrd + #:qemu (qemu-command target) #:memory-size #$memory-size #:make-disk-image? #$make-disk-image? #:single-file-output? #$single-file-output? @@ -248,6 +252,7 @@ made available under the /xchg CIFS share." (gexp->derivation name builder ;; TODO: Require the "kvm" feature. #:system system + #:target target #:env-vars env-vars #:guile-for-build guile-for-build #:references-graphs references-graphs))) @@ -299,9 +304,10 @@ INPUTS is a list of inputs (as for packages)." (setlocale LC_ALL "en_US.utf8") (let ((inputs - '#$(append (list qemu parted e2fsprogs dosfstools xorriso) + '#$(append (list parted e2fsprogs dosfstools xorriso) (map canonical-package (list sed grep coreutils findutils gawk)))) + (native-inputs '#+(list qemu)) (graphs '#$(match inputs @@ -315,7 +321,8 @@ INPUTS is a list of inputs (as for packages)." ((name thing output) `(,thing ,output))) inputs))) - (set-path-environment-variable "PATH" '("bin" "sbin") inputs) + (set-path-environment-variable "PATH" '("bin" "sbin") + (append inputs native-inputs)) (make-iso9660-image #$xorriso '#$grub-mkrescue-environment #$(bootloader-package bootloader) @@ -346,6 +353,7 @@ INPUTS is a list of inputs (as for packages)." (define* (qemu-image #:key (name "qemu-image") (system (%current-system)) + (target (%current-target-system)) (qemu qemu-minimal) (disk-image-size 'guess) (disk-image-format "qcow2") @@ -404,9 +412,10 @@ system." (setlocale LC_ALL "en_US.utf8") (let ((inputs - '#$(append (list qemu parted e2fsprogs dosfstools) + '#$(append (list util-linux parted e2fsprogs dosfstools) (map canonical-package (list sed grep coreutils findutils gawk)))) + (native-inputs '#+(list qemu)) ;; This variable is unused but allows us to add INPUTS-TO-COPY ;; as inputs. @@ -416,7 +425,8 @@ system." ((name thing output) `(,thing ,output))) inputs))) - (set-path-environment-variable "PATH" '("bin" "sbin") inputs) + (set-path-environment-variable "PATH" '("bin" "sbin") + (append inputs native-inputs)) (let* ((graphs '#$(match inputs (((names . _) ...) @@ -483,6 +493,7 @@ system." #:bootloader-installer #$(bootloader-installer bootloader))))))) #:system system + #:target target #:make-disk-image? #t #:disk-image-size disk-image-size #:disk-image-format disk-image-format From patchwork Mon Sep 2 15:33:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15264 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 E58351734D; Mon, 2 Sep 2019 16:38:58 +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 8D24D17348 for ; Mon, 2 Sep 2019 16:38:58 +0100 (BST) Received: from localhost ([::1]:37696 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oPy-0006Gf-2a for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:38:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42944) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oMX-0002Ze-TI for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4oMU-00057x-In for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:24 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50054) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oMU-00057f-Fi for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:22 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oMS-0006gA-Dm for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:22 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 47/48] scripts: system: Add --target option. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Sep 2019 15:35:20 +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.156743849625387 (code B ref 36477); Mon, 02 Sep 2019 15:35:20 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:34:56 +0000 Received: from localhost ([127.0.0.1]:58837 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oM4-0006bJ-3G for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:56 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:43820) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLl-0006Xw-VF for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:38 -0400 Received: by mail-wr1-f68.google.com with SMTP id y8so14425556wrn.10 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:34:37 -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=Rkzeyq0gaMbpHXJoKkrR7H0aWSZHsu3bNHhGLL2halc=; b=KXBnj7KG4wVRPBnrOtxQxGYYhMyGt/di3QIia1HIiQZV0tneWbDL1oJJPY7LjRm71u mziFjwvXEhoTX3iyZGCOaa1tr/LVlq4n63+lyokKmGNaEvi8UWpqiN09K9yRvOpn1rrt 9AXuYiXEnV1OolJqwV0SOG2/0vka+iLLo5rxHAPLPe90TA6gbdo9MfEGqcJi+0PuWOLw PvRdEDSz2l7t/olNW9k/NHBjf1gosHAJP7kCU2o5v7Q4GA2O0zy/91FSDrpgM4au6jx1 PFSV5En0r8Fcuf9mQ3wDWj74QPovq3m0Horhl0Ee3dxWRFVxjqNM3T/Nw7EK5FnGXCvO 7Ehg== 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=Rkzeyq0gaMbpHXJoKkrR7H0aWSZHsu3bNHhGLL2halc=; b=RCeDpwUnFf6mgGhbVvocO8+s9nHnvoHPQjdyjgSg2um9h8cdVFdYk80NVVPi6o1sWT 7xmeDpRhxpG27a0kRQFmK/E+9nmjV8UB3QAmzknBPi8xSbDwwgfTDjB8/Y4ya8C14IoW 2hD5zLYyb3dYiFzRlgLIioHME0wtW7rkfLoPsVddQBi+FO2IpuYj6kKlRLU3CkhStx5I 22v0uSBScJFp1b0ptf5thwFnApjKh++ISWsenB0vRNJxXWzVED2Wq8s/5sLDDgEa+SY0 BHX8+efa4OzM0CaL0fjTuQhUUqym0ZLtH2++QsI++2OevF/sPZxVU56QvEKpKScjSfP2 IvcA== X-Gm-Message-State: APjAAAW4p5d3HBZppOGKCQsE1LKTDKVLfddH3gqL+V2uUpg0Bmpipv8X waH2y2YwGWVWzuUOOdPAcxbQFHze X-Google-Smtp-Source: APXvYqz8gPbYH7caXzOzFpGUBEexfuDmWYeIOafN6/Je3lKGXFKdEklzTG+ESTtSJ2klvYEeDNTmqw== X-Received: by 2002:adf:fd03:: with SMTP id e3mr28393193wrr.291.1567438472252; Mon, 02 Sep 2019 08:34:32 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.34.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:34:31 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:33:32 +0200 Message-Id: <20190902153333.11190-48-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 * guix/scripts/system.scm (%options): Add target option, (%default-options): ditto, (process-action): Rename existing target variable to target-file and pass new target variable to run-with-store procedure. --- guix/scripts/system.scm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 9fc3a10e98..f8040dd975 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2016 Alex Kost ;;; Copyright © 2016, 2017, 2018 Chris Marusich -;;; Copyright © 2017 Mathieu Othacehe +;;; Copyright © 2017, 2019 Mathieu Othacehe ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2019 Christopher Baines ;;; @@ -929,6 +929,8 @@ Some ACTIONS support additional ARGS.\n")) --full-boot for 'vm', make a full boot sequence")) (display (G_ " --skip-checks skip file system and initrd module safety checks")) + (display (G_ " + --target=TRIPLET cross-build for TRIPLET--e.g., \"armel-linux-gnu\"")) (display (G_ " -v, --verbosity=LEVEL use the given verbosity LEVEL")) (newline) @@ -1002,6 +1004,10 @@ Some ACTIONS support additional ARGS.\n")) (lambda (opt name arg result) (alist-cons 'system arg (alist-delete 'system result eq?)))) + (option '("target") #t #f + (lambda (opt name arg result) + (alist-cons 'target arg + (alist-delete 'target result eq?)))) (option '(#\r "root") #t #f (lambda (opt name arg result) (alist-cons 'gc-root arg result))) @@ -1010,6 +1016,7 @@ Some ACTIONS support additional ARGS.\n")) (define %default-options ;; Alist of default option values. `((system . ,(%current-system)) + (target . #f) (substitutes? . #t) (build-hook? . #t) (print-build-trace? . #t) @@ -1043,6 +1050,7 @@ resulting from command-line parsing." ((x . _) x))) (expr (assoc-ref opts 'expression)) (system (assoc-ref opts 'system)) + (target (assoc-ref opts 'target)) (os (ensure-operating-system (or file expr) (cond @@ -1059,7 +1067,7 @@ resulting from command-line parsing." (dry? (assoc-ref opts 'dry-run?)) (bootloader? (assoc-ref opts 'install-bootloader?)) - (target (match args + (target-file (match args ((first second) second) (_ #f))) (bootloader-target @@ -1101,9 +1109,10 @@ resulting from command-line parsing." (_ #f)) opts) #:install-bootloader? bootloader? - #:target target + #:target target-file #:bootloader-target bootloader-target #:gc-root (assoc-ref opts 'gc-root))))) + #:target target #:system system)) (warn-about-disk-space))) From patchwork Mon Sep 2 15:33:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15257 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 D7BF91734D; Mon, 2 Sep 2019 16:38:25 +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 3E85E17329 for ; Mon, 2 Sep 2019 16:38:25 +0100 (BST) Received: from localhost ([::1]:37670 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oPQ-0005W2-9v for patchwork@mira.cbaines.net; Mon, 02 Sep 2019 11:38:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42962) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i4oMa-0002cK-Cb for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i4oMX-0005DR-TP for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:28 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50055) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i4oMU-00058e-VM for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:24 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i4oMU-0006gM-Qo for guix-patches@gnu.org; Mon, 02 Sep 2019 11:35:22 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v3 48/48] wip: tools. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Sep 2019 15:35:22 +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.156743849725396 (code B ref 36477); Mon, 02 Sep 2019 15:35:22 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Sep 2019 15:34:57 +0000 Received: from localhost ([127.0.0.1]:58839 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oM4-0006bQ-Ft for submit@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:57 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:41758) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i4oLn-0006YH-8v for 36477@debbugs.gnu.org; Mon, 02 Sep 2019 11:34:40 -0400 Received: by mail-wr1-f68.google.com with SMTP id j16so14443857wrr.8 for <36477@debbugs.gnu.org>; Mon, 02 Sep 2019 08:34:39 -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=dOKChSPIa1zVzvJViPzlsRONmF2dFzkQunlCFu0x5xs=; b=STsxQkQPSdqjCwUKVOElJCbEqAUHxKwsojn7LoGR9QkQV6RkhNQrRZ6vKv7mU9ePip nz56FrhSHMMmK6ofHk9eNNammLc9k561eaXN3PSyXe/GIbBHe4zf3W/sT9VvYkejvm3T fnqibcoKEBcnEHPu9SDdDWkiMSVoShWieQyYGGkDu4pLgkPr2l9ukfhdfsmFp92L5n+X KGcR+h3FIwAsqFXrOkD23jho4YafgoVVGdAIwHqeKd891mv9ZysBqTFmBmlvilhen8Tf EF9Yw4TlLWPTIeDJsSN4jfWP1CwH7N9MjhCNG1M8o3rSJd4pGKHvFDvlbMxPDV08biGn 1LXw== 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=dOKChSPIa1zVzvJViPzlsRONmF2dFzkQunlCFu0x5xs=; b=L26qzuw0tzHnC7x6S2NRNROHwJtlq7zi+LCKcPksLzc9M6dsY5clapLwz2X9V6HX6H z+9RAR5sE4OvsS/MO2vCv6ATqnr8LyQQP3RwuSi/9CgI5Qb54NmF9JIxe1xTXZWdr2gH Rwa+eS/6enVLGuwrEHs/4zSeU4wLCnrMNURachTX5Zm/3pc6x5bCpqN60HkNehSPh29e 557X1LaDkbAsGAfz/bsGGZkQzbfT8jjVrf5DRatFUUAQJtiMPZVE/sHJwFhA5GW8c8sx pJT3MXnP8urUlM+gZbO6YS6QKdxoV6mQ1TadmeMJ1rm1qS131R+KQtEoJfHxSZ4Aruo1 /Gfw== X-Gm-Message-State: APjAAAUtbVDYa647c6yaDlR+Z/YtnjMfHYQifSoD2w2bM1GpfvYJ64R0 duXtp0guuzrA1TYlbsmCVqfYvBkN X-Google-Smtp-Source: APXvYqwtOcguFliNB1xxUZv1m4Xypk2TNp2By0jFBRiaTg/LxJ5+jRinx9yXb4EEX5l5P7aXaantag== X-Received: by 2002:a5d:46c4:: with SMTP id g4mr20156998wrs.189.1567438473304; Mon, 02 Sep 2019 08:34:33 -0700 (PDT) Received: from localhost.localdomain ([80.12.63.115]) by smtp.gmail.com with ESMTPSA id b26sm17232265wmj.14.2019.09.02.08.34.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2019 08:34:32 -0700 (PDT) From: Mathieu Othacehe Date: Mon, 2 Sep 2019 17:33:33 +0200 Message-Id: <20190902153333.11190-49-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 --- build-sorted-ok-ko-packages.sh | 354 ++++++++++++++++++++++++ deps.scm | 184 ++++++++++++ gnu/system/examples/mini-beaglebone.scm | 61 ++++ gnu/system/examples/mini.scm | 54 ++++ 4 files changed, 653 insertions(+) create mode 100755 build-sorted-ok-ko-packages.sh create mode 100644 deps.scm create mode 100644 gnu/system/examples/mini-beaglebone.scm create mode 100644 gnu/system/examples/mini.scm diff --git a/build-sorted-ok-ko-packages.sh b/build-sorted-ok-ko-packages.sh new file mode 100755 index 0000000000..a2a13dcdfc --- /dev/null +++ b/build-sorted-ok-ko-packages.sh @@ -0,0 +1,354 @@ +#!/bin/bash - + +set -o nounset # Treat unset variables as an error + +mngt_dir() +{ + local dirname=$1 + + rm -rf ${dirname}.bk + if [ -e $dirname ]; then + mv $dirname ${dirname}.bk + fi + mkdir ${dirname} +} + +DEPENDENCIES_DIR="packages-dependencies" +KO_OUT_LOG_DIR="ko-out-log-dir" +OUT_FILE_NAME_BASE="packages-status" +OUT_FILE_NAME_EXT="wiki" +OUT_FILE_NAME=${OUT_FILE_NAME_BASE}.${OUT_FILE_NAME_EXT} + +rm -f ${OUT_FILE_NAME}.bk +if [ -e $OUT_FILE_NAME ]; then + mv $OUT_FILE_NAME ${OUT_FILE_NAME}.bk +fi + +mngt_dir ${DEPENDENCIES_DIR} +mngt_dir ${KO_OUT_LOG_DIR} + +NB_OK=0 +NB_KO=0 +NB_UNKNOWN=0 + +file_header() +{ + local title="Packages status" + + echo "" + echo "start file $OUT_FILE_NAME" + echo "" + + echo "" >> $OUT_FILE_NAME + echo "= $title =" >> $OUT_FILE_NAME + echo "" >> $OUT_FILE_NAME +} + +section_header() +{ + local title=$1 + + echo "" + echo "" + echo "start section \"$title\"" + + echo "" >> $OUT_FILE_NAME + echo "== $title ==" >> $OUT_FILE_NAME + echo "" >> $OUT_FILE_NAME + echo "| package | status | nb dependencies |" >> $OUT_FILE_NAME + + NB_OK=0 + NB_KO=0 + NB_UNKNOWN=0 +} + +section_footer() +{ + echo "" >> $OUT_FILE_NAME + echo "nb packages OK in section: $NB_OK" >> $OUT_FILE_NAME + echo "" >> $OUT_FILE_NAME + echo "nb packages *KO* in section: $NB_KO" >> $OUT_FILE_NAME + echo "" >> $OUT_FILE_NAME + echo "nb packages UNKNOWN in section: $NB_UNKNOWN" >> $OUT_FILE_NAME + echo "" >> $OUT_FILE_NAME + echo "" >> $OUT_FILE_NAME +} + +add_package_status() +{ + local package=$1 + local status=$2 + local nb_deps=$3 + + if [ "$status" = "OK" ]; then + NB_OK=$(($NB_OK+1)) + elif [ "$status" = "KO" ]; then + status="*KO*" + NB_KO=$(($NB_KO+1)) + else + NB_UNKNOWN=$(($NB_UNKNOWN+1)) + fi + + echo "| $package | $status | $nb_deps |" >> $OUT_FILE_NAME +} + +LIST_PACK_SUPPOSED_OK="" + +LIST_PACK_SUPPOSED_OK+=" xz" +LIST_PACK_SUPPOSED_OK+=" tk" +LIST_PACK_SUPPOSED_OK+=" m4" +LIST_PACK_SUPPOSED_OK+=" ed" +LIST_PACK_SUPPOSED_OK+=" bc" +LIST_PACK_SUPPOSED_OK+=" tcl" +LIST_PACK_SUPPOSED_OK+=" sed" +LIST_PACK_SUPPOSED_OK+=" mpc" +LIST_PACK_SUPPOSED_OK+=" lzo" +LIST_PACK_SUPPOSED_OK+=" isl" +LIST_PACK_SUPPOSED_OK+=" gss" +LIST_PACK_SUPPOSED_OK+=" gmp" +LIST_PACK_SUPPOSED_OK+=" bdb" +LIST_PACK_SUPPOSED_OK+=" acl" +LIST_PACK_SUPPOSED_OK+=" zlib" +LIST_PACK_SUPPOSED_OK+=" sudo" +LIST_PACK_SUPPOSED_OK+=" perl" +LIST_PACK_SUPPOSED_OK+=" pcre" +LIST_PACK_SUPPOSED_OK+=" mpfr" +LIST_PACK_SUPPOSED_OK+=" make" +LIST_PACK_SUPPOSED_OK+=" lzip" +LIST_PACK_SUPPOSED_OK+=" gzip" +LIST_PACK_SUPPOSED_OK+=" grep" +LIST_PACK_SUPPOSED_OK+=" gdbm" +LIST_PACK_SUPPOSED_OK+=" gawk" +LIST_PACK_SUPPOSED_OK+=" fuse" +LIST_PACK_SUPPOSED_OK+=" flex" +LIST_PACK_SUPPOSED_OK+=" flac" +LIST_PACK_SUPPOSED_OK+=" file" +LIST_PACK_SUPPOSED_OK+=" fftw" +LIST_PACK_SUPPOSED_OK+=" bash" +LIST_PACK_SUPPOSED_OK+=" attr" +LIST_PACK_SUPPOSED_OK+=" which" +LIST_PACK_SUPPOSED_OK+=" unzip" +LIST_PACK_SUPPOSED_OK+=" rhash" +LIST_PACK_SUPPOSED_OK+=" libuv" +LIST_PACK_SUPPOSED_OK+=" libgc" +LIST_PACK_SUPPOSED_OK+=" libev" +LIST_PACK_SUPPOSED_OK+=" guile" +LIST_PACK_SUPPOSED_OK+=" groff" +LIST_PACK_SUPPOSED_OK+=" gperf" +LIST_PACK_SUPPOSED_OK+=" glibc" +LIST_PACK_SUPPOSED_OK+=" expat" +LIST_PACK_SUPPOSED_OK+=" bzip2" +LIST_PACK_SUPPOSED_OK+=" bison" +LIST_PACK_SUPPOSED_OK+=" xtrans" +LIST_PACK_SUPPOSED_OK+=" tzdata" +LIST_PACK_SUPPOSED_OK+=" sqlite" +LIST_PACK_SUPPOSED_OK+=" shishi" +LIST_PACK_SUPPOSED_OK+=" shadow" +LIST_PACK_SUPPOSED_OK+=" python" +LIST_PACK_SUPPOSED_OK+=" nettle" +LIST_PACK_SUPPOSED_OK+=" libxft" +LIST_PACK_SUPPOSED_OK+=" libxcb" +LIST_PACK_SUPPOSED_OK+=" libxau" +LIST_PACK_SUPPOSED_OK+=" libx11" +LIST_PACK_SUPPOSED_OK+=" libpng" +LIST_PACK_SUPPOSED_OK+=" libogg" +LIST_PACK_SUPPOSED_OK+=" libidn" +LIST_PACK_SUPPOSED_OK+=" libffi" +LIST_PACK_SUPPOSED_OK+=" libelf" +LIST_PACK_SUPPOSED_OK+=" libcap" +LIST_PACK_SUPPOSED_OK+=" libbsd" +LIST_PACK_SUPPOSED_OK+=" indent" +LIST_PACK_SUPPOSED_OK+=" gnutls" +LIST_PACK_SUPPOSED_OK+=" c-ares" +LIST_PACK_SUPPOSED_OK+=" texinfo" +LIST_PACK_SUPPOSED_OK+=" python2" +LIST_PACK_SUPPOSED_OK+=" psutils" +LIST_PACK_SUPPOSED_OK+=" ncurses" +LIST_PACK_SUPPOSED_OK+=" libxslt" +LIST_PACK_SUPPOSED_OK+=" libxml2" +LIST_PACK_SUPPOSED_OK+=" libxext" +LIST_PACK_SUPPOSED_OK+=" libtool" +LIST_PACK_SUPPOSED_OK+=" libtiff" +LIST_PACK_SUPPOSED_OK+=" libssh2" +LIST_PACK_SUPPOSED_OK+=" libltdl" +LIST_PACK_SUPPOSED_OK+=" libjpeg" +LIST_PACK_SUPPOSED_OK+=" libidn2" +LIST_PACK_SUPPOSED_OK+=" jansson" +LIST_PACK_SUPPOSED_OK+=" shepherd" +LIST_PACK_SUPPOSED_OK+=" net-base" +LIST_PACK_SUPPOSED_OK+=" libxdmcp" +LIST_PACK_SUPPOSED_OK+=" libtasn1" +LIST_PACK_SUPPOSED_OK+=" libpaper" +LIST_PACK_SUPPOSED_OK+=" jemalloc" +LIST_PACK_SUPPOSED_OK+=" jbig2dec" +LIST_PACK_SUPPOSED_OK+=" gs-fonts" +LIST_PACK_SUPPOSED_OK+=" freetype" +LIST_PACK_SUPPOSED_OK+=" elfutils" +LIST_PACK_SUPPOSED_OK+=" binutils" +LIST_PACK_SUPPOSED_OK+=" automake" +LIST_PACK_SUPPOSED_OK+=" autoconf" +LIST_PACK_SUPPOSED_OK+=" alsa-lib" +LIST_PACK_SUPPOSED_OK+=" xorgproto" +LIST_PACK_SUPPOSED_OK+=" xcb-proto" +LIST_PACK_SUPPOSED_OK+=" linux-pam" +LIST_PACK_SUPPOSED_OK+=" libvorbis" +LIST_PACK_SUPPOSED_OK+=" libgcrypt" +LIST_PACK_SUPPOSED_OK+=" inetutils" +LIST_PACK_SUPPOSED_OK+=" findutils" +LIST_PACK_SUPPOSED_OK+=" e2fsprogs" +LIST_PACK_SUPPOSED_OK+=" diffutils" +LIST_PACK_SUPPOSED_OK+=" coreutils" +LIST_PACK_SUPPOSED_OK+=" util-linux" +LIST_PACK_SUPPOSED_OK+=" libxrender" +LIST_PACK_SUPPOSED_OK+=" libsndfile" +LIST_PACK_SUPPOSED_OK+=" libsigsegv" +LIST_PACK_SUPPOSED_OK+=" libfontenc" +LIST_PACK_SUPPOSED_OK+=" guile-json" +LIST_PACK_SUPPOSED_OK+=" fontconfig" +LIST_PACK_SUPPOSED_OK+=" util-macros" +LIST_PACK_SUPPOSED_OK+=" mkfontscale" +LIST_PACK_SUPPOSED_OK+=" linux-libre" +LIST_PACK_SUPPOSED_OK+=" ghostscript" +LIST_PACK_SUPPOSED_OK+=" docbook-xsl" +LIST_PACK_SUPPOSED_OK+=" docbook-xml" +LIST_PACK_SUPPOSED_OK+=" bash-static" +LIST_PACK_SUPPOSED_OK+=" libunistring" +LIST_PACK_SUPPOSED_OK+=" libgpg-error" +LIST_PACK_SUPPOSED_OK+=" bash-minimal" +LIST_PACK_SUPPOSED_OK+=" libsamplerate" +LIST_PACK_SUPPOSED_OK+=" libatomic-ops" +LIST_PACK_SUPPOSED_OK+=" e2fsck-static" +LIST_PACK_SUPPOSED_OK+=" wireless-regdb" +LIST_PACK_SUPPOSED_OK+=" python-wrapper" +LIST_PACK_SUPPOSED_OK+=" python-minimal" +LIST_PACK_SUPPOSED_OK+=" guile-readline" +LIST_PACK_SUPPOSED_OK+=" guile-gdbm-ffi" +LIST_PACK_SUPPOSED_OK+=" gettext-minimal" +LIST_PACK_SUPPOSED_OK+=" libpthread-stubs" +LIST_PACK_SUPPOSED_OK+=" openfwwf-firmware" +LIST_PACK_SUPPOSED_OK+=" glibc-utf8-locales" +LIST_PACK_SUPPOSED_OK+=" ath9k-htc-firmware" +LIST_PACK_SUPPOSED_OK+=" linux-libre-headers" +LIST_PACK_SUPPOSED_OK+=" guile-static-stripped" +LIST_PACK_SUPPOSED_OK+=" python-minimal-wrapper" +LIST_PACK_SUPPOSED_OK+=" pkg-config" +LIST_PACK_SUPPOSED_OK+=" libarchive" +LIST_PACK_SUPPOSED_OK+=" cyrus-sasl" +LIST_PACK_SUPPOSED_OK+=" tcsh" +LIST_PACK_SUPPOSED_OK+=" xmlto" +LIST_PACK_SUPPOSED_OK+=" icu4c" # ? +LIST_PACK_SUPPOSED_OK+=" mit-krb5" # ok ? +LIST_PACK_SUPPOSED_OK+=" help2man" +LIST_PACK_SUPPOSED_OK+=" mkfontdir" +LIST_PACK_SUPPOSED_OK+=" lvm2" +LIST_PACK_SUPPOSED_OK+=" eudev" +LIST_PACK_SUPPOSED_OK+=" procps" +LIST_PACK_SUPPOSED_OK+=" alsa-utils" +LIST_PACK_SUPPOSED_OK+=" boost" +LIST_PACK_SUPPOSED_OK+=" swig" +LIST_PACK_SUPPOSED_OK+=" doxygen" +LIST_PACK_SUPPOSED_OK+=" curl" +LIST_PACK_SUPPOSED_OK+=" nghttp2" +LIST_PACK_SUPPOSED_OK+=" openldap" +LIST_PACK_SUPPOSED_OK+=" git-minimal" + + +LIST_PACK_SUPPOSED_KO="" + +LIST_PACK_SUPPOSED_KO+=" libnl" +LIST_PACK_SUPPOSED_KO+=" crda" # depends on libnl +LIST_PACK_SUPPOSED_KO+=" cmake" +LIST_PACK_SUPPOSED_KO+=" guile-wm" +LIST_PACK_SUPPOSED_KO+=" guile-xcb" + +count_dependencies() +{ + local pack="$1" + local depsfile="$DEPENDENCIES_DIR/${pack}.dot" + guix graph -t bag-emerged $pack > $depsfile + count=$(cat $depsfile | grep "\->" | wc -l) + echo $count +} + +build_pack() +{ + local pack="$1" + local out_file=$(mktemp /tmp/test-guix.XXXXX) + local result=0 + + ./pre-inst-env guix build --target=aarch64-linux-gnu $pack > $out_file 2>&1 + result=$? + + if [ $result -eq 0 ]; then + rm -f $out_file + else + mv $out_file ${KO_OUT_LOG_DIR}/${pack}.log + fi + + return $result +} + +build_all_in_list() +{ + local list_pack="$@" + local status=unknown + + for pack in $list_pack; do + echo "" + echo "" + echo "--------------- package $pack ---------------" + echo "" + build_pack $pack + if [ $? -eq 0 ]; then + status="OK" + else + status="KO" + fi + + nb_deps="$(count_dependencies $pack)" + echo " package $pack is $status (and has $nb_deps dependencies)" + echo "" + echo "" + + add_package_status $pack $status $nb_deps + done +} + +if [ $# -ge 1 ]; then + EXEC_SUPPOSED_OK=0 + EXEC_SUPPOSED_KO=0 + while [ $# -ge 1 ]; do + case "$1" in + "--ok") + EXEC_SUPPOSED_OK=1 + ;; + "--ko") + EXEC_SUPPOSED_KO=1 + ;; + *) + echo "Unknown argument $1" + exit 1 + ;; + esac + shift + done +else + EXEC_SUPPOSED_OK=1 + EXEC_SUPPOSED_KO=1 +fi + +file_header + +if [ $EXEC_SUPPOSED_OK -eq 1 ]; then + section_header "Supposed OK Packages" + build_all_in_list $LIST_PACK_SUPPOSED_OK + section_footer +fi + +if [ $EXEC_SUPPOSED_KO -eq 1 ]; then + section_header "Supposed KO Packages" + build_all_in_list $LIST_PACK_SUPPOSED_KO + section_footer +fi + + diff --git a/deps.scm b/deps.scm new file mode 100644 index 0000000000..75e8f106fe --- /dev/null +++ b/deps.scm @@ -0,0 +1,184 @@ +(use-modules (guix) + (guix scripts build) + (gnu) + (ice-9 receive)) + +(define deps + '("sudo" + "guile-xcb" + "guile-wm" + "tzdata" + "guile-gdbm-ffi" + "gzip" + "expat" + "attr" + "gettext-minimal" + "m4" + "perl" + "gmp" + "acl" + "libcap" + "libsigsegv" + "pkg-config" + "zlib" + "libffi" + "glibc" + "bash-static" + "bison" + "texinfo" + "lzip" + "ed" + "libatomic-ops" + "libltdl" + "libunistring" + "libgc" + "linux-libre-headers" + "bzip2" + "bash-minimal" + "diffutils" + "binutils" + "findutils" + "guile" + "sed" + "make" + "gawk" + "xz" + "grep" + "file" + "coreutils" + "glibc-utf8-locales" + "libpng" + "freetype" + "libfontenc" + "mkfontdir" + "mkfontscale" + "guile-readline" + "lzo" + "rhash" + "libuv" + "libarchive" + "cmake" + "ath9k-htc-firmware" + "openfwwf-firmware" + "inetutils" + "tcsh" + "pcre" + "boost" + "swig" + "libnl" + "wireless-regdb" + "flac" + "libsndfile" + "libvorbis" + "libogg" + "xmlto" + "fftw" + "alsa-lib" + "alsa-utils" + "libsamplerate" + "lvm2" + "fuse" + "crda" + "which" + "help2man" + "indent" + "flex" + "gdbm" + "mit-krb5" + "openldap" + "cyrus-sasl" + "curl" + "icu4c" + "bdb" + "libev" + "jemalloc" + "jansson" + "c-ares" + "linux-pam" + "shishi" + "xtrans" + "libbsd" + "python-minimal-wrapper" + "xcb-proto" + "python-minimal" + "gs-fonts" + "fontconfig" + "libxrender" + "libxft" + "tk" + "xorgproto" + "libpthread-stubs" + "util-macros" + "libxau" + "libxext" + "libxcb" + "sqlite" + "libxdmcp" + "libx11" + "libpaper" + "jbig2dec" + "tcl" + "libjpeg" + "libtiff" + "psutils" + "ghostscript" + "groff" + "libgpg-error" + "libtasn1" + "libssh2" + "python2" + "gss" + "libgcrypt" + "nettle" + "libidn" + "nghttp2" + "libidn2" + "git-minimal" + "gnutls" + "guile-json" + "unzip" + "autoconf" + "automake" + "docbook-xml" + "libtool" + "python" + "python-wrapper" + "libxslt" + "libxml2" + "docbook-xsl" + "gperf" + "eudev" + "shadow" + "bash" + "shepherd" + "isl" + "net-base" + "procps" + "util-linux" + "e2fsprogs" + "e2fsck-static" + "guile-static-stripped" + "libelf" + "ncurses" + "mpc" + "bc" + "elfutils" + "mpfr" + "linux-libre")) + +(define store (open-connection)) + +(define arguments + (map (lambda (spec) + `(argument . ,spec)) + deps)) + +(run-with-store store + (mlet %store-monad + ((derivations -> + ((@@ (guix scripts build) options->derivations) + store + `((target . "aarch64-linux-gnu") + ,@arguments)))) + (mbegin %store-monad + (built-derivations derivations)))) diff --git a/gnu/system/examples/mini-beaglebone.scm b/gnu/system/examples/mini-beaglebone.scm new file mode 100644 index 0000000000..6ce0ab1b1c --- /dev/null +++ b/gnu/system/examples/mini-beaglebone.scm @@ -0,0 +1,61 @@ +;; This is an operating system configuration template +;; for a "bare bones" setup, with no X11 display server. + +(use-modules (gnu) (gnu bootloader u-boot)) +(use-service-modules networking ssh) +(use-package-modules bootloaders linux screen) + +(operating-system + (host-name "komputilo") + (timezone "Europe/Berlin") + (locale "en_US.utf8") + + ;; Boot in "legacy" BIOS mode, assuming /dev/sdX is the + ;; target hard disk, and "my-root" is the label of the target + ;; root file system. + (bootloader (bootloader-configuration + (bootloader u-boot-beaglebone-black-bootloader) + (target "/dev/vda"))) + + (kernel linux-libre-arm-omap2plus) + + ;; This module is required to mount the SD card. + (initrd-modules (cons "omap_hsmmc" %base-initrd-modules)) + + (file-systems (cons (file-system + (device (file-system-label "my-root")) + (mount-point "/") + (type "ext4")) + %base-file-systems)) + + ;; This is where user accounts are specified. The "root" + ;; account is implicit, and is initially created with the + ;; empty password. + (users (cons (user-account + (name "alice") + (comment "Bob's sister") + (group "users") + + ;; Adding the account to the "wheel" group + ;; makes it a sudoer. Adding it to "audio" + ;; and "video" allows the user to play sound + ;; and access the webcam. + (supplementary-groups '("wheel" + "audio" "video"))) + %base-user-accounts)) + + ;; Globally-installed packages. + (packages '()) + + ;; Add services to the baseline: a DHCP client and + ;; an SSH server. + (services (list + (service udev-service-type + (udev-configuration + (rules (list lvm2 fuse alsa-utils crda)))) + (agetty-service + (agetty-configuration + (extra-options '("-L")) + (baud-rate "115200") + (term "vt100") + (tty "ttyO0")))))) diff --git a/gnu/system/examples/mini.scm b/gnu/system/examples/mini.scm new file mode 100644 index 0000000000..f7c7b63308 --- /dev/null +++ b/gnu/system/examples/mini.scm @@ -0,0 +1,54 @@ +;; This is an operating system configuration template +;; for a "bare bones" setup, with no X11 display server. + +(use-modules (gnu)) +(use-service-modules networking ssh) +(use-package-modules linux screen) + +(define dummy-bootloader + (bootloader + (inherit grub-bootloader) + (installer #f))) + +(operating-system + (host-name "komputilo") + (timezone "Europe/Berlin") + (locale "en_US.utf8") + + ;; Boot in "legacy" BIOS mode, assuming /dev/sdX is the + ;; target hard disk, and "my-root" is the label of the target + ;; root file system. + (bootloader (bootloader-configuration + (bootloader dummy-bootloader) + (target "/dev/sdX"))) + (file-systems (cons (file-system + (device (file-system-label "my-root")) + (mount-point "/") + (type "ext4")) + %base-file-systems)) + + ;; This is where user accounts are specified. The "root" + ;; account is implicit, and is initially created with the + ;; empty password. + (users (cons (user-account + (name "alice") + (comment "Bob's sister") + (group "users") + + ;; Adding the account to the "wheel" group + ;; makes it a sudoer. Adding it to "audio" + ;; and "video" allows the user to play sound + ;; and access the webcam. + (supplementary-groups '("wheel" + "audio" "video"))) + %base-user-accounts)) + + ;; Globally-installed packages. + (packages '()) + + ;; Add services to the baseline: a DHCP client and + ;; an SSH server. + (services (list + (service udev-service-type + (udev-configuration + (rules (list lvm2 fuse alsa-utils crda)))))))