From patchwork Wed Aug 21 08:53: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: 15065 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 2F29517264; Wed, 21 Aug 2019 09:57:57 +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 E67FE1724B for ; Wed, 21 Aug 2019 09:57:56 +0100 (BST) Received: from localhost ([::1]:45614 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MRI-0000Ii-1e for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 04:57:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58466) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MPT-0006QV-Qt for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MPS-0005BM-MU for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54062) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MPS-0005BE-JG for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MPS-0006X3-G8 for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 01/61] gnu: perl: Fix cross-compilation. References: <87zhlwmpmy.fsf@gmail.com> In-Reply-To: <87zhlwmpmy.fsf@gmail.com> Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:56: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.156637770924512 (code B ref 36477); Wed, 21 Aug 2019 08:56:02 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:55:09 +0000 Received: from localhost ([127.0.0.1]:34540 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MOa-0006NC-FH for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:08 -0400 Received: from mail-wr1-f45.google.com ([209.85.221.45]:43103) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MOY-0006MQ-LY for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:07 -0400 Received: by mail-wr1-f45.google.com with SMTP id y8so1217864wrn.10 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55: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:mime-version :content-transfer-encoding; bh=w0gWYQ/QVdcYY1jpEJkjDaqeBI/Fgiu7zNjhFXu0jBY=; b=SCtpNlPc8TR3A8nk1N3sWoc+7BPg7fVeQUMFnny0tqWb9NvNCD1gUZazN8bGmb6HT1 GTP9twPKvG5e33e3wySkcdr3RjNfWzNkl91PsoYaGI6u01mc7IUJi+ms5CE0ztbaROSb BoQgrGIU9JtwsAH4mroJDKVBryC7bHH5PrXxYBFgoFjzXuvug08XWQJS+ZqTky1CqOC3 NR2583jpJLM9LaFaf71KcRziqLoWvrYnSCHEtaz0GkRPdeiMRlHs4u1qPVxeL4TfGUpw kgB9LgudqpAQKAWu8wo3+wBVvBxhqzdE4dGKHfYrT2owQbAbtQvAfCRlJhjz+lCawpzY LJbg== 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:mime-version :content-transfer-encoding; bh=w0gWYQ/QVdcYY1jpEJkjDaqeBI/Fgiu7zNjhFXu0jBY=; b=uOnVFewNmQWARCpG4gssH7cSgcNOBkeBjQbJHhxjcA58wyorO8Y48D2Pt5uVtLd6Bx X9bzhC1KDTrlUtLFlvxGbnQPgN1MOiP7nJGWhr6pv4GsbIYztqgQ4yWmaSVKHFTEKxKF fLC0jzcvkoNVi9BssKwPkfzOBVvjcDC3qMb9bwhE61argwiYWnz8GWSqTwHSn4eswFLz ZqLJXWRcSKJNl1c7NBBpkYo7eJUItCryCm+5wshfbePFvNdNo30eEi4i/hCS/q2VFUPE nCdTAI0ceJg+ushzDZYLhyvxYaJBnXw5iYI7SirZe1kavRLUVCOHgenrNDaCArSfSWrz uSGg== X-Gm-Message-State: APjAAAVOkFP0mr8Vg7Arr4OUOQBOmfkSTNYHVeErS2n2T8+EsaAzqg5c yw88hCFI8B22QjRtuak2cH7gr0/CeMc= X-Google-Smtp-Source: APXvYqxkhftmvzQWzbyG3txGRuhpQUwy8cqR+E4gZmL13XPefNTkla0YZIngySSWLbQSXR5IKyIeUw== X-Received: by 2002:a5d:554a:: with SMTP id g10mr445501wrw.9.1566377700523; Wed, 21 Aug 2019 01:55:00 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.54.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:54:59 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:53:55 +0200 Message-Id: <20190821085455.18508-1-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 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/perl.scm (perl)[arguments]: Use cross-libc instead of libc when cross-compiling. --- gnu/packages/perl.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index a3f6e5d050..275cb20d89 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -22,6 +22,7 @@ ;;; Copyright © 2018, 2019 Pierre Neidhardt ;;; Copyright © 2018 Kei Kebreau ;;; Copyright © 2019 Alex Griffin +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -81,7 +82,7 @@ "perl-reproducible-build-date.patch")))) (build-system gnu-build-system) (arguments - '(#:tests? #f + `(#:tests? #f #:configure-flags (let ((out (assoc-ref %outputs "out")) (libc (assoc-ref %build-inputs "libc"))) @@ -130,7 +131,9 @@ (add-after 'install 'remove-extra-references (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (libc (assoc-ref inputs "libc")) + (libc (assoc-ref inputs + ,(if (%current-target-system) + "cross-libc" "libc"))) (config1 (car (find-files (string-append out "/lib/perl5") "^Config_heavy\\.pl$"))) (config2 (find-files (string-append out "/lib/perl5") From patchwork Wed Aug 21 08:53: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: 15110 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 A52E017264; Wed, 21 Aug 2019 10:09: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,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 54BA61724B for ; Wed, 21 Aug 2019 10:09:59 +0100 (BST) Received: from localhost ([::1]:46004 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0Mcw-0000A8-Du for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 05:09:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58490) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MPU-0006RY-Gn for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MPT-0005Bd-36 for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54063) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MPT-0005BX-0C for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MPS-0006XB-Ur for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 02/61] gnu: python: Fix cross compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:56: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.156637771624583 (code B ref 36477); Wed, 21 Aug 2019 08:56:02 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:55:16 +0000 Received: from localhost ([127.0.0.1]:34546 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MOe-0006Nh-1B for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:16 -0400 Received: from mail-wr1-f52.google.com ([209.85.221.52]:43111) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MOZ-0006MZ-Au for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:07 -0400 Received: by mail-wr1-f52.google.com with SMTP id y8so1217941wrn.10 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55: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=D540Hb79nrpw2F38kL9MlC/hZ7+7DhkC6eUKobdy75w=; b=L7VJN9LxDDBBb7DGpyd32dWQ3ouGn9DvEKh2LmNVg43K/8jLULx/X1/6GJ4QvOBFpt GCcYMUCu1mI2V6h3fYGWUs9pMRPDNEca+T+oOPx5xxcrjV54/i7aewUIIcr5LhkHC5jK ZvFncSJ6zUCsyfZ7XPO6sfrZ23HCYHiCacY2oTesCDZglTQgF/kja6kDHFkSo6ICj8Q3 bKzMlHWuCJduFfg6RjDDbu1+LDiAhIzE8RmEb2Z8QE4Et9OeEUmf87ri2JJF1kdp1bHi ECuB/7W5jm3A00sXKwnmNSA6jo1uuhvW5LD6G/cZ5pHcTWKs/kL+XavwM1Bd4bOyAOZw rBxQ== 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=D540Hb79nrpw2F38kL9MlC/hZ7+7DhkC6eUKobdy75w=; b=Vh7yHKaA+Ra13XZLPUg/sWmfzbdfkFW4Kbn4mpQVSIeCtAElhmvq71KkkzHc3D4Uhq PLEr2i9pi5yUxhWJOPUA+KFBHI/ZsAm0GdSs2YHpjKeRXJFpQgpk0gfmHC3OAK7oaSWg lMbt4ahNbxroIrEwkUqX6psqLM1hhyYjvV/s9YHgPcZWZp5816sR+GyhGggBvno+a80Y iXBfop8KGOGkPFtKmo7bRDii4suN9dqN6X55TW+lPlKmEAP/oQQW4Nuw9vxWDB9X62g5 XR6DzEYXsjA9L3PAuTEYA71zrjdJlOVt8sfafQsXiH3sl7J/D6dtPzIwoFYVhjWoBE7/ +KWQ== X-Gm-Message-State: APjAAAWBPKHYUSLUo1m4xVKknpPnpyeVxFrNdu4uWngBtUUq9hT0Ewqs kxNCKkXOsgGNm5Y7YMxZvFpkv5ihaZs= X-Google-Smtp-Source: APXvYqwdQYzDSJv+/JmtdNWSGV+JmBsWUXxAvxRvl2Ok5/+AbmOVVViJaZiaVmszNzFKmG9i/fdllQ== X-Received: by 2002:a5d:4f81:: with SMTP id d1mr39734852wru.177.1566377701355; Wed, 21 Aug 2019 01:55:01 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:00 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:53:56 +0200 Message-Id: <20190821085455.18508-2-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-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/python.scm (python-2.7)[arguments]: Add a configure flag to disable a check failing when cross-compiling. This is covered here: https://lists.yoctoproject.org/pipermail/poky/2013-June/008997.html, [native-inputs]: Add self and which when cross-compiling, (python-3.7)[arguments]: Refer to native python when cross-compiling. --- gnu/packages/python.scm | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 9fec18287e..09c1f7d716 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -38,7 +38,7 @@ ;;; Copyright © 2017 Frederick M. Muriithi ;;; Copyright © 2017, 2018 Adriano Peluso ;;; Copyright © 2017 Ben Sturmfels -;;; Copyright © 2017, 2018 Mathieu Othacehe +;;; Copyright © 2017, 2018, 2019 Mathieu Othacehe ;;; Copyright © 2017 José Miguel Sánchez García ;;; Copyright © 2017 Roel Janssen ;;; Copyright © 2017, 2018 Kei Kebreau @@ -150,6 +150,13 @@ "INSTALL=install -c" "MKDIR_P=mkdir -p" + ;; Disable runtime check failing if cross-compiling, see: + ;; https://lists.yoctoproject.org/pipermail/poky/2013-June/008997.html + ,@(if (%current-target-system) + '("ac_cv_buggy_getaddrinfo=no" + "ac_cv_file__dev_ptmx=no" + "ac_cv_file__dev_ptc=no") + '()) (string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out") "/lib")) ;; With no -j argument tests use all available cpus, so provide one. @@ -292,7 +299,12 @@ ("tcl" ,tcl) ("tk" ,tk))) ; for tkinter (native-inputs - `(("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config) + ;; When cross-compiling, a native version of Python itself is needed. + ,@(if (%current-target-system) + `(("self" ,this-package) + ("which" ,which)) + '()))) (native-search-paths (list (search-path-specification (variable "PYTHONPATH") @@ -388,13 +400,16 @@ data types.") (if (null? opt) "none" (car opt))) (for-each (lambda (file) (apply invoke - `(,(string-append out "/bin/python3") - ,@opt - "-m" "compileall" - "-f" ; force rebuild - ;; Don't build lib2to3, because it's Python 2 code. - "-x" "lib2to3/.*" - ,file))) + `(,,(if (%current-target-system) + "python3" + '(string-append out + "/bin/python3")) + ,@opt + "-m" "compileall" + "-f" ; force rebuild + ;; Don't build lib2to3, because it's Python 2 code. + "-x" "lib2to3/.*" + ,file))) (find-files out "\\.py$"))) (list '() '("-O") '("-OO"))) #t))))))) From patchwork Wed Aug 21 08:53:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15067 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 7E66917264; Wed, 21 Aug 2019 09:58:06 +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 4166E1724B for ; Wed, 21 Aug 2019 09:58:06 +0100 (BST) Received: from localhost ([::1]:45620 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MRR-0000ZZ-DO for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 04:58:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58503) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MPV-0006SX-4i for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MPT-0005C3-JU for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54064) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MPT-0005Bu-GV for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MPT-0006XI-DR for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 03/61] gnu: tcl: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:56: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.156637771624596 (code B ref 36477); Wed, 21 Aug 2019 08:56:03 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:55:16 +0000 Received: from localhost ([127.0.0.1]:34553 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MOi-0006OS-7w for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:16 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:44325) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MOa-0006Mq-6m for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:08 -0400 Received: by mail-wr1-f68.google.com with SMTP id p17so1212456wrf.11 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55: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; bh=IWtQINeWsKzP+IVgJ6TBTzhjdgsHSp0cTxl3au6lvZI=; b=bwY7hszuvkrpCOwaJ9OM3lG2/OcD8yi9OEUhjLz6RQPFptrSXhkwkYav8Jfr8bvL7H bhCu0ppoNol8Wg92Afo/RcTSnYznYgXzIyaPojxfk9Q27GckebjOjR8ClIpReKAEM7/O qxRZTxchsAZuwbtw7A43PJP65Ume1h1Pg45yLH9hkc49erb6NH6tBcim/kbTuZPBdDPU 63huhCoXe25w1IVyEiZ1kMfXVcYV3PcQ6czODCEzpdulpcDS54H6Xz+YCBK+OEQT3Do7 WYwkaHqv+zTRftU0grHoyskeODdmEOUi1cPNsIXN6MSGAZgzILgRthAhqo8RdWs6+wye SmFg== 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; bh=IWtQINeWsKzP+IVgJ6TBTzhjdgsHSp0cTxl3au6lvZI=; b=qckLPoM9VlJJejGnF3WM4UUpKvuFrhvCEyKx3zsH7ywKoRqbsrV/ZegNRQskotZH13 URJVb5gszN36m1hkHRt6R4ll3cJswJ5ck/BlwVmqdh+DVSfVQfLxYjxqb6ChwgTpfwE3 KIxPS8dq1jaOPgGSYYY4gdU0DHTfmbT75KL4HzHjoQRRyN2rgSKr+C+ELZCfoldaeKx9 0UGc10diro/fwBqgUfGVRlzIXaBfLQa8EALyUEo7K/Wj3M9/PxewCka2bCYqhZvgJKqH UMr4syHk3GCajrisccKMNBeMLFVrWwrXL3O7qR2/xmWjFzLXzZgMFxys7yv7p/IErxpW 9dig== X-Gm-Message-State: APjAAAXa3UakvL8PyA6kundi+zemfZKwwZasWhMADA8++hhPOhLm+63W fwUozCfNbp81ZeSlOM+fVWY/nMvPRDk= X-Google-Smtp-Source: APXvYqzEcjG9M732LCTbRt6TVfKOx9xfS3nj4cmVGVJmTCCdK9+mPGlPmi2pUSY5VfJCdd8OKg4cGQ== X-Received: by 2002:adf:e5cd:: with SMTP id a13mr38170803wrn.316.1566377702253; Wed, 21 Aug 2019 01:55:02 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:01 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:53:57 +0200 Message-Id: <20190821085455.18508-3-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-1-m.othacehe@gmail.com> 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/tcl.scm (tcl)[arguments]: Add configure flags to fix cross-compilation. --- gnu/packages/tcl.scm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/gnu/packages/tcl.scm b/gnu/packages/tcl.scm index 21ca185066..96f41e7928 100644 --- a/gnu/packages/tcl.scm +++ b/gnu/packages/tcl.scm @@ -53,7 +53,7 @@ "0kjzj7mkzfnb7ksxanbibibfpciyvsh5ffdlhs0bmfc75kgd435d")))) (build-system gnu-build-system) (arguments - '(#:phases (modify-phases %standard-phases + `(#:phases (modify-phases %standard-phases (add-before 'configure 'pre-configure (lambda _ (chdir "unix") #t)) (add-after 'install 'install-private-headers @@ -73,9 +73,16 @@ ;; PREFIX/share/man. The 'validate-documentation-location' phase is ;; not able to fix this up because the default install populates both ;; PREFIX/man and PREFIX/share/man. - #:configure-flags (list (string-append "--mandir=" - (assoc-ref %outputs "out") - "/share/man")) + #:configure-flags + (list (string-append "--mandir=" + (assoc-ref %outputs "out") + "/share/man") + ;; This is needed when cross-compiling, see: + ;; https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=719247 + ,@(if (%current-target-system) + '("tcl_cv_strtod_buggy=1" + "ac_cv_func_strtod=yes") + '())) ;; XXX: There are a few test failures (related to HTTP, most ;; likely related to name resolution), but that doesn't cause From patchwork Wed Aug 21 08:53:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15075 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 DFC8D17264; Wed, 21 Aug 2019 09:59: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 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 A42501724B for ; Wed, 21 Aug 2019 09:59:09 +0100 (BST) Received: from localhost ([::1]:45656 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MSS-0001oQ-P1 for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 04:59:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58509) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MPV-0006Sv-Bx for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MPU-0005CP-0P for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54065) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MPT-0005CK-TL for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MPT-0006XP-Ru for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 04/61] gnu: tk: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:56: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.156637771724604 (code B ref 36477); Wed, 21 Aug 2019 08:56:03 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:55:17 +0000 Received: from localhost ([127.0.0.1]:34555 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MOi-0006Of-OE for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:17 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:37065) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MOb-0006Ms-MZ for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:10 -0400 Received: by mail-wm1-f66.google.com with SMTP id d16so1285091wme.2 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55: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; bh=7tF1fTOEBKXljhu4lCr08LKh7FRA9ixLBCnkr5U9FNo=; b=iLP1OGLVKR1GQGHgWWA/6JRwJTSDaZl3rQrVDbjrxF84xg/JkSj24/zdJ1f41scv8x yn7UKk+o3ifemQNUgfGi0bL0cLganV/K1n20RCwDzKBQsqTOr7ovEoXmcih4JgvpcQRn 8u7FEM1o5HTLz9owfHULmSe9IdWIj3cUg4z4gT0REVZgDjFAImydee6Giw+E9tUT402t 02chkk8M653dpMRI/MPhkmFMfsnxSisumyJ5z7rlntA+SHSeqja24e2Ni/ZyYx0pA4Gj I5vfiAvaYS0jdFrvfBcMfKO2kDK5Svp8uXZbEp20fQK9dDhV4FGFPKnuJ0ceoLsXSdeF 53kA== 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; bh=7tF1fTOEBKXljhu4lCr08LKh7FRA9ixLBCnkr5U9FNo=; b=E76vKqda3fDDx2kBACPB36WN+KDki5sjZaZyMtVjdROSxTV77KyKChqnk9Ip9yv0m1 j8+MSUrnSxhJbBRrb9TA30wFxsaNg1IYQa+jBoKtSHcc0qdQktOdNIfUIPB3sQfVbNVj cRmTnkPcpbUTs1ehUmGIy1nRFEV5o7ewtm0EFarV9FNJGbfe+WQ4jVfhqouefRZsBiqj eBo3LUSq0VC+UI/BOetAMfg8YGBBpbCaNgvja9khevybYs9c8+G9+YXas72sqs1muUth 2SpdgC9qNDqZ5/O6mr+RLR6YXoZxqI/RHMjAmbou19StYvjIemU82Swd1DsM0wXugBvq L3gg== X-Gm-Message-State: APjAAAWTkxkE3u9qrffcTPu4dPbunyGtL+veS0avljGCIF7Z9NGtHRN3 +ltuZCyn+nEiyu3dKvybn+kX8bJbTkE= X-Google-Smtp-Source: APXvYqzmkjEPM3pFS0OJHrMQjee3lOgrFh2KpDxLpDEwNSX08NKsWB6PpkN1L4/gY8QXMgS6pRqgUg== X-Received: by 2002:a7b:cb0f:: with SMTP id u15mr4418451wmj.173.1566377703214; Wed, 21 Aug 2019 01:55:03 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:02 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:53:58 +0200 Message-Id: <20190821085455.18508-4-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-1-m.othacehe@gmail.com> 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/tcl.scm (tk)[arguments]: Add configure flags to fix cross-compilation. --- gnu/packages/tcl.scm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/gnu/packages/tcl.scm b/gnu/packages/tcl.scm index 96f41e7928..9ef95b42ed 100644 --- a/gnu/packages/tcl.scm +++ b/gnu/packages/tcl.scm @@ -186,9 +186,16 @@ X11 GUIs.") "/lib -lfontconfig"))) #t)))) - #:configure-flags (list (string-append "--with-tcl=" - (assoc-ref %build-inputs "tcl") - "/lib")) + #:configure-flags + (list (string-append "--with-tcl=" + (assoc-ref %build-inputs "tcl") + "/lib") + ;; This is needed when cross-compiling, see: + ;; https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=719247 + ,@(if (%current-target-system) + '("tcl_cv_strtod_buggy=1" + "ac_cv_func_strtod=yes") + '())) ;; The tests require a running X server, so we just skip them. #:tests? #f)) From patchwork Wed Aug 21 08:53: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: 15078 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 75FF917264; Wed, 21 Aug 2019 09:59:19 +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 445281724B for ; Wed, 21 Aug 2019 09:59:19 +0100 (BST) Received: from localhost ([::1]:45662 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MSc-00025J-Kd for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 04:59:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58514) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MPV-0006TE-Io for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MPU-0005Cr-F5 for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54066) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MPU-0005Cl-Bl for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MPU-0006XX-9d for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 05/61] gnu: libxslt: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:56: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.156637771724619 (code B ref 36477); Wed, 21 Aug 2019 08:56:04 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:55:17 +0000 Received: from localhost ([127.0.0.1]:34558 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MOj-0006Om-3h for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:17 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:45388) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MOb-0006Mt-Sh for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:10 -0400 Received: by mail-wr1-f67.google.com with SMTP id q12so1205849wrj.12 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55: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; bh=twpDy+h7GbI01UT/v0+ICv0R7FOBDUxmrScVXQYjaFk=; b=N71nHPQi4ruPIcDpXmhN4GcizMPqJ2JvXLyJeazV+CqzvF+JKQ4tHaHDbUD7eIIWAW DYiqm+4SiIXPtaNw0kySmIP1AjQb/lBecw1i2jIHQ1k2nPbFglgvbLowjRfAyb16uFfR fl0Yrp+hG+Z03GVJK7s87BjKUh0/rcteKQVqJpKLrKqCOBByVHPwIh6/1DhE0T6fq/Fi Hn8+B4iDrOF5IpEpbikCAIv2bFfz2s9J5pHqGpVli+pSYY0AB6TuPPDLQRsNx0tqLjCi LsHxsCPt6hzjBKKiBNCtu7DqBqGijUZV8WRzBln38yjgymx3enyWaBKEZXLzyqth6ykj TxBA== 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; bh=twpDy+h7GbI01UT/v0+ICv0R7FOBDUxmrScVXQYjaFk=; b=i5hzEA+6SxTmb8/i3txJscYjGAjYH0iz4VH+xo/+nH8iAJgKM/w3lwgAjaImrEWAMr u8uUrwxWbhmawzsouyNqMgBdQMt9oc1wgTV5BlYJ+eB+fsLcno3vxsHQ+VoNTh+sIckF mAkzA+bXeVehM8OJHNsFNu1322zV6ygs9FouMh3uSr4MBp9dqNpf7nQIaT24YBq01kh6 82MXA6T9g7+2Xw1ylll678Hhaudmy2i0lD6H4jtki96tXQ2Hcu78YNN/oFlJ5/ePjQ8u yPgU1TctOM4apvw4Zi61zRU8PuPs1WcQcB4z1tr4hvHeFX6GBjOq9yiwzjPXutlYvayk ILeg== X-Gm-Message-State: APjAAAViJLyNgws9LzhKZXFKHuYgixmzU3e2LvW+wUqq4PmWOFsIkxqN 5Ig1jkKxgGxqru0U1Qj2IougtFnFKrQ= X-Google-Smtp-Source: APXvYqzGTSJTMp10gTfdoG6i/xT60jSlTVQXRoVd+R3jvKBgrpj9TOne39Bj6qUhTsAWb0UnehaoSg== X-Received: by 2002:a5d:5408:: with SMTP id g8mr32765154wrv.201.1566377703923; Wed, 21 Aug 2019 01:55:03 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:03 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:53:59 +0200 Message-Id: <20190821085455.18508-5-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-1-m.othacehe@gmail.com> 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/xml.scm (libxslt)[native-inputs]: Add pkg-config. --- gnu/packages/xml.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 78b9b713e5..ffe81fa68b 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -213,6 +213,8 @@ project (but it is usable outside of the Gnome platform).") ("libxml2" ,libxml2) ("python" ,python-minimal-wrapper) ("zlib" ,zlib))) + (native-inputs + `(("pkg-config" ,pkg-config))) (description "Libxslt is an XSLT C library developed for the GNOME project. It is based on libxml for XML parsing, tree manipulation and XPath support.") From patchwork Wed Aug 21 08:54:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15081 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 D03C017264; Wed, 21 Aug 2019 09:59: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 9383F1724B for ; Wed, 21 Aug 2019 09:59:29 +0100 (BST) Received: from localhost ([::1]:45668 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MSm-0002NR-IS for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 04:59:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58535) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MPW-0006UG-7U for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MPU-0005DF-TT for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54067) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MPU-0005D7-Q9 for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MPU-0006Xe-Nl for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 06/61] gnu: xorg: Fix cross-compilation of multiple packages. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:56: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.156637771824630 (code B ref 36477); Wed, 21 Aug 2019 08:56:04 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:55:18 +0000 Received: from localhost ([127.0.0.1]:34560 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MOj-0006P1-IR for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:18 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:46832) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MOd-0006Mx-NJ for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:12 -0400 Received: by mail-wr1-f66.google.com with SMTP id z1so1205943wru.13 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55: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; bh=CzmXvH9sLbiBiry88aGjqDYH5AcO7nsanJIa88F0VwU=; b=u6wW58jJFbc9hfYlO+aakRdXyQLURQxMV+2dTmRBTdNQHlCefm24/orIXUUCnuWaZ8 8m2bCg1yr29m83tx3tq/urhV9A3u7GJ8v1VRQfF3kuEduJ6vHhHpRKS0AbjT2i2ou4BU bQ6lflaC5hbwkja/SigMAUsT22VU2LpRefl7NBmTPRgGTaobEr9/2O9QN0LsWZWaF4it YgK8itR/+1lTp7X7v433xu0j+z84lmz3zb8zHw8KuDnDITyw+JW8aeWoRIIth88wn2B1 aRjoqSeA7dw2PwM7kYr/ISVfLrqVAq5qrbP3bL3UwH8z0vfpHi2kINN261OkbWmaThYX pRbQ== 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; bh=CzmXvH9sLbiBiry88aGjqDYH5AcO7nsanJIa88F0VwU=; b=LxozTvfCNeroSEXXLx/in3oSbqI6AbqRAhsYVGdWeZFVp+sTTZAa/idTBFEbxgH4IW pggW8SnyhfLjRSN8KGltkPdAXHfFF8D0j9W8r0F5d9jmj2saCTCNLD8GB1DeNd4xFtnt ++rnQSbMQ3+GLIM+oQ4OuhVVw5B5faaB2WSlTW4rykZmH3rfCqr438wqZwNAyadYAj31 TI2PMJ0I2iXRAGxrViKRQSBD/fHI8aGFGeXHFVp2S7IujFPLTbN8tLnPlWkXcjSJTdsT KU33gOJpq5b3Q95jvjQVD28gnctpk7e9KlRe5YG7RJBRCCjELNd2I2CcJLfWjzlJRJMC SEOA== X-Gm-Message-State: APjAAAUc+OtJy8xNlFifqkqlfr0DTxezkl6tDvC/UdcpTqU5Uf0Vdr3+ sI3GCMTBSCz5VAhS6JlZZmYP+YsAVlM= X-Google-Smtp-Source: APXvYqzNSA1B+OnzNb9TMYoumXKHeliqbGxVvPpjuNIfpBs1VJV1jiymNeh/pcsVhQGXTk14oYpLqQ== X-Received: by 2002:a5d:4cc5:: with SMTP id c5mr11750490wrt.278.1566377704826; Wed, 21 Aug 2019 01:55:04 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:04 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:00 +0200 Message-Id: <20190821085455.18508-6-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-1-m.othacehe@gmail.com> 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 (libxext)[arguments]: Disable zero malloc check that fails when cross-compiling, (libxrender)[arguments]: ditto, (libx11)[arguments]: ditto. --- gnu/packages/xorg.scm | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index e4848b7bee..aa89dafe90 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -4552,6 +4552,13 @@ cannot be adequately worked around on the client side of the wire.") (base32 "0azqxllcsfxc3ilhz6kwc6x7m8wc477p59ir9p0yrsldx766zbar")))) (build-system gnu-build-system) + ;; Disable zero malloc check that fails when cross-compiling. + (arguments + `(#:configure-flags + (list + ,@(if (%current-target-system) + '("--disable-malloc0returnsnull") + '())))) (propagated-inputs `(("xorgproto" ,xorgproto))) (inputs @@ -4637,6 +4644,13 @@ cannot be adequately worked around on the client side of the wire.") (base32 "0j89cnb06g8x79wmmnwzykgkkfdhin9j7hjpvsxwlr3fz1wmjvf0")))) (build-system gnu-build-system) + ;; Disable zero malloc check that fails when cross-compiling. + (arguments + `(#:configure-flags + (list + ,@(if (%current-target-system) + '("--disable-malloc0returnsnull") + '())))) (propagated-inputs `(("xorgproto" ,xorgproto))) (inputs @@ -5245,16 +5259,22 @@ draggable titlebars and borders.") (outputs '("out" "doc")) ;8 MiB of man pages + XML (arguments - '(#:configure-flags (list (string-append "--mandir=" - (assoc-ref %outputs "doc") - "/share/man")))) + `(#:configure-flags + (list (string-append "--mandir=" + (assoc-ref %outputs "doc") + "/share/man") + ;; Disable zero malloc check that fails when cross-compiling. + ,@(if (%current-target-system) + '("--disable-malloc0returnsnull") + '())))) (propagated-inputs `(("xorgproto" ,xorgproto) ("libxcb" ,libxcb))) (inputs `(("xtrans" ,xtrans))) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config) + ("xorgproto" ,xorgproto))) (home-page "https://www.x.org/wiki/") (synopsis "Xorg Core X11 protocol client library") (description "Xorg Core X11 protocol client library.") From patchwork Wed Aug 21 08:54:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15069 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 6505B17264; Wed, 21 Aug 2019 09:58: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,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 13BF11724B for ; Wed, 21 Aug 2019 09:58:16 +0100 (BST) Received: from localhost ([::1]:45624 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MRb-0000pn-3W for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 04:58:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58544) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MPW-0006V3-NP for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MPV-0005Dg-DO for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54068) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MPV-0005DV-8c for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MPV-0006Xm-5t for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 07/61] gnu: libgpg-error: Fix cross compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:56: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.156637772424682 (code B ref 36477); Wed, 21 Aug 2019 08:56:05 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:55:24 +0000 Received: from localhost ([127.0.0.1]:34570 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MOq-0006Q0-63 for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:24 -0400 Received: from mail-wr1-f46.google.com ([209.85.221.46]:43115) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MOd-0006Mw-JV for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:12 -0400 Received: by mail-wr1-f46.google.com with SMTP id y8so1218162wrn.10 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55: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=Yu+mVm4DlZTdhtvw7aRa+x+FiWIj32zn2Tujke55UQ4=; b=MbuSQQhGcgniHkqpDHLKVRB2XdPNUByhdte6R5lbjaIXtzkv4arwzEfws9t9y4lVhu HQ8Lf9RhletR8s5VkgBo8NlUG7XhEdnQ56rbGJYraja4qXN6KI3AwTuhAB4GC7AqTfmS DLfcm9lFMeX8pTxYRdNbDOujyXJg+klgHIQKWvSFp0DquQhLY3VDtVGO61aM0BU+6/1b 9k07MdCnijMaIB3IBFVzM0aL43IfFbDfZ56JG2+eWqNDHMeXHcEzkFrvDWy1GZaKAi0k HJLDWrslRzSyvxP/ACOoR9Obf4RFTqvtzCtNfVX6r8iM70TgaxgmbO55NFXpByf8y+DF qRMw== 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=Yu+mVm4DlZTdhtvw7aRa+x+FiWIj32zn2Tujke55UQ4=; b=C57uAkmcfV0IQE53GLTyxR7iqelIjcn6n0zd4RuK079gHcO8IHMVCBW8ujpVLLfddY MFFH8M5zf5JkARNGTcNz96A4euDbuH0GdMvrMTrZYL2FFWv5GOEn16tMimk5j8nj6ET2 0nHy908ZFtqsnW/NL0lL1tknA1KAmC+B8NSHJ7HnaHEywcbcIUROAOhQKbwzrerxnUXX 0nW6xX535DP7OJgaREAT3ZmbxSPnthwVRF15boIh8jSWsOjNtejAaGgpyyKD0Gb4qyJH DXH5t0cqRhbNYsVkxYJYM5pr1lNrDc0KUWcrVW9dtMUopdPZ5HQGQZOxkucB/HZW20Su fP1Q== X-Gm-Message-State: APjAAAUlnBfW4t2TKZWyYkk2B+iveU1hRdQDt90tiC34rJMMOpTKusXm b3UBadHshlUGQfO+/kTcJlOu+fu0YMM= X-Google-Smtp-Source: APXvYqx8+jNB/OcGr7ey2zSur++yjV7Y+TkCEuG8FPxwejiSUYCNohEgDZ2g2VkGClBxveTj2TM8uw== X-Received: by 2002:a5d:6a45:: with SMTP id t5mr10133292wrw.228.1566377705623; Wed, 21 Aug 2019 01:55:05 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:05 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:01 +0200 Message-Id: <20190821085455.18508-7-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-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 Wed Aug 21 08:54: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: 15071 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 2A26F17264; Wed, 21 Aug 2019 09:58:26 +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 795341724B for ; Wed, 21 Aug 2019 09:58:25 +0100 (BST) Received: from localhost ([::1]:45630 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MRk-00015V-Rc for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 04:58:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58572) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MPY-0006Yk-D4 for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MPV-0005E7-VC for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54069) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MPV-0005E2-RZ for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MPV-0006Xt-Nx for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 08/61] gnu: python: Further cross-compilation fixes. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:56: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.156637772524698 (code B ref 36477); Wed, 21 Aug 2019 08:56:05 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:55:25 +0000 Received: from localhost ([127.0.0.1]:34572 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MOq-0006Q3-HR for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:25 -0400 Received: from mail-wr1-f47.google.com ([209.85.221.47]:42074) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MOe-0006N4-Qc for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:14 -0400 Received: by mail-wr1-f47.google.com with SMTP id b16so1223206wrq.9 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55:12 -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; bh=o/j8nSxxUjnuTCaaaM9Grbu9vke069Opgv2lIs2rh1k=; b=HJ50M4AeWRBuvmbWGIsl9yDp650EFl4hxa+XYfbjcRDLV8GKecWLAJhFIuxgyyYcaX OVdmNDJzwH6d0ef1pTXH3+YeSDpkYpIddT9DRUCPnkH1DUhC4b9xdG9KCDo356dxMiGZ TSiAQJ6k/xuK7rZFQCu5x4AloWy2Y0pci1hKaWerTgYeu8Tb1LczSlnNuklkAFxbl5NV T/dRqA3uq9I6EOwHOHuIo/ZECMod/Kj5W54lHv/mY98rpkyCbDdJWZgeq8vlw9Wo/vQs VFh1tfU3/rE235o/9tOsh/zOAKzaOV0jZQP1QePuEkwrMP+RB/3Zpkf6zNaIHpSaZLUP NAiQ== 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; bh=o/j8nSxxUjnuTCaaaM9Grbu9vke069Opgv2lIs2rh1k=; b=aO4V0ivyCO1BoNagnFcYQrsStNAJtnMAE8xbnzuUCKrMeUjAA0GZflCkmn6Rh+M2U3 E0USX+pU0FlqodADsOPBEvQBpRc4sCqIIDe6QP3QuCY1GDVkfficx1RthU6z2WQV6HPO bjC7DxZv2tv8NyNhuRFjAYeOPA8qny0db+CY3C4Ge9s2jSlnynLSI6bEMJVnboza0MPH fugmM+/rxtrwFyoXxfV0azwxo4/O8B8TMZa4wicHnAc1vI7y0JkXtsRnDplgqcMJfAFv oa+e3evTFp3yjeCAK8h83XE4GHwmE8jASYbi98mFrDAbFdueNIzf2Kng4vcvaLQSqHQ4 E/RA== X-Gm-Message-State: APjAAAURAEMTGSRpsO0qm6OQxjNrtUZk1OxmJX5LohcNFtGddR6TQ0pz fK5ksUij6Pt7mAtTenorwgsi+6skz7Y= X-Google-Smtp-Source: APXvYqznmH9rz/JDV0+Xbykr6S/n7SAAoY/mOhmf0WFXqZ2z2suShBz7+Pq0B62VysinQsRovhiWsg== X-Received: by 2002:a5d:52cc:: with SMTP id r12mr31675052wrv.272.1566377706562; Wed, 21 Aug 2019 01:55:06 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:05 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:02 +0200 Message-Id: <20190821085455.18508-8-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-1-m.othacehe@gmail.com> 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/python-2.7-search-paths.patch: Add cross-compilation support. * gnu/packages/patches/python-3-search-paths.patch: Ditto. * gnu/packages/patches/python-cross-compile.patch: New patch. * gnu/local.mk (dist_patch_DATA): Add above new patch. * gnu/packages/python.scm (python-2.7)[patches]: Add new patch above, [arguments]: Set _PYTHON_HOST_PLATFORM env variable when cross compiling. --- gnu/local.mk | 1 + .../patches/python-2.7-search-paths.patch | 10 +- .../patches/python-3-search-paths.patch | 11 +- .../patches/python-cross-compile.patch | 145 ++++++++++++++++++ gnu/packages/python.scm | 23 ++- 5 files changed, 181 insertions(+), 9 deletions(-) create mode 100644 gnu/packages/patches/python-cross-compile.patch diff --git a/gnu/local.mk b/gnu/local.mk index 0002f49409..07be1f205b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1232,6 +1232,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-CVE-2018-14647.patch \ %D%/packages/patches/python-axolotl-AES-fix.patch \ %D%/packages/patches/python-cairocffi-dlopen-path.patch \ + %D%/packages/patches/python-cross-compile.patch \ %D%/packages/patches/python-cffi-x87-stack-clean.patch \ %D%/packages/patches/python2-larch-coverage-4.0a6-compatibility.patch \ %D%/packages/patches/python-configobj-setuptools.patch \ diff --git a/gnu/packages/patches/python-2.7-search-paths.patch b/gnu/packages/patches/python-2.7-search-paths.patch index a012bc8fe0..5a345c7691 100644 --- a/gnu/packages/patches/python-2.7-search-paths.patch +++ b/gnu/packages/patches/python-2.7-search-paths.patch @@ -3,13 +3,17 @@ looking for headers and libraries. --- Python-2.7.10/setup.py 2015-10-07 18:33:18.125153186 +0200 +++ Python-2.7.10/setup.py 2015-10-07 18:33:47.497347552 +0200 -@@ -526,6 +526,10 @@ class PyBuildExt(build_ext): +@@ -526,6 +526,14 @@ class PyBuildExt(build_ext): inc_dirs += ['/system/include', '/atheos/autolnk/include'] inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep) + # Always honor these variables. -+ lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep) -+ inc_dirs += os.getenv('CPATH', '').split(os.pathsep) ++ if not cross_compiling: ++ lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep) ++ inc_dirs += os.getenv('CPATH', '').split(os.pathsep) ++ else: ++ lib_dirs = os.getenv('CROSS_LIBRARY_PATH', '').split(os.pathsep) ++ inc_dirs = os.getenv('CROSS_CPATH', '').split(os.pathsep) + # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb) if host_platform in ['osf1', 'unixware7', 'openunix8']: diff --git a/gnu/packages/patches/python-3-search-paths.patch b/gnu/packages/patches/python-3-search-paths.patch index 5fea9c66b6..cf1647207b 100644 --- a/gnu/packages/patches/python-3-search-paths.patch +++ b/gnu/packages/patches/python-3-search-paths.patch @@ -3,7 +3,7 @@ looking for headers and libraries. --- a/setup.py 2015-10-07 23:32:58.891329173 +0200 +++ b/setup.py 2015-10-07 23:46:29.653349924 +0200 -@@ -575,8 +575,8 @@ +@@ -575,15 +575,15 @@ # if a file is found in one of those directories, it can # be assumed that no additional -I,-L directives are needed. if not cross_compiling: @@ -14,3 +14,12 @@ looking for headers and libraries. else: # Add the sysroot paths. 'sysroot' is a compiler option used to # set the logical path of the standard system headers and + # libraries. +- lib_dirs = (self.compiler.library_dirs + ++ lib_dirs = (os.getenv('CROSS_LIBRARY_PATH', '').split(os.pathsep) + + sysroot_paths(('LDFLAGS', 'CC'), system_lib_dirs)) +- inc_dirs = (self.compiler.include_dirs + ++ inc_dirs = (os.getenv('CROSS_CPATH', '').split(os.pathsep) + + sysroot_paths(('CPPFLAGS', 'CFLAGS', 'CC'), + system_include_dirs)) + exts = [] diff --git a/gnu/packages/patches/python-cross-compile.patch b/gnu/packages/patches/python-cross-compile.patch new file mode 100644 index 0000000000..5a470e1852 --- /dev/null +++ b/gnu/packages/patches/python-cross-compile.patch @@ -0,0 +1,145 @@ +Patch taken from https://bugs.python.org/issue22724 and augmented with +following Nix patch +https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/interpreters/python/cpython/2.7/cross-compile.patch +to fix the whole cross-compilation circus. + +--- + Makefile.pre.in | 14 +++++++------- + configure | 5 ++++- + setup.py | 9 ++++++--- + 3 files changed, 17 insertions(+), 11 deletions(-) + +diff --git a/Makefile.pre.in b/Makefile.pre.in +index 2a14f3323b..6239fc32fc 100644 +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -492,7 +492,7 @@ $(BUILDPYTHON): Modules/python.o $(LIBRARY) $(LDLIBRARY) + $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) + + platform: $(BUILDPYTHON) pybuilddir.txt +- $(RUNSHARED) $(PYTHON_FOR_BUILD) -c 'import sys ; from sysconfig import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform ++ $(RUNSHARED) $(PY_BUILD_ENVIRON) $(PYTHON_FOR_BUILD) -c 'import sys ; from sysconfig import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform + + # Create build directory and generate the sysconfig build-time data there. + # pybuilddir.txt contains the name of the build dir and is used for +@@ -503,7 +503,7 @@ platform: $(BUILDPYTHON) pybuilddir.txt + # or removed in case of failure. + pybuilddir.txt: $(BUILDPYTHON) + @echo "none" > ./pybuilddir.txt +- $(RUNSHARED) $(PYTHON_FOR_BUILD) -S -m sysconfig --generate-posix-vars ;\ ++ $(RUNSHARED) $(PY_BUILD_ENVIRON) $(PYTHON_FOR_BUILD) -S -m sysconfig --generate-posix-vars ;\ + if test $$? -ne 0 ; then \ + echo "generate-posix-vars failed" ; \ + rm -f ./pybuilddir.txt ; \ +@@ -525,7 +525,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o + esac; \ + $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ + _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \ +- $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build ++ $(PY_BUILD_ENVIRON) $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build + + # Build static library + # avoid long command lines, same as LIBRARY_OBJS +@@ -928,7 +928,7 @@ install: @FRAMEWORKINSTALLFIRST@ commoninstall bininstall maninstall @FRAMEWORKI + upgrade) ensurepip="--upgrade" ;; \ + install|*) ensurepip="" ;; \ + esac; \ +- $(RUNSHARED) $(PYTHON_FOR_BUILD) -m ensurepip \ ++ $(RUNSHARED) $(PY_BUILD_ENVIRON) $(PYTHON_FOR_BUILD) -m ensurepip \ + $$ensurepip --root=$(DESTDIR)/ ; \ + fi + +@@ -939,7 +939,7 @@ altinstall: commoninstall + upgrade) ensurepip="--altinstall --upgrade --no-default-pip" ;; \ + install|*) ensurepip="--altinstall --no-default-pip" ;; \ + esac; \ +- $(RUNSHARED) $(PYTHON_FOR_BUILD) -m ensurepip \ ++ $(RUNSHARED) $(PY_BUILD_ENVIRON) $(PYTHON_FOR_BUILD) -m ensurepip \ + $$ensurepip --root=$(DESTDIR)/ ; \ + fi + +@@ -1270,7 +1270,7 @@ libainstall: @DEF_MAKE_RULE@ python-config + # Install the dynamically loadable modules + # This goes into $(exec_prefix) + sharedinstall: sharedmods +- $(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \ ++ $(RUNSHARED) $(PY_BUILD_ENVIRON) $(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \ + --prefix=$(prefix) \ + --install-scripts=$(BINDIR) \ + --install-platlib=$(DESTSHARED) \ +@@ -1344,7 +1344,7 @@ frameworkinstallextras: + # This installs a few of the useful scripts in Tools/scripts + scriptsinstall: + SRCDIR=$(srcdir) $(RUNSHARED) \ +- $(PYTHON_FOR_BUILD) $(srcdir)/Tools/scripts/setup.py install \ ++ $(PY_BUILD_ENVIRON) $(PYTHON_FOR_BUILD) $(srcdir)/Tools/scripts/setup.py install \ + --prefix=$(prefix) \ + --install-scripts=$(BINDIR) \ + --root=$(DESTDIR)/ +diff --git a/configure b/configure +index 67300fe2b6..6050f588c5 100755 +--- a/configure ++++ b/configure +@@ -741,6 +741,7 @@ CONFIG_ARGS + SOVERSION + VERSION + PYTHON_FOR_BUILD ++PY_BUILD_ENVIRON + PYTHON_FOR_REGEN + host_os + host_vendor +@@ -2964,7 +2965,8 @@ $as_echo_n "checking for python interpreter for cross build... " >&6; } + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $interp" >&5 + $as_echo "$interp" >&6; } +- PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/$(PLATDIR) '$interp ++ PY_BUILD_ENVIRON='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/$(PLATDIR)' ++ PYTHON_FOR_BUILD=$interp + fi + elif test "$cross_compiling" = maybe; then + as_fn_error $? "Cross compiling required --host=HOST-TUPLE and --build=ARCH" "$LINENO" 5 +@@ -2974,6 +2976,7 @@ fi + + + ++ + if test "$prefix" != "/"; then + prefix=`echo "$prefix" | sed -e 's/\/$//g'` + fi +diff --git a/setup.py b/setup.py +index cb47a2339c..472e7e2b26 100644 +--- a/setup.py ++++ b/setup.py +@@ -497,8 +497,6 @@ class PyBuildExt(build_ext): + if not cross_compiling: + add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') + add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') +- if cross_compiling: +- self.add_gcc_paths() + self.add_multiarch_paths() + + # Add paths specified in the environment variables LDFLAGS and +@@ -556,7 +554,10 @@ class PyBuildExt(build_ext): + # be assumed that no additional -I,-L directives are needed. + inc_dirs = self.compiler.include_dirs[:] + lib_dirs = self.compiler.library_dirs[:] +- if not cross_compiling: ++ if cross_compiling: ++ inc_dirs = [] ++ lib_dirs = [] ++ else: + for d in ( + '/usr/include', + ): +@@ -621,6 +622,8 @@ class PyBuildExt(build_ext): + # Some modules that are normally always on: + #exts.append( Extension('_weakref', ['_weakref.c']) ) + ++ self.compiler.library_dirs = lib_dirs + [ '.' ] ++ + # array objects + exts.append( Extension('array', ['arraymodule.c']) ) + +-- +2.17.1 + diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 09c1f7d716..8241c09d37 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -109,7 +109,8 @@ "python-2-deterministic-build-info.patch" "python-2.7-site-prefixes.patch" "python-2.7-source-date-epoch.patch" - "python-2.7-adjust-tests.patch")) + "python-2.7-adjust-tests.patch" + "python-cross-compile.patch")) (modules '((guix build utils))) (snippet '(begin @@ -177,6 +178,12 @@ (add-before 'configure 'patch-lib-shells (lambda _ + ;; This variable is used in setup.py to enable cross compilation + ;; specific switches. As it is not set properly by configure + ;; script, set it manually. + ,@(if (%current-target-system) + '((setenv "_PYTHON_HOST_PLATFORM" "")) + '()) ;; Filter for existing files, since some may not exist in all ;; versions of python that are built with this recipe. (substitute* (filter file-exists? @@ -256,7 +263,9 @@ (if (null? opt) "none" (car opt))) (for-each (lambda (file) (apply invoke - `(,(string-append out "/bin/python") + `(,,(if (%current-target-system) + "python2" + '(string-append out "/bin/python")) ,@opt "-m" "compileall" "-f" ; force rebuild @@ -302,7 +311,7 @@ `(("pkg-config" ,pkg-config) ;; When cross-compiling, a native version of Python itself is needed. ,@(if (%current-target-system) - `(("self" ,this-package) + `(("python2" ,this-package) ("which" ,which)) '()))) (native-search-paths @@ -376,10 +385,11 @@ data types.") ((#:phases phases) `(modify-phases ,phases (add-before 'check 'set-TZDIR - (lambda* (#:key inputs #:allow-other-keys) + (lambda* (#:key inputs native-inputs #:allow-other-keys) ;; test_email requires the Olson time zone database. (setenv "TZDIR" - (string-append (assoc-ref inputs "tzdata") + (string-append (assoc-ref + (or native-inputs inputs) "tzdata") "/share/zoneinfo")) #t)) ;; Unset SOURCE_DATE_EPOCH while running the test-suite and set it @@ -415,6 +425,9 @@ data types.") #t))))))) (native-inputs `(("tzdata" ,tzdata-for-tests) + ,@(if (%current-target-system) + `(("python3" ,this-package)) + '()) ,@(package-native-inputs python-2))) (native-search-paths (list (search-path-specification From patchwork Wed Aug 21 08:54: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: 15061 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 514E317264; Wed, 21 Aug 2019 09:56: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 F3FAE1724B for ; Wed, 21 Aug 2019 09:56:24 +0100 (BST) Received: from localhost ([::1]:45586 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MPn-0006kV-PZ for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 04:56:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58625) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MPb-0006ed-QO for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MPa-0005H3-F0 for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54078) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MPa-0005Gr-Bu for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MPa-0006Yd-9S for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 09/61] gnu: http-parser: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:56: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.156637772724732 (code B ref 36477); Wed, 21 Aug 2019 08:56:10 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:55:27 +0000 Received: from localhost ([127.0.0.1]:34581 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MOs-0006Qe-LG for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:27 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:37072) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MOf-0006NA-AO for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:15 -0400 Received: by mail-wm1-f67.google.com with SMTP id d16so1285279wme.2 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55: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=wngpnt77kJYgfa7e9xym/06vq87dNnC1/WW74z2d6/Q=; b=e4OdQMAu31OM3yrJTXWpZl+X9nymem3geKjI+ME0trn+6lXb+jd19NC5/b5cqM77BK O3l7nCEh2slYmoV8jtt87GYajNYELq7/kAQD8PLoLMW27FUQfpGmbjWhFAAEN5ky4YY+ yNIEFn0e1dR2gSyeQzbJ0PGOQ7uVrnKjha47dMs2fOsJXHOF68r6o9i3qWd9zcxqY813 rYvRvufrbR8R8P3lzcXybliY6w0lNDDhFyn091iUiyZAbRPUOFN2KBPW0BvurmPkEsRE TX5QqSEoyM4hC6ygm+Os1YkA1v3SxWoEMsFgyV3RAKkOghKILBM4HIcErqGsReIKZiF+ AGxA== 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=wngpnt77kJYgfa7e9xym/06vq87dNnC1/WW74z2d6/Q=; b=ncrwyRF6zAoCSuikEkUANjs+bI/taX1a92cvHWEcgpHXZCpRAkc9g10LBBBAjm0JlL asljlTe6scAuZHEeOC2F+TMkQPk3KwPeQFsaAFYcBNqHtv/PQDZvstDF4aUOcfJbyQtm KLGc8EcgdeBwNUdZ+xBF0nxMKXTWXlQ/Ad95z4DDXSBSLZaUU/MOzzuoDitbUuCEO+TQ t+G0O3qC4n0Fc9SAzq8+bZsXsXrf0t9XNX8o4oTNGDqiqZVjDJSTtiuop9xzHeVh9Iss 5TPzSudoxy/g9uUipFHYykI5/k/pRSXH7nj1FIyZq7MUDc5CYFsBd7VnunTmkGF2ShPZ ugIA== X-Gm-Message-State: APjAAAXt4ZYoL4gDinNqLRf1H+/XR6bKY0RMQp/b9t5Ju1cdG7Oe5rhL LX5DpPqOCZcrKt/jZwuUGXzYKsKDH9E= X-Google-Smtp-Source: APXvYqxr76o+wwQrRewLUA+5vkSYmgjWiPb+rU39zHY2J+q55jb2s8LsoF6DxcU7VKMYGzQn3koRaw== X-Received: by 2002:a7b:c148:: with SMTP id z8mr4981239wmi.168.1566377707291; Wed, 21 Aug 2019 01:55:07 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:06 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:03 +0200 Message-Id: <20190821085455.18508-9-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-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/web.scm (http-parser)[arguments]: Set CC and AR variables in Makefile in order to fix cross-compilation. --- gnu/packages/web.scm | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 9f80c404d4..06b3778be2 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -35,6 +35,7 @@ ;;; Copyright © 2019 Alex Griffin ;;; Copyright © 2019 Hartmut Goebel ;;; Copyright © 2019 Jakob L. Kreuze +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -5240,10 +5241,22 @@ into your tests. It automatically starts up a HTTP server in a separate thread #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) - "CC=gcc" "library") + "library" + ,@(if (%current-target-system) + '() + '("CC=gcc"))) #:phases (modify-phases %standard-phases - (delete 'configure)))) + ,@(if (%current-target-system) + '((replace 'configure + (lambda* (#:key target #:allow-other-keys) + (substitute* (find-files "." "Makefile") + (("CC\\?=.*$") + (string-append "CC=" target "-gcc\n")) + (("AR\\?=.*$") + (string-append "AR=" target "-ar\n"))) + #t))) + '((delete 'configure)))))) (synopsis "HTTP request/response parser for C") (description "This is a parser for HTTP messages written in C. It parses both requests and responses. The parser is designed to be used in From patchwork Wed Aug 21 08:54:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15084 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 1770C17264; Wed, 21 Aug 2019 09:59: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 BF9521724B for ; Wed, 21 Aug 2019 09:59:39 +0100 (BST) Received: from localhost ([::1]:45680 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MSw-0002eI-Uj for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 04:59:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58618) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MPb-0006dt-C4 for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MPZ-0005GX-WE for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54077) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MPZ-0005GR-TE for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MPZ-0006YW-Qv for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 10/61] gnu: openssl: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:56: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.156637772624719 (code B ref 36477); Wed, 21 Aug 2019 08:56:09 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:55:26 +0000 Received: from localhost ([127.0.0.1]:34578 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MOs-0006QW-6v for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:26 -0400 Received: from mail-wm1-f47.google.com ([209.85.128.47]:39625) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MOg-0006NJ-8M for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:15 -0400 Received: by mail-wm1-f47.google.com with SMTP id i63so1281195wmg.4 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55: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=xZiXCEJLDLaiMJLjNLIR5UjClekf5jGRpSNaZ/Dr6sk=; b=lhlVg0HVDNHkYhKUIWPOrjx5mjv4uiRkyw+kxxKXSvKK47iX0W35dZsPDjLuISIo6k +GBJljJiCc62DMZDIZIXIKY9gfCnUJWNuv8xvLXATXz7osfrQWE740a+FCjPPoZf+fPP NE1h+k74Aa8+Ga29YLiDo6IchFD+Lh8SrPbx3T92pMy/7rIsTFzshY2nMVTvy4QduDxI IztFg6L34StHwLW0CM37JhSLq7JNFN58ZBXoIC3vBhstcbvPkkBhcdc5RWZ8IRh1YKce KvYMBPQXX1Xa1P53t5VkapHvVSpS8At/u/uNRfpJypgQzGxopMVEgWvw7T0rEgSzEvGk 9sbw== 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=xZiXCEJLDLaiMJLjNLIR5UjClekf5jGRpSNaZ/Dr6sk=; b=QptibpNUiunfIIs1iq4+mJSDakvpyf04Nic8V+pW96Rx68WYBUAd+qwEqEml1Cl2Hu DGaWBU8AQGaP72eRC1c8MCVEiN6hBsPOnxruUerKewRzlUch93sBYHCgvNexC0JMurVP 9ZwV4emNNaBsH/lXPj/K0R9A9xEGlDvfkDHbq/hyhT69gYuthISAQ9DQ6UJ2IRvxRnWH fM4/9jDmdw6b60VTIVoiv2zKB2m1jQpw0VIFMtGKEHC6gSUdqd2Baci+nassV/rN3nw+ Egz1rMF31dl3zNqnu6SW96VIreJsJ1aPyXIUCanzE661iiUpDt7AdW91wHux8fCkeyYq IaCA== X-Gm-Message-State: APjAAAURFOsMKwwn8+A5H8vEQE1VXc1+xFsm0svdDGzBpsBRIp1UdFB5 1qkpbZ9EMHtSaFT5mw+RNk/qDHV3LE8= X-Google-Smtp-Source: APXvYqwwVoZSCC5DScx2NzIKTdNo47MLbDf9DE5aMkM8MwYEzD4I8YQ3SMf9y0PrHRLaYkGkL8sj9A== X-Received: by 2002:a1c:6c0d:: with SMTP id h13mr4401273wmc.74.1566377708270; Wed, 21 Aug 2019 01:55:08 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:07 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:04 +0200 Message-Id: <20190821085455.18508-10-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-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..c43b325bff 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? "armhf" 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 Wed Aug 21 08:54:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15073 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 1D77817264; Wed, 21 Aug 2019 09:58:54 +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 D43731724B for ; Wed, 21 Aug 2019 09:58:53 +0100 (BST) Received: from localhost ([::1]:45644 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MSC-0001Mc-So for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 04:58:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58598) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MPa-0006cM-Dw for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MPZ-0005GH-CU for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54075) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MPZ-0005GA-9J for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MPW-0006YE-Jp for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 11/61] gnu: texinfo: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:56: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.156637772624711 (code B ref 36477); Wed, 21 Aug 2019 08:56:06 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:55:26 +0000 Received: from localhost ([127.0.0.1]:34576 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MOr-0006QJ-QE for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:26 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:50918) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MOg-0006NQ-VJ for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:15 -0400 Received: by mail-wm1-f66.google.com with SMTP id v15so1275765wml.0 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55: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; bh=t3f2LDGN9a2KtX5A0QXEWD3cvCAEgFcDV2JLpMdkmhU=; b=PP9VhEDWBexewB+wah6yudjVv+1fMp21/IscK5+xmCYZlYBdmWsOgcMqDwIlrrGhlC Xd3U1Q8tuW40B/GWqgsYo2egILw4jgpgv4I3d8oOVYlPZ2j75V2cIdumS9AeaAoS6Q5W M5dzUQRT8WUqPkPAW961SbBvKQMyoiMsSN5AhXrtheGf3m+N5JUBSu4IdVA0TshQ0ryp CV/QIS8t6npYZnUnDcmq78hYCkNSIKCQ5/MoNydEja8GBQq/20Va5lKhxPtg5CQD12ea iuwDsavsJQJQQ0EtXheQ7YC3KH/fsPvEhb4Twj2+10FilIXjwXpx4JvzlPEguNBv2X+w VRtg== 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; bh=t3f2LDGN9a2KtX5A0QXEWD3cvCAEgFcDV2JLpMdkmhU=; b=uadwX8xo03d+OrkuIguy+yn/q7HdF3lwzNZCSAp25E99vcLVbXkPO89JUFJ6XY2vBp /QdL0f5c/SATe/lzZZhdV+2GZ/g50tjihOAJtzbBWQFNxsBhZ3HOFtNKoz+RfGiiRlTL CJQmb5bw30hVKu4MQRW347q6Drbx1Jk6NEttt2gcKes4SmuVBHEhcLq+/SiDP+fLWXhu iadhDT7VVvA62mMoFG5HqjwrVeTzS7C6aqKksycENObm6XVcwLshKxYBup17jm/gbtMz ZoT25nbvK1fzrqzJkNXPRmKVFfox/H0J11BTh8Vq0R1Z9G2/aXq6GRXuP27cKIUDzN9j UM3g== X-Gm-Message-State: APjAAAVLfy3Y1ZdPM5jM37qpIJhTohTcMS3WpOE2atYaCO3gDRHbH3ms HN5aaiDVbhC9bLSBJ+jR8lSY9YuVnRg= X-Google-Smtp-Source: APXvYqx9K6zK8tqIERWn+rGCat5Ru3yY5jqTzdNPsX0ZeGd/h+7LrcbbpwUMwh3evYuJIRLkz20QoA== X-Received: by 2002:a1c:f106:: with SMTP id p6mr4381336wmh.148.1566377709094; Wed, 21 Aug 2019 01:55:09 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:08 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:05 +0200 Message-Id: <20190821085455.18508-11-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-1-m.othacehe@gmail.com> 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 Wed Aug 21 08:54: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: 15074 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 E142517264; Wed, 21 Aug 2019 09:59: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 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 A68AF1724B for ; Wed, 21 Aug 2019 09:59:03 +0100 (BST) Received: from localhost ([::1]:45654 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MSM-0001dp-Ra for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 04:59:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58636) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MPc-0006fW-9G for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MPb-0005HW-2F for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54079) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MPa-0005HI-Uu for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MPa-0006Yl-PT for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 12/61] gnu: cmake: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:56: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.156637772724741 (code B ref 36477); Wed, 21 Aug 2019 08:56:10 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:55:27 +0000 Received: from localhost ([127.0.0.1]:34583 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MOt-0006Qr-53 for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:27 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:37970) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MOh-0006Nc-WE for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:16 -0400 Received: by mail-wm1-f65.google.com with SMTP id m125so1280166wmm.3 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55: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; bh=2krCJLit+1UiRIYhchssO6oCwDpYGq03kWH7mdQah2I=; b=lKs0FCsMCiTAL97qCX/gE1b8Uc7jM/tj8dv+E8I2UGmQwa6TmWekInZW1YP11Q7QS5 jVTZvddl8NvRD66DMESf5Rze61qhBa+Nt3q94sfmkQ+YQediX9NBUaKYMHDMFfMhPtfJ qDsiH5wInziq9z6z9VjRKP8n9DS7U+NUXFf3ZiVpvX4DBDKjw0vOFPAGuEhAEwT6uxrE yAsGcEMtB1BrLVbOVHyxx63XCpo+CudI2dG74BfC49R/dsaSiemi97fZyZ5m5uY/eZou y58zjv0dhVxiL3+mYYKyGRyKIrW0CD94uROJ7Rp0Opmn/deaWhusYG7OZDAoMWDtWeWq joIw== 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; bh=2krCJLit+1UiRIYhchssO6oCwDpYGq03kWH7mdQah2I=; b=X03ECSve4cWgG8V58P8xriFoBUutG4EmnVv7ESGRZPctjSTuFDY631vxIKV0q8IBzb E3zpP4qW4e+LxnScSlwHA9SrD98ZX6NbpBt7KERZc8ECTvme1mis7Zmo0kZkmY0OgKvL 2vYhGA4wr6VVIe/Tu5Yr3VB5yZyBuPe8hzzrhBIlYI65HT2uLstByRQEkoCxtsJvN23k D5E/rPBTjtj1zN4a74FBgnbmFNSb74Hmk244KG/vRrpmwnVI0LFafgYNWlw/0g/6S+jP E9VHvk1hFD8G9AK2+5Q6az2pKnz8AB184pV9lx9fP/UQ3O9pRJ3AYdPOUcgoac5G3LI6 RcdQ== X-Gm-Message-State: APjAAAVg05o06jVfqdxFJQhJAYfHQBVVf0MpemVGk+gfb1WJF/XylnR1 35YpG49KCEGNoCyBU5EAJ5hmQDf1FO8= X-Google-Smtp-Source: APXvYqzXjiOt/CZXrlyRAJEvF3Zr4dtKzWvx3DdbJ11hJfv4rlYcQzqCZcUm8LdvW+AMNuUYgYm42A== X-Received: by 2002:a7b:cd17:: with SMTP id f23mr4854881wmj.177.1566377709953; Wed, 21 Aug 2019 01:55:09 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:09 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:06 +0200 Message-Id: <20190821085455.18508-12-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-1-m.othacehe@gmail.com> 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 Wed Aug 21 08:54: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: 15111 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 DE33D17264; Wed, 21 Aug 2019 10:10:06 +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 A55191724B for ; Wed, 21 Aug 2019 10:10:06 +0100 (BST) Received: from localhost ([::1]:46010 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0Md4-0000Rj-3f for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 05:10:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58647) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MPc-0006gD-M6 for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MPb-0005I1-Gy for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54080) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MPb-0005Hr-DI for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MPb-0006Ys-Ao for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 13/61] gnu: libgit2: Fix cross compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:56: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.156637772824753 (code B ref 36477); Wed, 21 Aug 2019 08:56:11 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:55:28 +0000 Received: from localhost ([127.0.0.1]:34586 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MOt-0006R0-GC for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:27 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:39459) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MOi-0006Ng-Qa for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:17 -0400 Received: by mail-wm1-f68.google.com with SMTP id i63so1281323wmg.4 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55: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; bh=bL8zYmAD1yBkH1onvChCQJY1hH5op4qwj4Xz/0COPDI=; b=Jwg1dR5rvna2tltrgH7iXnHYynz1BbZ7ELV4y0SD0BJ53wtUn9GbtTLMviFqNSPMpf s+IrbfDRq6d/1g0cxgmPFYEmjCIIrJXkswTgFKPTKtjNXtWEhKNQdGP9ZdtZUMtkYkW9 DNK6CQTQRQcmnXl0xIhTU0r6xYUaNOICpAq4QMIdddMNytYsS511HJ1Qja0X6gwv3lhu GT+nSdrOCnFzqke7JOxp9LnzdBCFspYqZ8CmPa5duG0sL40qT8bmlfSm+luie8grLHPH ejCeUFyMe0a3yjCm4HLaNvStbVIAu+aRinMRYeHdI964FkOVNSmp6ZEELJ6162aDe3Ib PmoQ== 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; bh=bL8zYmAD1yBkH1onvChCQJY1hH5op4qwj4Xz/0COPDI=; b=HvmJqugiFeyxFA8zT0TBMY7EXdcBZiJwXXx7NKWiJdjaYW1tvUrZjd3D7pHTo2ePrX /RqrSQmSO1S1d+c22OMRJZzrPBaHwvvBuzaT6Gxjozv29GFvmcyZw9zLsjDDFIyQwfPq wDOTqfy222/m1i3oIfiqsyKkoEtW7Kdla6GGVsax71WHMmi/yuaUPz37DFYw6trbs/8j VlZjv+WuWK+3oY95XbaB37aiTTe4Qcn2pcDAKWQc5fz0SoYV6RptWXCQRvA765idusjh tKh3s+yRZim/CHDUFlHrLbZ8a2mzimUd5PTIeTctBeR5hbBgchiKD2ayZL4SY0TpYcrk rK3Q== X-Gm-Message-State: APjAAAWjOlVigmYjUZ3FTny+vKVTHeGjiH20nimIYGTNylymQkdoKUIh UhFHpI3hCPYF7RMZYSFji8W9xGjlLmc= X-Google-Smtp-Source: APXvYqwbn1aJKeseeM+mSzmNKYwl7aX1PY/hbTRyKYhHr0Qudaz6fDroEdc4HMRPy1UTDso3L4jUzA== X-Received: by 2002:a05:600c:254a:: with SMTP id e10mr4982513wma.113.1566377710869; Wed, 21 Aug 2019 01:55:10 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:10 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:07 +0200 Message-Id: <20190821085455.18508-13-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-1-m.othacehe@gmail.com> 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 (libgit2)[arguments]: Set PKG_CONFIG_EXECUTABLE variable when cross-compiling. Also do not run test suite if cross-compiling. --- gnu/packages/version-control.scm | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index e83b1d95e3..0bc882d3d3 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -545,7 +545,14 @@ everything from small to very large projects with speed and efficiency.") (build-system cmake-build-system) (outputs '("out" "debug")) (arguments - `(#:configure-flags '("-DUSE_SHA1DC=ON") ; SHA-1 collision detection + `(#:configure-flags + (list "-DUSE_SHA1DC=ON" ; SHA-1 collision detection + ,@(if (%current-target-system) + `((string-append + "-DPKG_CONFIG_EXECUTABLE=" + (assoc-ref %build-inputs "pkg-config") + "/bin/" ,(%current-target-system) "-pkg-config")) + '())) #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-hardcoded-paths @@ -560,9 +567,13 @@ everything from small to very large projects with speed and efficiency.") (lambda _ (for-each make-file-writable (find-files ".")) #t)) - ;; Run checks more verbosely. + ;; Run checks more verbosely, unless we are cross-compiling. (replace 'check - (lambda _ (invoke "./libgit2_clar" "-v" "-Q")))))) + (lambda* (#:key (tests? #t) #:allow-other-keys) + (if tests? + (invoke "./libgit2_clar" "-v" "-Q") + ;; Tests may be disabled if cross-compiling. + (format #t "Test suite not run.~%"))))))) (inputs `(("libssh2" ,libssh2) ("http-parser" ,http-parser))) From patchwork Wed Aug 21 08:54:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15087 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 6D08317264; Wed, 21 Aug 2019 09:59: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 2F7381724B for ; Wed, 21 Aug 2019 09:59:55 +0100 (BST) Received: from localhost ([::1]:45688 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MTA-0002uW-V4 for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 04:59:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58653) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MPc-0006gl-W4 for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MPb-0005IK-W1 for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54081) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MPb-0005ID-Sh for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MPb-0006Z0-QN for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 14/61] gnu: ath9k-htc-firmware: Fix cross compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:56: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.156637772824762 (code B ref 36477); Wed, 21 Aug 2019 08:56:11 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:55:28 +0000 Received: from localhost ([127.0.0.1]:34588 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MOt-0006R8-Us for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:28 -0400 Received: from mail-wr1-f45.google.com ([209.85.221.45]:43125) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MOj-0006No-Hx for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:18 -0400 Received: by mail-wr1-f45.google.com with SMTP id y8so1218485wrn.10 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55: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=sgCeLeS09yIFwm186WeFnTjgtZGx8y50FJmSrL0RZ4Q=; b=WdkgtLD6JD4JPV0zWaLGMSjFWuQPspveoD6tPWhEQfwjql5M9C+QPzEkregq14JaH9 hNH+Jz3YZQOX48Vy31ESDy80YngMy9BCgigDOddjb5EhIjZdWiCYQsqqlA/2ScA/hzvo 1HCQ4aim+gz23noEp6R2h5z/wh9707Yf3Tw/nrVDoUtbiXdWYuvfAMaAsuZocy9dSOg8 kKI2JViyU9ZhzmESdG311ow3PPl6CMGkt9m4YscOTFYcoLzSv+OI9Xj8mkt+dVSrgeB6 Th7kIh8KXm5U61Kc6VyN8Zurgz7ozN999rGJR54YvgWFfZtP71/6YQI5aC4Ks1zprqww iWdQ== 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=sgCeLeS09yIFwm186WeFnTjgtZGx8y50FJmSrL0RZ4Q=; b=UsnknfTUcuZuoYZYwPb8LhWf3JThGyZ/G2V5QN4/4vPkuFdih6GqhhxQwCmBBdY6Oo rGppntqO+S/BFZhejUiA1lfM8L4QsXXaEW4M0UhSqKmz/NGeWzEtoaMY7Wju350N8ogI 1kIvSSuaySEqew1laJNOvBWFSepwf1BPmTThL0PGU8m/tNJOTb2YjbJ4DB8z7cKOAUai YJ1Lvthy/iC5COnsUsc5NRXUTuRKpcvrI3iUTdM+fppgWe/3Ipao8suKSgH1ZPx81nIP PSmtxTsfA8ppadtmOPn8dQ10ia4XY3YWMOv/S5bgoegAuuMbXozCU8bnPu/llQIXaLuA 1nVQ== X-Gm-Message-State: APjAAAXNDjqKvzubmccw1wW3dPISplD2BvwNYBBTbIMTh8NGJN1VhQGf Pbt7XOSSYymLD11FNgbUMFwZAM+v2go= X-Google-Smtp-Source: APXvYqzo5dvtX+ULCC250Xjv0uVkOzqk2Y3NSfb43Gdk/Uo//ru0gUH9fK5P3dyQm4qpKLVrLDMgWw== X-Received: by 2002:a5d:6ccd:: with SMTP id c13mr33271343wrc.4.1566377711723; Wed, 21 Aug 2019 01:55:11 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:11 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:08 +0200 Message-Id: <20190821085455.18508-14-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-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/firmware.scm (ath9k-htc-firmware)[phases]: Search for "cross-gcc" in native-inputs and inputs in "configure" phase. --- gnu/packages/firmware.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index c473ccd920..3104d78b39 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2017, 2018 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Vagrant Cascadian +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -59,7 +60,7 @@ '(#:phases (modify-phases %standard-phases (add-before 'configure 'pre-configure - (lambda* (#:key inputs #:allow-other-keys) + (lambda* (#:key inputs native-inputs #:allow-other-keys) (chdir "target_firmware") ;; 'configure' is a simple script that runs 'cmake' with @@ -67,7 +68,7 @@ (substitute* "configure" (("^TOOLCHAIN=.*$") (string-append "TOOLCHAIN=" - (assoc-ref inputs "cross-gcc") + (assoc-ref (or native-inputs inputs) "cross-gcc") "\n"))) #t)) (replace 'install From patchwork Wed Aug 21 08:54:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15077 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 554DA17264; Wed, 21 Aug 2019 09:59: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,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 DD5A21725C for ; Wed, 21 Aug 2019 09:59:13 +0100 (BST) Received: from localhost ([::1]:45660 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MSW-0001uV-VX for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 04:59:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58671) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MPd-0006i3-Mh for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MPc-0005Ij-Kb for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54082) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MPc-0005Ie-GL for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:12 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MPc-0006Z9-Dh for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 15/61] gnu: libpaper: Fix aarch64 cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:56: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.156637772924774 (code B ref 36477); Wed, 21 Aug 2019 08:56:12 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:55:29 +0000 Received: from localhost ([127.0.0.1]:34590 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MOu-0006RL-Ck for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:28 -0400 Received: from mail-wm1-f52.google.com ([209.85.128.52]:50341) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MOk-0006Nt-Ia for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:18 -0400 Received: by mail-wm1-f52.google.com with SMTP id v15so1275963wml.0 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55: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=FpUnuchbxyVlymMBi/NyjT79xs73gDV9grRHfTdoRn0=; b=iTxefzu0VrdWsUSppH0jvqI+WOBKnstvAejI7IXYRubNBm/dZEHcwGNi4RB1Feo0/y hyQKGO7fOBPkxRHq8wAT+R1BJFxWs6mbytkN8KrV8awoHnMJw3lbhDRqeH0XQCzYdl/n 12ZI0n1oqaU0/HpKmKNspPWgsxGjzjAI2sBORtY8i/8CCK/nR7+vaHjHEk28E7FXAhdv OQ3sO/xEwu+o5bmIqWNA3x14APeaEYR7wMX8nDYqjoxS98jM840cTy6gY3qBRcVtwgI3 i2dybXdNkVF0neee/X+xldFk9vW7i7iCb/X21CWu1aIOEgX50WAZhxUZkb8kNpDWhQpQ a/oQ== 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=FpUnuchbxyVlymMBi/NyjT79xs73gDV9grRHfTdoRn0=; b=J8JdgbL1wuAZVv9GbWo0m4oercV11nyj3vEgiK9yBLJTHuOK8sLebL6O1Uj/91YWMj zILh9mj8hJdOjJ8DNGVnAvjOxkz1KEKiweon90owY+NGXQZ6Vi3XqHd30eELJRBVOhkj LkYL/1+/+t8RI4NGmUv4zr3pOgzTgK4XUZTXeUqSLsFYwQQK/MyTST1S0vgChpZSuknj eUJ0UoIPHqEejlA3f3NPl/aK2gj+flX3Dgl10MskIt9b1N5IQ3kRZZNYObjOVR8XpE9V Hd96TwOvj81WAJ9Ir9EE01XP/IlkQv4gicqosJ1y+IYDRE0iZrTxWwjvJGK2R8jH0Q5L IjZQ== X-Gm-Message-State: APjAAAU7PlxhhmIVkZCpv5spuLzaJuhkJwmlIJPKKtThk57QBYohf0IY /XzWXyGFVLcJ/p6SkPWWBaZXig7eJmI= X-Google-Smtp-Source: APXvYqw36JtxSgkLKUcc8j7zxhsYTjgIhfeYIE/AlKkUbl39h/eNtmZVDA7ahxyK52/aSGYPIDC4Kg== X-Received: by 2002:a1c:cb01:: with SMTP id b1mr4860686wmg.69.1566377712571; Wed, 21 Aug 2019 01:55:12 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:11 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:09 +0200 Message-Id: <20190821085455.18508-15-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-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 Wed Aug 21 08:54: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: 15080 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 99A42172FD; Wed, 21 Aug 2019 09:59: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 2F9891724B for ; Wed, 21 Aug 2019 09:59:23 +0100 (BST) Received: from localhost ([::1]:45666 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MSg-0002Bu-8f for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 04:59:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58686) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MPe-0006jV-Fj for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MPd-0005JC-3s for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:14 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54083) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MPd-0005J2-0o for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:13 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MPc-0006ZH-UN for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 16/61] gnu: groff: Fix cross compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:56: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.156637772924783 (code B ref 36477); Wed, 21 Aug 2019 08:56:12 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:55:29 +0000 Received: from localhost ([127.0.0.1]:34593 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MOv-0006RX-0c for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:29 -0400 Received: from mail-wm1-f41.google.com ([209.85.128.41]:34945) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MOl-0006O0-Js for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:20 -0400 Received: by mail-wm1-f41.google.com with SMTP id l2so1296690wmg.0 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55: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=AYy2xdDFblvGkydZn87xDzeDAfE1IxayksRmTcyJE2g=; b=PEzMcvzoW3jk5NvUKwLPKCRarQqAPEIh10fgHjsBTbVRLMOznHXRiNHLyjWSxCIsCD dd5xaRP5In/iCmUW1dk0TUP+UMQDBe9LmVbt9dmUK46q+HbTMlSB94kMSF3x8kHknDLE /YNbaE1GeebzMRMWWrtyyAVt3Z9KfxDRTDgmzJLhpaCfkfQy9WZVBbtZ15s+1bOX127r 2zn/dqMcgQ+vkU/zIXDVFYWLaaIQcpVQJ0tpoaLaBggcB08S6XTKOk3WLhQzP4zA3U8H 5gsjh18acNVa9RwwnLqJVWGAlzB/zTVOzQaWRAzjXjGuEwzmiOiUSyoWjta1sW68sGVr 1BaQ== 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=AYy2xdDFblvGkydZn87xDzeDAfE1IxayksRmTcyJE2g=; b=sGBUUMiNPUjgkCXkXI+7BCUczq5ePc+qtz1Ab4OC6mMxcKMwcvYTaNq2hF7bdSVdvu FCQfaELZR1rOL02icZinC/Zv+0PpETSFB39RuVJa6EyX0intJDu3ugwBZ0Ms4C6FLEc6 h/D2k2iEqBPX/S1mdYEdBfYaQOb5Y08PqaZtA+lpM2DiVoI3hTq6fG+kT6wRNOHHA6bl M6zRAsy7UoG+oPOxWM4OmKLIxDcAa34vpBoP3MLjZyw7uBA9qo6He0sy1j8RD4nEprXE I/OIz5eMNTi3CVg14xDvm1GhwGJQj07bETAFxp1x9BZ5pW9NU3+JRb5sk6sRgAnakIPR c6Rg== X-Gm-Message-State: APjAAAVSEV/cXQFxRlUCOuA6FUrhBPhMOKg5qFw+m2OA+BSzDhn4PsAm vL+WfYThpDBGsRB8JNQOc0wtcXRZkG8= X-Google-Smtp-Source: APXvYqwJYNg6mjc1CHIbucg7izppjkuU811FlAX6iti79OK0r79aPnvVG4SaUQur5bQJo6CkKD2jPQ== X-Received: by 2002:a1c:6a0b:: with SMTP id f11mr4365830wmc.87.1566377713592; Wed, 21 Aug 2019 01:55:13 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:12 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:10 +0200 Message-Id: <20190821085455.18508-16-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-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 Wed Aug 21 08:54: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: 15090 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 9C17817264; Wed, 21 Aug 2019 10:00: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,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 55C6C1724B for ; Wed, 21 Aug 2019 10:00:14 +0100 (BST) Received: from localhost ([::1]:45714 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MTV-0003Bh-9Y for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 05:00:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58691) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MPe-0006jj-MO for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MPd-0005JT-I4 for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:14 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54084) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MPd-0005JK-Ef for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:13 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MPd-0006ZO-CN for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:13 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 17/61] gnu: texinfo-5: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:56: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.156637773024791 (code B ref 36477); Wed, 21 Aug 2019 08:56:13 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:55:30 +0000 Received: from localhost ([127.0.0.1]:34595 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MOv-0006Rg-Hr for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:29 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:45415) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MOm-0006O9-KI for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:21 -0400 Received: by mail-wr1-f65.google.com with SMTP id q12so1206359wrj.12 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55: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=es9BRObLoWioI/AWfF7/GGHzFdl9mwL4f5ZylXuG+dQ=; b=nxGVbwmz1nSZrddEkDzjtjUaQJ0B0fe3brNAEVqGpPzO4bwxqvIWy8MaX4tlOilJk1 uX1XGDJPeJ47kD2U2DtABRk6CaURBGBpVISHMQgd4xRw7etn1olMJ8mcr2Y5WCkL4YfT +z0DdnXaWTvWN1FQaw5stJwVi+sGmQkyrA2SJo5g3NR+FRGlAkRFknckbf7U4n+OSk4x LPJZ0aVGDwRmApgBfwO6qgek/m192RJhR0m5AJ4YYhzcj/O2HNuuxUjscIszExA2MNDA F6+Ald9FRNgbFyFVWXuClulByRmGnhkWQ9uEyjoZdpGo64Z5PS3euNnWj7W2pZeGu7GC 8I/Q== 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=es9BRObLoWioI/AWfF7/GGHzFdl9mwL4f5ZylXuG+dQ=; b=tlMvB2gXxDWt1i4tgn1P/Jqpu/y8sqfkB7YZRP0Ys26t9n2su0z80zp50UqDFxGUbf YPhTQQWFzQVfO7bnaHjpntrHbgi4ywhLiV6ikAKmGm1JrsL/W1fSN3xSzanPoAJ38wjA y2KA4mH5OjBGYDGUm4/SRoeQ/EPWMLdLM5Tqwj7CQvSY42iENAv6ZGQtbV0xiBgYEaIy bg1Rl/j6IKR4BNoIa/dSTJzxbTOV2+ad2bCnARI4DQTxICgur12R4I8RV94gvuU0xcnC XuwWs2KJETBb5FmEyZll8cYK0LW0/VYm0KBi/hGDpD1OndDXyov6O7iNMUxtHkL7Kk5J pPfQ== X-Gm-Message-State: APjAAAW6WyPoaUoLavEQp0f8CG5oYB4dpFH/Ar0a5SK0Vrq4cAM9XO3x FM2Z2viVTSh5ciqn80RKtY7equtQbo8= X-Google-Smtp-Source: APXvYqxQ7xasv4MWVuSTskJP6BlY6pmJq7izTlrjwqa+s+6r9fKH8wSeB2GryjtxwUcwgIEcTLISdw== X-Received: by 2002:a5d:500c:: with SMTP id e12mr20119630wrt.213.1566377714419; Wed, 21 Aug 2019 01:55:14 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:13 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:11 +0200 Message-Id: <20190821085455.18508-17-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-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 Wed Aug 21 08:54: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: 15068 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 7024017264; Wed, 21 Aug 2019 09:58:11 +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 41CC61724B for ; Wed, 21 Aug 2019 09:58:07 +0100 (BST) Received: from localhost ([::1]:45622 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MRS-0000aU-6t for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 04:58:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58832) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MPl-0006x8-9a for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MPi-0005O1-Vm for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:21 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54102) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MPi-0005Nn-RT for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:18 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MPi-0006bA-PW for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:18 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 18/61] gnu: bc: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:56: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.156637776625173 (code B ref 36477); Wed, 21 Aug 2019 08:56:18 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:56:06 +0000 Received: from localhost ([127.0.0.1]:34647 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MPO-0006WW-Ap for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:56:05 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:34562) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MOn-0006OR-Ci for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:30 -0400 Received: by mail-wr1-f65.google.com with SMTP id s18so1257462wrn.1 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55: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=MD9krEgY+AZgWZV1P3gq0wPRTJouueHmApf72dK1F7k=; b=Bk9Bw19uAarIhqJnaF+M3vOetqJHmB5fLcCrxk3xYOyi6sqyZ/nLJJQJYmiiijBaT9 zh2g5XkGf877iopknNjeiymOdBiUmFVKsFa+MAAvkYFPRrgisHs1Wu5EjLgpg2Vmohe9 cZq04T88xhqCT6sfx65T3wuzT1jJjKoWJs48AuoflrDb6SjsO8xT0J2fBEFY+ArvX5so YzkVMxZwsW32HwXK77aGfpBt5NY1AZqvUGdX/Z5KC1y35D70JXNiPElflB77W/8LxxwX 3Ppwyuh67YKPqodt164UgbcTkqGqsSh/NNa45dtX3ub8AroFOSPdnPB6p47TOW9/LVqH ZsaQ== 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=MD9krEgY+AZgWZV1P3gq0wPRTJouueHmApf72dK1F7k=; b=LHRBQCaId1UIHU6rfQtDQHTMGtJ14mOoY1LYyz/6T/Cz6O2Ix15/7zDkrHEk67cQnV x54KAXs3VTAPtXlEA+vyCNaf6QbriZT4C8ws9gr4hlQLAFjbvYetgK0JgkTLMjVphpix vUjgizBqwaTkueXsW2YlmcGtiJUijkG+FTv/TXO0xpd+0sYubN0QU2MmvGwP18y2lLNM RUND4iAXnGmzsAuwBZjIId3eozzJR54wSLVrVY5k/z7L6+txLGsDvVyrKM/ZwQ481ZnD IpsY/aEth9PdRWcyYr6AcFGALj5spV8muye9uM6sR1/1G7yaG9/odImK/bKp8+DJ552M plGg== X-Gm-Message-State: APjAAAUqJqgra4QRw9aeupYYjRlwlpmL7PxQGdt4dcg0vyXos/D/JL8q mWoW/qRmNPPSXaKKNbSg6vsozxEHwQQ= X-Google-Smtp-Source: APXvYqzHC65FdltF9XHcJ27hEwXItiSIq34erYENgzXXxnX9qrpkzj3DSESkEYULiaZWNWgQCpSB/g== X-Received: by 2002:adf:f844:: with SMTP id d4mr40788457wrq.128.1566377715133; Wed, 21 Aug 2019 01:55:15 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:14 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:12 +0200 Message-Id: <20190821085455.18508-18-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-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 07be1f205b..de0170ee5f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -699,6 +699,7 @@ dist_patch_DATA = \ %D%/packages/patches/bash-completion-directories.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 Wed Aug 21 08:54: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: 15112 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 47BB117264; Wed, 21 Aug 2019 10:10: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,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 0971B1724B for ; Wed, 21 Aug 2019 10:10:14 +0100 (BST) Received: from localhost ([::1]:46012 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MdB-0000ht-6e for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 05:10:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58698) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MPf-0006kX-3U for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MPe-0005Jr-0F for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:14 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54085) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MPd-0005Jl-TK for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:13 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MPd-0006ZV-Ql for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:13 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 19/61] gnu: indent: Fix aarch64 cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:56: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.156637773024809 (code B ref 36477); Wed, 21 Aug 2019 08:56:13 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:55:30 +0000 Received: from localhost ([127.0.0.1]:34598 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MOv-0006Ro-Us for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:30 -0400 Received: from mail-wr1-f53.google.com ([209.85.221.53]:36765) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MOn-0006Od-P4 for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:22 -0400 Received: by mail-wr1-f53.google.com with SMTP id r3so1245382wrt.3 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55: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=0DhDfoKs88JRKglYSHLbr9HEnQd+9MqcLH8Wt9D9A9A=; b=rJRMByk6vEPz8dRqhD/zFvmRSMZeSTl1jxKkChYIsFiOiRmp51uvPr0IRE4T4x/2BF rPXcCufBOvBgxhfbXxXROgj6i0Z/rNbKbdOg3VmzTWUv6F6yB0PEhhYfG8wXaTx5tOu/ GAXHdQkH9ekytkaIOYJVmPb0sCGHAk6OvSsGw0AwNjCscnIZpLN4hNyrTFk7uFi7siy5 CWZMl+zX4ztxbGp3dU5EWs7SaLiRCzUjGeU++BeLLB28IrrHzHihyU7c4U1aUed4qZT7 XebDH0NJZRcJfFFwNnzPAKcUH9LSwP1vxbY0eljLsSx5AHylrGMaljLih5ySjukfFb4P BjkQ== 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=0DhDfoKs88JRKglYSHLbr9HEnQd+9MqcLH8Wt9D9A9A=; b=IuAyplLt5DYWszLAdA9flndpn35gfTorZWYr20YdqEMiZJMc0zAWj36u8X3AYY/uuY Psz8xgIxAlxqE8mIFAiK/40veLkjmo5WWyMINMRTOR3oKu765H4v10Jk/vFkj7TlpmtW UdTJGKbtungBBTZG+WKARnhNeGd3WqdZhWP2X8XVvxE1VfRCwm1pe41SJV4IDuMd+ofa xEmJywzaAdyt0cqGKDnZMHl54h4CmSmgStGuf1kKX0NSYyM+XImOLL46+tpnERK+4I9t aGbhcAncco44rIKz2Q7qshpagX/BwGSYQZlpC2K40Vm70Vzt8ycMXnOLy60LiVaA0IPB Nadw== X-Gm-Message-State: APjAAAUswC0Qs4+NOTqWnXYLVRy77ebHK0+u0USxnzV/5pxRcjCDJrln DVqaO22Nk+K2jDpY8qdmBXgkDUobuo0= X-Google-Smtp-Source: APXvYqw4VNYTYSmCACFPUV4bcAWfY3PG2A/2ilpXuHgM5yInVMECsTFJiewNJJvlivyoJPc/SOmCrg== X-Received: by 2002:a5d:664a:: with SMTP id f10mr39971088wrw.90.1566377715853; Wed, 21 Aug 2019 01:55:15 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:15 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:13 +0200 Message-Id: <20190821085455.18508-19-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-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 Wed Aug 21 08:54:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15062 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 9B42A17264; Wed, 21 Aug 2019 09:56: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 5209B1724B for ; Wed, 21 Aug 2019 09:56:40 +0100 (BST) Received: from localhost ([::1]:45590 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MQ3-000791-Rp for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 04:56:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58716) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MPf-0006lp-Qd for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MPe-0005KF-Ep for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:15 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54086) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MPe-0005K3-BJ for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:14 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MPe-0006Ze-9N for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:14 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 20/61] gnu: libsamplerate: Fix aarch64 cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:56: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.156637775324990 (code B ref 36477); Wed, 21 Aug 2019 08:56:14 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:55:53 +0000 Received: from localhost ([127.0.0.1]:34622 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MPF-0006U2-KU for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:52 -0400 Received: from mail-wm1-f45.google.com ([209.85.128.45]:54900) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MOo-0006Oy-Q3 for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:23 -0400 Received: by mail-wm1-f45.google.com with SMTP id p74so1257686wme.4 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55: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=ceFcdaDwBHOsv9Uvv/0eEfLc+9li3sKy4GjKCWzRXVs=; b=LIN0ybhfRVyZvAeIjqZViKj1KXYMAo648wQwoGtuUOUcnOAM2Mz3gwbehu6irjgR0M BeeLX14c/rZyEfkE2WZ+eQAgUU0tX8O2IOP/ICtvnih0v7TM60NzvD+P1T8HfNsjtCBZ T0J41Qe6kJDqg8w6//A2KxVLnN7DmJ6x2FnS7TmOkf24CahYGFcw6YnNxd26d+UDh0BK RUL8UqO2JBS4bSlOTcZX0rXNg+owO+YgMae2axUJVv8+fK4yuZdK5gsh1oolqJCFjpKK 4wSEzOefzZ/AYjO+8FUZ5CVLYXbIbZdE+7LC3d6fXehTj/zWvIF3GH6NQLAZLsyQMLnw j/WA== 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=ceFcdaDwBHOsv9Uvv/0eEfLc+9li3sKy4GjKCWzRXVs=; b=PtOIZirvelDBF7QiWCV2iSGFscAWmJBDDpjoiuSq57/TZqYNGgvev7zcMLajEPg1UL FeqdDtgWoL//hT9L/BrYhBNAdLHh/pNmHWaNaWPm4sWC4RZNF0C/YS6pf8yyBOi2CBd9 CR8nNF+l18lUUAYHS8LtZvHjm9KkRierBTqcKBvl9g4AxIeQIXTi9JVprOm2zmS/ztyq h8Zd9EhWoVO4O1ZUmAU8GCZrG5/WuoR9/sAJ3up3uD2pNPYFRVjAn31eG1/EExDBVa0c LkdNLuoM1DkFIX/VlZwkF2fv17h3PIPoeOs7QJb3W3cbXNVOt4yperTJef66+Sh6bOqB kuLw== X-Gm-Message-State: APjAAAXBpQXN6Tj4nZSoyqX2OWBuVRx7FM8XNfRIpUOVSOj26VDSd6eX 3y3M9+e7Bj8pmJkcyEbBMBTD8XY2nNA= X-Google-Smtp-Source: APXvYqzc9YlK8/RXNoKMx9CQ3rJy6IADtEH3Ry2EIwzzng/1QgfErdYxofJhLu6A7DII9PzOguDz4w== X-Received: by 2002:a05:600c:2486:: with SMTP id 6mr5042145wms.80.1566377716694; Wed, 21 Aug 2019 01:55:16 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:16 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:14 +0200 Message-Id: <20190821085455.18508-20-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-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 Wed Aug 21 08:54:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15083 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 9AF4117264; Wed, 21 Aug 2019 09:59: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 574671724B for ; Wed, 21 Aug 2019 09:59:33 +0100 (BST) Received: from localhost ([::1]:45674 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MSq-0002Sv-CG for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 04:59:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58721) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MPg-0006mO-5T for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MPf-0005Kh-31 for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:16 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54089) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MPf-0005KX-0H for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:15 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MPe-0006Zr-TG for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:14 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 21/61] gnu: mit-krb5: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:56: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.156637775325003 (code B ref 36477); Wed, 21 Aug 2019 08:56:14 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:55:53 +0000 Received: from localhost ([127.0.0.1]:34627 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MPI-0006Uz-PG for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:53 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:54213) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MOp-0006PL-Ig for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:23 -0400 Received: by mail-wm1-f65.google.com with SMTP id 10so1267638wmp.3 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55: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=De++9S1SNkkGhsD5x5ogCQfRcLmeZvaAGpJMAmP8d7U=; b=ZzPbKr7qZz3Y7BgqvVptvDwt7GMitMDIw5EDeWaxd6F+jKyocx+sAL5JzLLCAw5erI uVOF60T0xRy1QdQ112AN4XjlHpm76FJfM5sb0+FrzXCo/ssNlrxIFVGMFGTrV8fmtbhm clM+cYOay5wWW4e3w/qJNU1lW/Ufpsfg02SUKciYPvDFyXEdxiuieo++81yc0VSpK1xH 2Ta4VnLcfLugFiHgZBkLoZCvYdQ7R9QmjhnvPp3IM7tmyqVK7ULIwmpqtAYARhfhPQJq aftP/nHWtfznLFn1+PEYVTB85GQ/SMBoYX6OBMpbwchGeBfnKix1FjPKwK9PlbqYzakJ MCbQ== 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=De++9S1SNkkGhsD5x5ogCQfRcLmeZvaAGpJMAmP8d7U=; b=fRe1PmTXomxEganSyfWX61ji83m9NvXUfXQ08zyUa4Q48QEhWb+3U0AuWAE+SKEjtA REPNVDFtX2tg/gKhF1b1Ru5hvO/L0f6upHZX9zq5jnL+Mr4+725Dlkqmb+98be88I/FA NGt3YZUVAWTx4foQzE25Z1GJuoJ/mPGFZkpFeJtXQ7zQHuX5mnJ+WwBCIkY8JsvEk29z Umiu7yb6dyZq4o8vtpQ7cmLP/V0ptScIZUYHq1L/ZO/XLDyE5FrmUdMhqSvJx+gdUf49 S6CehK8AHKFXSQooCMV73grLpbMrxrOcKPWZaixwn36L/PwG5rpFDuhp5uVYiufr+A7a 0W8w== X-Gm-Message-State: APjAAAWIvoNuSgd0ScQuN3WOYUDLnkWbhmhR2eWiysO/M9pWN9UH7gQ4 5KWX81BWpYnflX8mGL0jh9ycC/X8UyA= X-Google-Smtp-Source: APXvYqy/CqT79nl3rZq4Njf464ucAOOZs4UiPdBozlcWuMUy2Zee71KjEBxuLnkRnpjRwQUCGfA24g== X-Received: by 2002:a1c:45:: with SMTP id 66mr4712115wma.40.1566377717676; Wed, 21 Aug 2019 01:55:17 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:16 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:15 +0200 Message-Id: <20190821085455.18508-21-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-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/kerberos.scm (mit-krb5)[arguments]: Disable tests when cross-compiling. Add cross-compilation specific configure-flags and make-flags. Search for perl in native-inputs or inputs. --- gnu/packages/kerberos.scm | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm index 1253a58546..bf344ce8ce 100644 --- a/gnu/packages/kerberos.scm +++ b/gnu/packages/kerberos.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2017 Alex Vong +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -68,9 +69,21 @@ ("perl" ,perl))) (arguments `(;; XXX: On 32-bit systems, 'kdb5_util' hangs on an fcntl/F_SETLKW call - ;; while running the tests in 'src/tests'. - #:tests? ,(string=? (%current-system) "x86_64-linux") + ;; while running the tests in 'src/tests'. Also disable tests when + ;; cross-compiling. + #:tests? ,(and (not (%current-target-system)) + (string=? (%current-system) "x86_64-linux")) + ,@(if (%current-target-system) + '(#:configure-flags + (list "krb5_cv_attr_constructor_destructor=yes" + "ac_cv_func_regcomp=yes" + "ac_cv_printf_positional=yes" + "ac_cv_file__etc_environment=yes" + "ac_cv_file__etc_TIMEZONE=no") + #:make-flags + (list "CFLAGS+=-DDESTRUCTOR_ATTR_WORKS=1")) + '()) #:phases (modify-phases %standard-phases (add-after 'unpack 'enter-source-directory @@ -78,8 +91,8 @@ (chdir "src") #t)) (add-before 'check 'pre-check - (lambda* (#:key inputs #:allow-other-keys) - (let ((perl (assoc-ref inputs "perl"))) + (lambda* (#:key inputs native-inputs #:allow-other-keys) + (let ((perl (assoc-ref (or native-inputs inputs) "perl"))) (substitute* "plugins/kdb/db2/libdb2/test/run.test" (("/bin/cat") (string-append perl "/bin/perl")) (("D/bin/sh") (string-append "D" (which "sh"))) From patchwork Wed Aug 21 08:54: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: 15092 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 23BFB17264; Wed, 21 Aug 2019 10:00:27 +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 C5D2E1724B for ; Wed, 21 Aug 2019 10:00:26 +0100 (BST) Received: from localhost ([::1]:45720 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MTh-0003TV-Pb for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 05:00:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58742) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MPh-0006oM-9f for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MPf-0005LB-Rs for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:17 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54094) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MPf-0005L0-Ov for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:15 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MPf-0006a7-JM for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:15 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 22/61] gnu: cyrus-sasl: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:56: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.156637775425016 (code B ref 36477); Wed, 21 Aug 2019 08:56:15 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:55:54 +0000 Received: from localhost ([127.0.0.1]:34630 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MPJ-0006VE-C6 for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:53 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:54215) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MOq-0006PR-EB for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:24 -0400 Received: by mail-wm1-f66.google.com with SMTP id 10so1267673wmp.3 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55: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=KkT1K4V0Sv2ZMoakBnb3DurRc6mK7Xt3/G9M48Xo3ok=; b=uysokTu1eRrUdskawCcCdzNQrOO86hBOPo/HeAMuTKmTC5w+9Qr88likfpYv/e6C6F cEGG4LGFd4clUN6Xdopxb2XhtDjq5lWVyUqA4xyqQyWcQK9R3Wr6WSMR7UFakRhXduv9 E9mmkiFAeOY9zpB1AgQssFxHGJ+zNo6dIn55yQELCuNhi8E+K2WZDTucyldAkQ+Sz9IF FIvDW8JjZaZaRSCdPCiKp2W+HGGI+gk7UjIUm//zQ/C7aAuTIbK5jRGHMKJ60cGDZGtC LcS9346dZwLrbfop4pzaIaIEk7kSHLa33IzEqKN0+xR1eA4PpY+1qkV9x2Yb0jcWqCvz VQLA== 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=KkT1K4V0Sv2ZMoakBnb3DurRc6mK7Xt3/G9M48Xo3ok=; b=JweTCJYRKobB3eIoQAA7sU0wHXK08WYtV/noZhlxVVp7Ornhr8RBEIbUypxPWiIN+s i64eQoCaVr7cW/I51sjDGLiKioTHKhtsSbVEDxlcV3uNVYZMetV9PaO3Wg2Q/Ak63Wdc Atw+VL7pPpxhlgmZHCk3zdo7aQUVkNmA4G0uEqCBxLXjoIGokDWVKDTSMIai+rorJzzP X2bUpW2bMvD634xa5fpNed7OPkWe+e0op9qM54Mf9yJjGNxSdPQQf0L1fi/d0oaeK06A 5xuXW38U/544Sjas/lfl5+ClRcCGBCuZYlcQ1ylnmTIIgnKnI3wwFk25BiDCFTLQCKsm 7gcw== X-Gm-Message-State: APjAAAWKORO5EMixkRxF9Qh4uQ4TZImMWx1OfIfyPwejQ+bc3g6SfIlN x76E9LHOY5bVnVnEh4Mo2ZF4tM5tXlE= X-Google-Smtp-Source: APXvYqzRoyoDDkselbMarMcf1hxRfNHLK+lE+nPed7WIgwm9zra4qEcXvddh49Lr4j3mIvq8gncBaw== X-Received: by 2002:a1c:3d89:: with SMTP id k131mr4389255wma.24.1566377718498; Wed, 21 Aug 2019 01:55:18 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:17 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:16 +0200 Message-Id: <20190821085455.18508-22-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-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 de0170ee5f..74f09ba42b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -750,6 +750,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 Wed Aug 21 08:54: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: 15113 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 3A8A417264; Wed, 21 Aug 2019 10:10:21 +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 EF2481724B for ; Wed, 21 Aug 2019 10:10:20 +0100 (BST) Received: from localhost ([::1]:46015 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MdI-0000tH-CE for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 05:10:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58751) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MPh-0006p9-Pv for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MPg-0005Ll-IE for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:17 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54097) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MPg-0005Lc-FJ for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:16 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MPg-0006aS-CU for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:16 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 23/61] gnu: help2man: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:56: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.156637775425029 (code B ref 36477); Wed, 21 Aug 2019 08:56:16 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:55:54 +0000 Received: from localhost ([127.0.0.1]:34633 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MPJ-0006VQ-V4 for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:54 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:51260) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MOr-0006PU-9w for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:25 -0400 Received: by mail-wm1-f67.google.com with SMTP id k1so1278004wmi.1 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55: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; bh=E/uVmeSqkz+XJvAwbv59fabx1fqmQQ6s8kjeSqfBf5U=; b=pVAEz6/YeSXEI8/tx60L2aTlXjxaA1HvCjOED6wtVCNBVYaJgZ0KxBzeUpP0x6xCXb Gp4/dqDhnC1r1NIS0IcHAhSlB79a7xT2K3PQFM9pMFOmX73Io5zGU1mlVxdTJs/ms+/n JzcVLEo1Q0eRPhq77z6cuFW+UMD6ZfTL/OOcxjh3lVe9hep+v1oNl/JpWZ5XGaZX40A5 T0bKwt0yPWtM3jSUiRtc4UwvbdL+nsvd+uvjQYMRbL5ZGdfyOPEtBueshhKjhD7tbJYO BxBAm9CtscrWa94yJbdzgfeqqY4NVyGXsOVW0hmf8J0xrkoNOVgRSujOAKbXo/Hq2Zqw Dshg== 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; bh=E/uVmeSqkz+XJvAwbv59fabx1fqmQQ6s8kjeSqfBf5U=; b=eWEXNPxTnXC/Azg8JftS9t3ZvziWMqby2ZCDH9fvCs57+f50CiI7OAjzuooI+tsnqk 6C+kry0ZbViaZ+QcYl1RA4DNhZ9B0/sAP0L5bhhV4Z+pEP7sWIevrB4QBNdsxM0/wwg2 SPe6S2Vs4IIQoKFC7HEaZOIteQucIHI+e+oec74wrwnkkGr+qg7yDQrbr8iwPwf/xmkX uu3/1IiAQ4DZjWXTOiYZ3ryVZAWNXaEqElaeFXDTjL8We7IkLvhLvoZYV79UEKcbd6uZ 0NAxGp76GRQPhKw3tQ52EqEYvH3bmczEZODDqBGGOWe21N3p7hl8RtAfWVvYHaUAq6p4 KwQw== X-Gm-Message-State: APjAAAX3WV2cKmw4gG7cxUhKGqnlzkdyCjSK31S3xX+XjMam6WXkSe3o 5oGduYicUzT2uF3iIw9kSQI9DPh5zTg= X-Google-Smtp-Source: APXvYqy9GMFKTWsG6LaEwqpKsNHPXdnw2SuaaKd1g0kymEiM9/Lr2tOM//lSE2+LUxSgkZgVVIzOjA== X-Received: by 2002:a1c:1f4e:: with SMTP id f75mr4612235wmf.137.1566377719433; Wed, 21 Aug 2019 01:55:19 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:18 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:17 +0200 Message-Id: <20190821085455.18508-23-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-1-m.othacehe@gmail.com> 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/man.scm (help2man)[native-inputs]: Add perl. --- gnu/packages/man.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm index d6005c1bd3..003ca370d4 100644 --- a/gnu/packages/man.scm +++ b/gnu/packages/man.scm @@ -216,6 +216,8 @@ Linux kernel and C library interfaces employed by user-space programs.") ;; ("perl-LocaleGettext" ,perl-LocaleGettext) ;; ("gettext" ,gettext-minimal) )) + (native-inputs + `(("perl" ,perl))) (home-page "https://www.gnu.org/software/help2man/") (synopsis "Automatically generate man pages from program --help") (description From patchwork Wed Aug 21 08:54:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15063 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 635DC17264; Wed, 21 Aug 2019 09:57:15 +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 2BB9D1724B for ; Wed, 21 Aug 2019 09:57:15 +0100 (BST) Received: from localhost ([::1]:45602 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MQb-0007un-RC for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 04:57:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58764) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MPi-0006q5-7f for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MPh-0005MC-8R for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:18 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54098) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MPh-0005Lz-2k for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:17 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MPg-0006ag-V7 for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:17 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 24/61] gnu: xmlto: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:56: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.156637775525036 (code B ref 36477); Wed, 21 Aug 2019 08:56:16 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:55:55 +0000 Received: from localhost ([127.0.0.1]:34635 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MPK-0006Ve-C7 for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:54 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:39473) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MOs-0006Pf-Aj for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:26 -0400 Received: by mail-wm1-f68.google.com with SMTP id i63so1281789wmg.4 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55: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; bh=NxurnwCHwVy4LfVTbNpLC9Pzc2y8ksRDCm1rqVQEQn0=; b=Xa7Hu3LckvCMSYIwvrU3WdT6TTdCFLGgXiKHfwp/cYiDbyl3HUv3/S83ycEi3GLcYf /s6MBDdmEO3JmacrmIm5vWZz6HXtdyfloy8zokQ4uROCOeB5DILrJXtQCVpc2TTiLNjP hQMGB3KUPIrtv+cWeP4UebUhGVlNBOFRqlWBn32nToGtZMl7jNstXmpqT+qp9/rpNVwI Yl07n+hfzkrILb3piq/Xzn+5GBu3FleKL1tWNrQBE2IBNwgUNJGWghINLDmPfxTiiksU cLMrWwUlK3oR9e4zxPAsRjbUHHwxHrQLW3h6pbq/qfN/TBEioOP8SpXu71H+4mJy4pxF bogg== 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; bh=NxurnwCHwVy4LfVTbNpLC9Pzc2y8ksRDCm1rqVQEQn0=; b=ccZByfPe6omfuD8IGxTgWUyfkZMWHqGvVc3oXcpHr1ExRx8D5xe/3K0b6UT4jvc9Hs zlGNNPKcyk1A+F8nHUhz4V7hN/8W8YQ9dBHREy9t7GWcXhpLbBWN1vz7j4PwyX0D7EGo vZpc/hIgo2I8pOIcI0zWSrktHBtlr2reBudJJgIW5CU7+wn4iVDxT882Ko3Ta2g7R2Hc t08mv78lBlve89Ik7tTw9vBGUqggUwiodmoDST0J6XXURNnMmbHziO//0M3MH0LymlRV wJy7O/MsljOhoAupyrlGW69Gg7x7mqt4Kp1TEwRYtU9sW/0RUuLlqCU7HGUqL8diYlar UyjQ== X-Gm-Message-State: APjAAAWVJfOQLQzPS1IC4CtYlXmNXCJlrwPECBcA1TMFLS7Nigc9tcEc Af4/2NSep86zzYe9POk+WGhFGGd2BOs= X-Google-Smtp-Source: APXvYqwKekXLNjNcqNz1DERIyGmBGaYTIRIyXkC6n3r6YgZ3FC6zOO9ZKqd7489xepYb0ayPSmvj5A== X-Received: by 2002:a1c:cb01:: with SMTP id b1mr4861543wmg.69.1566377720451; Wed, 21 Aug 2019 01:55:20 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:19 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:18 +0200 Message-Id: <20190821085455.18508-24-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-1-m.othacehe@gmail.com> 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/xml.scm (xmlto)[native-inputs]: Add util-linux. --- gnu/packages/xml.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index ffe81fa68b..485faeb8ae 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -927,6 +927,8 @@ code for classes that correspond to data structures defined by XMLSchema.") (assoc-ref %build-inputs "util-linux") "/bin/getopt")))) + (native-inputs + `(("util-linux" ,util-linux))) (inputs `(("util-linux" ,util-linux) ; for 'getopt' ("libxml2" ,libxml2) ; for 'xmllint' From patchwork Wed Aug 21 08:54:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15064 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 7C60D17264; Wed, 21 Aug 2019 09:57:27 +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 30E0F1724B for ; Wed, 21 Aug 2019 09:57:27 +0100 (BST) Received: from localhost ([::1]:45608 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MQo-0008S0-73 for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 04:57:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58785) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MPj-0006rY-37 for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MPh-0005Mg-KX for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:18 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54099) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MPh-0005MQ-H4 for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:17 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MPh-0006ao-Es for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:17 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 25/61] gnu: libarchive: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:56: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.156637775525051 (code B ref 36477); Wed, 21 Aug 2019 08:56:17 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:55:55 +0000 Received: from localhost ([127.0.0.1]:34638 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MPK-0006Vl-U1 for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:55 -0400 Received: from mail-wr1-f47.google.com ([209.85.221.47]:37437) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MOt-0006Ph-89 for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:27 -0400 Received: by mail-wr1-f47.google.com with SMTP id z11so1243177wrt.4 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55:27 -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=FDshpS0AGzzPYlh+byrPPr0rsDhFuT/t6QZf7DVLjvw=; b=ejxn7g1yHWUfYyKfSkzdD1cIgiSgqmwH7wUgoAztSzdscAtdB3u4Q/3OcrJJiUg18k o/FRS2b+VB9I6xiUchzgoSUT88Mmdrpo+WuTbC5nadhlTpqfWBXojHM3bXGxXzVLL/Jj ltAcqg0G4yiS/ZVYuYbfJ7VgWYD/wYysjM0RD7TkP8Lpc/Z2JtzeFlmOHqmrW3O9tbaq zH/pMtS11c+DtBCSnLIjqty+H7c4R7psBb2i2hAPo3w58ivHHxIdjoaI4ex6d0TRqBfR bE8uzjyKoeUyOlPDx66hTPUzBB6CQPamQYpEI+HqcOaBYMYPsj5ns+iU9EtDYFaVZHu4 38MA== 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=FDshpS0AGzzPYlh+byrPPr0rsDhFuT/t6QZf7DVLjvw=; b=T06IgWVj8bmUGwDfvneXs8gsXBbQfwO1/Hc4VzjvclhGZ4R26sRUrOFG62o3KewaCH CI/rQFtqyfc4qVN4BITM7QY0tD+s/xo9e1XKGvWbkMQrEGgNWs5tScEQH8DYjAZxYZTo iEJv1DGbj2MO/PiC0RF9k2p3YPyOMFBhRbxLr31tKIDU2klmYxLJd4wGqLJ8eogDesRw YySheZIxkCelmtOPjp6NkTPGo0WN6eO3uB0nde0HyepAp3BCRrWr7OzIrrcEHYpljaEd wSwYsnahusTtxyj3jtJPsfeJdwhW2LRuM1hIXQXhCJCNyhRHcH28EwJKP2T7K//f1JCG NiEw== X-Gm-Message-State: APjAAAVgEoAXSKHxYQ5CJWNAq6lg3ntofyajDF5/X1kW8zovbYOO7r1A Al8+BdIleIu34s4bXMoC8zYsXpzYiIE= X-Google-Smtp-Source: APXvYqwZ5ZAiwZoieIY7UUz3DpeLJPLIYZ7qiQQYFMKBe5JwEMmMr712EKL0RN2/rymVtZaAY5BtKg== X-Received: by 2002:a5d:4f81:: with SMTP id d1mr39736889wru.177.1566377721350; Wed, 21 Aug 2019 01:55:21 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:20 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:19 +0200 Message-Id: <20190821085455.18508-25-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-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/backup.scm (libarchive)[arguments]: Do not build and run tests when cross-compiling. --- gnu/packages/backup.scm | 47 +++++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 18 deletions(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index a92c8c9aca..512882c17c 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2018, 2019 Ricardo Wurmus ;;; Copyright © 2019 Alex Vong ;;; Copyright © 2019 Marius Bakke +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -230,24 +231,34 @@ backups (called chunks) to allow easy burning to CD/DVD.") (("/bin/pwd") (which "pwd"))) #t)) (replace 'check - (lambda _ - ;; XXX: The test_owner_parse, test_read_disk, and - ;; test_write_disk_lookup tests expect user 'root' to exist, but - ;; the chroot's /etc/passwd doesn't have it. Turn off those tests. - ;; - ;; XXX: Adjust test that fails with zstd 1.4.1 because the default - ;; options compresses two bytes better than this test expects. - ;; https://github.com/libarchive/libarchive/issues/1226 - (substitute* "libarchive/test/test_write_filter_zstd.c" - (("compression-level\", \"6\"") - "compression-level\", \"7\"")) - - ;; The tests allow one to disable tests matching a globbing pattern. - (invoke "make" "libarchive_test" "bsdcpio_test" "bsdtar_test") - ;; XXX: This glob disables too much. - (invoke "./libarchive_test" "^test_*_disk*") - (invoke "./bsdcpio_test" "^test_owner_parse") - (invoke "./bsdtar_test"))) + (lambda* (#:key (tests? #t) #:allow-other-keys) + (if tests? + ;; XXX: The test_owner_parse, test_read_disk, and + ;; test_write_disk_lookup tests expect user 'root' to + ;; exist, but the chroot's /etc/passwd doesn't have + ;; it. Turn off those tests. + ;; + ;; XXX: Adjust test that fails with zstd 1.4.1 + ;; because the default options compresses two bytes + ;; better than this test expects. + ;; https://github.com/libarchive/libarchive/issues/1226 + (begin + (substitute* "libarchive/test/test_write_filter_zstd.c" + (("compression-level\", \"6\"") + "compression-level\", \"7\"")) + + ;; The tests allow one to disable tests matching a globbing pattern. + (invoke "make" + "libarchive_test" + "bsdcpio_test" + "bsdtar_test") + + ;; XXX: This glob disables too much. + (invoke "./libarchive_test" "^test_*_disk*") + (invoke "./bsdcpio_test" "^test_owner_parse") + (invoke "./bsdtar_test")) + ;; Tests may be disabled if cross-compiling. + (format #t "Test suite not run.~%")))) (add-after 'install 'add--L-in-libarchive-pc (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) From patchwork Wed Aug 21 08:54: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: 15086 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 15F6717264; Wed, 21 Aug 2019 09:59: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 CC1301724B for ; Wed, 21 Aug 2019 09:59:43 +0100 (BST) Received: from localhost ([::1]:45686 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MT1-0002l2-2L for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 04:59:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58787) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MPj-0006rh-Bh for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MPi-0005N3-1l for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:18 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54100) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MPh-0005Mz-VA for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:18 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MPh-0006av-T4 for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:17 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 26/61] gnu: tcsh: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:56: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.156637775725063 (code B ref 36477); Wed, 21 Aug 2019 08:56:17 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:55:57 +0000 Received: from localhost ([127.0.0.1]:34640 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MPL-0006W0-GT for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:55 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:37990) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MOu-0006Po-9p for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:28 -0400 Received: by mail-wm1-f68.google.com with SMTP id m125so1280865wmm.3 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55: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=66OiDMWgfX+B6XMekB3nYbPolx3K7tC8SPcmTdUsp64=; b=WvNU/3xaeHqmUvFuG1MHUcyUL1L5QLiI8d1MbHscV2TwXhtO+sCsjBlixW0IHPMJVw 2eFzIutElGAjk+0AlL0vuUjLGAVKVTR7YJn3nWs23IOOR33w9iDNN87uPHJypWkyuVBx LRgZOKJuRzfyFWFIWvsZX7UItc3A1FnUYKiAnxwAkk0UuPQiK0oFYHsMFStWh7ATPFxf InhuM6TEyk+7JvBpz6ZGfOq5HHWTdPOLT/Hfz/AyLIJUNoL4ZQmBGKy2zYTO8g/vtoXi XCiyIGjEAJNZA9zB+QZOzv7DSDKSOU7P+C5gMGZfpLFh4XJ4a15xIBiE64zLV7Hf05wf pBAw== 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=66OiDMWgfX+B6XMekB3nYbPolx3K7tC8SPcmTdUsp64=; b=lErvdGrZJHIjTax2GpRDYSeTsyK3zvXeGVaj8moYQwQrQkJJlgDHQ9egpxW4zdw5RU 03r2sEeFVBGKRgmpZPAmlMV+uDWebw+NeBp6S9ldpFVomYNZqtiOoMdY5W3eVCSIxSwP GF2Wf+sqlF2dSjUx1bsQE4rbJnq2u8RyGR4GkZsZHyv4LF0xhVrH3mh1W3SjEBxDO3X5 NOFIADFsX5pj4NspATNF0S4Nq+EzBRsxPAlsJGcCXjcOzovmD1fDqzcLijO6b0AcMZ4d u3otkck0QsWq/+FjR8qjmR5Ds7lLkhwjEdwnLKU4AG9Gp6DCR1b3oGiPtmusAz7eiaCE pGwg== X-Gm-Message-State: APjAAAU1tk0yF88m6fTI6AZOU3Tilz7i2zh1F7oy7YwtDk1x0qzXhq3N Kxx8w0L7MWeONUcP5rTow3GPa3mEooo= X-Google-Smtp-Source: APXvYqzCqy7q5BSYl6aeCTUg5Q4Qxwo70jYZo4Y5elMs9cJSBUUyGpaBCMg2c/0VBwCN5qSkDBXo9A== X-Received: by 2002:a7b:c244:: with SMTP id b4mr4653854wmj.125.1566377722446; Wed, 21 Aug 2019 01:55:22 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:21 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:20 +0200 Message-Id: <20190821085455.18508-26-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-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/shells.scm (tcsh)[arguments]: Replace "cc" by "gcc" as native gethost compiler when cross-compiling. --- gnu/packages/shells.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 0579c167fc..cf578151b4 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2017 Arun Isaac ;;; Copyright © 2019 Meiyo Peng ;;; Copyright © 2019 Timothy Sample +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -356,6 +357,14 @@ written by Paul Haahr and Byron Rakitzis.") (arguments `(#:phases (modify-phases %standard-phases + ,@(if (%current-target-system) + '((add-before 'configure 'set-cross-cc + (lambda _ + (substitute* "configure" + (("CC_FOR_GETHOST=\"cc\"") + "CC_FOR_GETHOST=\"gcc\"")) + #t))) + '()) (add-before 'check 'patch-test-scripts (lambda _ ;; Take care of pwd From patchwork Wed Aug 21 08:54:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15114 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 9B3D517264; Wed, 21 Aug 2019 10:10:28 +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 5F0781724B for ; Wed, 21 Aug 2019 10:10:28 +0100 (BST) Received: from localhost ([::1]:46016 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MdP-0001A6-ME for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 05:10:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58797) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MPj-0006tv-Ul for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MPi-0005NZ-HZ for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:19 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54101) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MPi-0005NN-Dn for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:18 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MPi-0006b2-B2 for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:18 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 27/61] gnu: pkg-config: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:56: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.156637775825084 (code B ref 36477); Wed, 21 Aug 2019 08:56:18 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:55:58 +0000 Received: from localhost ([127.0.0.1]:34645 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MPN-0006WA-IN for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:58 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:54223) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MOv-0006Q1-L6 for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:30 -0400 Received: by mail-wm1-f67.google.com with SMTP id 10so1267895wmp.3 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55: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=i+cRoVHaPZfvZWWv6NanxhZ6jLleIkdTA2WbQE26ZA4=; b=RpP0zK7IbWoQCRGSHfgyB4UpmSsqlTq9Ie7FP3wtIiJNI22aAHDlBhLldayo5tmcgI i1Hqk0l+2HrVxytaWrrEx8SHh1Bu7ZIkPyif3wlfPyPiWcaHCl8froGl+9UClW+VLNkW wD6NHIJhOGVwjqt4ZLFExXTXu3gJ4Ajn8Bu5zmK3uSe6Dr/RWoof7lBxgsJppTJQuyaD 1RVsiVjVckmszB/F254orLJa5IvKSpH4FIHKMRWwd9UN9ye5McaGQnz+24qsr+zyHbEC btm556Gvy4NaZZpCVmkYgGcvnS+h+oaal+KFa3Q3/dzC2ZZUuCC/UgOjSVwHiOwqf4YB RaOQ== 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=i+cRoVHaPZfvZWWv6NanxhZ6jLleIkdTA2WbQE26ZA4=; b=Qflqw0V0fTOlJlly4YwtxnS+2MaJbbJB7vtJd27w1bq1+iIsJZLEGg2HJSFgy85hjn eC+YzVtTJmnoViBwYIu0def1JuFgGC2NHdp3B37fkXCDpN9ipBoPdJJQeSYANX7tWj+K dKQyp3uneYWiW0ZM1Uufrhu9hmnHI1DrAa5u0Lai1DPAGTjbtI+0nIeyzYhleS3kdCtx EXU/XYbvbEqBuOMlomE5Yw9mExMmN6Y/RgvDghRisLx1ry3NlkE3zzbEvRtvYgXmFR/l 7xJ3XkUxRx3lCvHPF1dr9Qv5kVTnAXi5Cttx0G5qBUBTxvjDqwZbPoTvkWtcJ217sBZ/ H8Qg== X-Gm-Message-State: APjAAAUx/uCLjEaQ21nPwyk0sWMDRf3BDB5mPku5vwDq4boW/P/DzkVy rScu2X3fwtn0U7VLDmDabPBYT8W7I8A= X-Google-Smtp-Source: APXvYqyntmxTHGTFIpmg8lh6402fqZC0M5s6uY8aEIG60klNAinEzgLjlWHG9FRYdnjPTa0OUaVTSg== X-Received: by 2002:a1c:ed04:: with SMTP id l4mr4898306wmh.81.1566377723702; Wed, 21 Aug 2019 01:55:23 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:22 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:21 +0200 Message-Id: <20190821085455.18508-27-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-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/pkg-config.scm (%pkg-config)[arguments]: Add configure-flags to disable tests that fail when cross-compiling. --- gnu/packages/pkg-config.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gnu/packages/pkg-config.scm b/gnu/packages/pkg-config.scm index 6fc19a975d..329a63658a 100644 --- a/gnu/packages/pkg-config.scm +++ b/gnu/packages/pkg-config.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2014, 2016 Ludovic Courtès +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -48,7 +49,17 @@ (base32 "14fmwzki1rlz8bs2p810lk6jqdxsk966d8drgsjmi54cd00rrikg")))) (build-system gnu-build-system) - (arguments `(#:configure-flags '("--with-internal-glib"))) + (arguments + `(#:configure-flags + '("--with-internal-glib" + ;; Those variables are guessed incorrectly when cross-compiling. + ;; See: https://developer.gimp.org/api/2.0/glib/glib-cross-compiling.html. + ,@(if (%current-target-system) + '("glib_cv_stack_grows=no" + "glib_cv_uscore=no" + "ac_cv_func_posix_getpwuid_r=yes" + "ac_cv_func_posix_getgrgid_r=yes") + '())))) (native-search-paths (list (search-path-specification (variable "PKG_CONFIG_PATH") From patchwork Wed Aug 21 08:54:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15088 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 A24AF17264; Wed, 21 Aug 2019 10:00: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,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 564D41724B for ; Wed, 21 Aug 2019 10:00:07 +0100 (BST) Received: from localhost ([::1]:45698 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MTO-00031V-52 for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 05:00:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58825) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MPk-0006wA-Ow for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MPj-0005ON-Hh for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:20 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54103) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MPj-0005OB-9S for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:19 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MPj-0006bH-7W for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:19 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 28/61] gnu: mkfontdir: Fix aarch64 cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:56:19 +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.156637776625184 (code B ref 36477); Wed, 21 Aug 2019 08:56:19 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:56:06 +0000 Received: from localhost ([127.0.0.1]:34660 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MPV-0006Y3-Ug for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:56:06 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:51266) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MOw-0006QH-II for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:30 -0400 Received: by mail-wm1-f68.google.com with SMTP id k1so1278257wmi.1 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55:30 -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=0ptBZb3n2bYaP2VzVC64s792fkyNqp7zY774lcQ3mXU=; b=blXaseuVCxkI7Mz9LaZH+6gz4IvvDQoAw7WZrQGyqzCYXkJDZLXquV0i+mWtaq75QB hry9YCVa1FCSeo8Z46KfMU0Mz8twfw9ntton/aG9TYC+7BICuWn3ywiKtmxJ6Orkkb1v lJNvdrRvYKRGAFk3pFtKU+Yk1jvv+pNB1/zkU2Z019lmi8rcbSD+wfppNZR5hXsZZSBs Lkn2XbIDR/jlAPASEO11UkTYm0/trGzAveL5tpbN8MFvUcYrxiE9xYxHcYzSlhLN1dTD baG6Ma0wwdpeVoHqq7weLS0XSfLN9i4YGBegEoNVKyq0ZK8pKXggR2J33AAGorU1QZbO 1bBA== 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=0ptBZb3n2bYaP2VzVC64s792fkyNqp7zY774lcQ3mXU=; b=kZnuT7EhZdR4matwpcHgKouZCoE9FFySpQAc/+YHLmLI7DwHY1nYBhE3Il3zvKn/l6 13Mj3BPtWZSKrjayfMgqm9tedxy9h5BU8lTpyWfImqDVj1FFMplo1Pkos4TTDrUne8Cz PEPlqG3MTBfsn46hA5VSxgifBGQcPSMW9IFzlm6pnsC9Hw2bbTt2xb+0Hlv9QId03G0J 6BKMePvXFYFcIbMXPJwv2cnmB2mCIMpVkFD0iAzEUBu2UXAi9oZmxin4fY8huS4uzsCj D5lOAj7+zv+t5E2jiYpcmqmhuuTatloj1/Pj7K8kPz5c/5KyFnHlldV9p5lNgy7v08Ks x8jQ== X-Gm-Message-State: APjAAAXnxNGMmiuw4ag6kkIQhhyBu4dHVSRWukEjhOSVbygvRJHTzdKU r3/oHO7tFIz/RbNgLO0+n6gd4IwhTmQ= X-Google-Smtp-Source: APXvYqyyfODyqYSCJX78daqyrcYEwazRYb/Za338+md9OwD9w4+PncyOAPVmGRDZsvjx18USU/SCIg== X-Received: by 2002:a1c:45:: with SMTP id 66mr4712810wma.40.1566377724707; Wed, 21 Aug 2019 01:55:24 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:23 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:22 +0200 Message-Id: <20190821085455.18508-28-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-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 aa89dafe90..d4ea12be95 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 Wed Aug 21 08:54:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15115 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 29D5A17264; Wed, 21 Aug 2019 10:10:36 +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 D0F521724B for ; Wed, 21 Aug 2019 10:10:35 +0100 (BST) Received: from localhost ([::1]:46022 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MdX-0001Oq-5M for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 05:10:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58847) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MPl-0006y1-Mc for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MPk-0005PB-AV for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:21 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54105) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MPk-0005Oy-6t for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:20 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MPk-0006bW-3x for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:20 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 29/61] gnu: alsa-utils: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:56: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.156637777425285 (code B ref 36477); Wed, 21 Aug 2019 08:56:20 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:56:14 +0000 Received: from localhost ([127.0.0.1]:34664 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MPZ-0006YN-Bw for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:56:14 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:50946) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MOx-0006Qb-Dy for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:35 -0400 Received: by mail-wm1-f66.google.com with SMTP id v15so1276604wml.0 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55:31 -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=F3NvvDW9Ba+hV+ShQRawJdoRDfPQfpydb4ccO2n2SlQ=; b=C/2a/NoTJrJrJh6FqDVJ7MiLW4JBTbhP3UN2jiY3AX1+pCzGjs0cNxo7XBzeK4mz6f q7B95aYLUFV8OLPLO7dGV+Uu6FNVYwrH5mCqr1yyx2bIcNlm/+GC2A3TNZZ/SUb+gz44 P8JHbOrrkw1YwqrrQhClI6bydUIUXskBiBT+K+9uA0HSilkdmTHtVvpGY6By+cTDhwTg TxqAhBuQHgdFdTJJKeNGtrSEg3sbloBrOKq5JOhn3jKtsyop1JMK5XtOFp09M7kg2Go3 +X2pvqhCXw9qL5WdDFj3rPXxXGPIQmQkN1o36g00RXe2BBSlhsVvjQXoIcdu/C06oz5T tWMg== 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=F3NvvDW9Ba+hV+ShQRawJdoRDfPQfpydb4ccO2n2SlQ=; b=r+eWI2+F0td5/rt4ozvw/MYVT1cNl5v7gkC+PBeFe4Ln4R1QEYTvCKto6e3cUl1kyK d7NbQuMXYuK7Mpt+8sprPIRvojNNxnPfNjMb+dh/i0HfykwLy2s2sMfo9lyFayYyzaRY Yq6CGY0pLFe7JBAdkdoHs+wOEWhr2nj2laBqqb8YktfP+mkOzeSNKfg7SAUP/rZcs1gZ ojOw53NpLlNU/m5nk+D3gFpRWw7QZykaCeE2YCYwBehDDVfdWrzeNUL1EbuzHRP3+Lau 0FHvrByQv+xFVMfX5gNMb3q/0mGkTqqIUAD+7NemKqIi/k47vkl27ygvSndVwUj1ZHpI VVAA== X-Gm-Message-State: APjAAAVjyFHyGk5/8Uz7MQcNuS+lohMAWEsaQhOl6JaBBQ0Fr/oFld+U V9b8B+8Y9mrgIck6iYsWTLm+mGRnVsg= X-Google-Smtp-Source: APXvYqzSQovUKdStTlxpCI9oIF9h0azFuXYbjcsLfhmn1vjI+9v8vtrszzrRP/LbntvMti7IMLfc/A== X-Received: by 2002:a7b:c1c1:: with SMTP id a1mr4992006wmj.31.1566377725554; Wed, 21 Aug 2019 01:55:25 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:24 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:23 +0200 Message-Id: <20190821085455.18508-29-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-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 (alsa-utils)[inputs]: Move gettext from here ... [native-inputs]: ... to here, in order to fix cross-compilation. --- gnu/packages/linux.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index f2e36ee7b4..2f7dceca22 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -22,7 +22,7 @@ ;;; Copyright © 2017, 2018 Leo Famulari ;;; Copyright © 2017 José Miguel Sánchez García ;;; Copyright © 2017 Gábor Boskovits -;;; Copyright © 2017 Mathieu Othacehe +;;; Copyright © 2017, 2019 Mathieu Othacehe ;;; Copyright © 2017 Clément Lassieur ;;; Copyright © 2017, 2018, 2019 Rutger Helling ;;; Copyright © 2017 nee @@ -1518,12 +1518,13 @@ MIDI functionality to the Linux-based operating system.") (("\\$\\(MKDIR_P\\) .*ASOUND_STATE_DIR.*") "true\n")) #t))))) + (native-inputs + `(("gettext" ,gettext-minimal))) (inputs `(("libsamplerate" ,libsamplerate) ("ncurses" ,ncurses) ("alsa-lib" ,alsa-lib) - ("xmlto" ,xmlto) - ("gettext" ,gettext-minimal))) + ("xmlto" ,xmlto))) (home-page "http://www.alsa-project.org/") (synopsis "Utilities for the Advanced Linux Sound Architecture (ALSA)") (description From patchwork Wed Aug 21 08:54:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15066 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 403F517264; Wed, 21 Aug 2019 09:57: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 EAD9B1724B for ; Wed, 21 Aug 2019 09:57:57 +0100 (BST) Received: from localhost ([::1]:45618 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MRJ-0000La-3D for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 04:57:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58831) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MPl-0006x6-7K for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MPj-0005Oe-RG for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:21 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54104) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MPj-0005OY-OI for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:19 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MPj-0006bP-Lo for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:19 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 30/61] gnu: icu4c: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:56:19 +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.156637776925199 (code B ref 36477); Wed, 21 Aug 2019 08:56:19 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:56:09 +0000 Received: from localhost ([127.0.0.1]:34662 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MPW-0006Y9-Fi for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:56:06 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:51267) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MOy-0006Qy-DX for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:32 -0400 Received: by mail-wm1-f67.google.com with SMTP id k1so1278325wmi.1 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55: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=NFg6rLe41Vu+A3BWHTZt5cAsvwD5MY8+jVW7IoSdJo0=; b=tPCikRY5TQSFqYFFbW1zv5X9Mk2TTgQ7ocvywcGq3pEPpxlEHXSlJYM/YQSJSKvTVM HVtyaqw+2B/iCN25+XhwGSeq/hUNoaGOoiy7exfYNzUCofmO+37V1P99R24wPgg6wsCU 1RsC45bnn7bfkr4Y6agrJT1FTdHGHRIBCa/LiEaUDD6A/BMRFUMS/4Htr0RiqyeIFrrh N4zdNil/FJak1iTPcn7BZAI1b5LQn9v+yW8r7iHdZy7xpHYAkiECKxjizEU181TZiwGX d0vjNES/DmwgXhDWg1LnD2OAy1kE/ivUzGfK5gBlRQf2uSwUCMOptyPAD4Bo/lu+ROWv 3LYg== 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=NFg6rLe41Vu+A3BWHTZt5cAsvwD5MY8+jVW7IoSdJo0=; b=nk0Hn6TQrJmmfgEtAVFbePOkdG3DdUkjZr2qgHSkGWI6nIdYdzMnTjRuiSwF23xcb1 zgNG804eTCqmoYdo7pz7BXCjxwBLbX1XSaGCkMq5HkV+xBeg/UCnnkgQNkhUpADu27uy 9qCgEiRX3L8QqmUOZcNA/EZWnA5OYYobD1wpOaBOFi62zYDhdRZwHQQuzPqwapzUIEGK 10fZ2A4nRP1RLz0/UN57YL4h7yr8OvFzuVoiSaIlXMpjnw6lVsjkSyhkMNHjA493sQnX P7KknQSgODG32JR4Yo00CDl8bmoXoudVbYidvXJXlCzL5zJPFGqWKzvQVFJgrszNc89t 6E+g== X-Gm-Message-State: APjAAAUG8kHvHfeqiwYMF5Ej2TztfkQqHA1HlhkmyU6byF7JX9VHZWa8 2ECCP1EfWYpBL8/jI283BvMNR4sMKUw= X-Google-Smtp-Source: APXvYqxrQkejHh/bjvZWCL/f9V+g00BjfH44I4C7B/50p0/mdKqRLW7FmlEGVb9iQ3odo8hEI6SVUg== X-Received: by 2002:a05:600c:228f:: with SMTP id 15mr4486864wmf.160.1566377726458; Wed, 21 Aug 2019 01:55:26 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:25 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:24 +0200 Message-Id: <20190821085455.18508-30-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-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 Wed Aug 21 08:54: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: 15094 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 38F1417264; Wed, 21 Aug 2019 10:00: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 EF3E21724B for ; Wed, 21 Aug 2019 10:00:40 +0100 (BST) Received: from localhost ([::1]:45740 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MTv-0003u2-Ny for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 05:00:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58852) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MPl-0006yM-RV for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MPk-0005PW-PL for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:21 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54106) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MPk-0005PP-MT for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:20 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MPk-0006bd-K8 for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:20 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 31/61] gnu: glibc-utf8-locales: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:56: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.156637777525299 (code B ref 36477); Wed, 21 Aug 2019 08:56:20 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:56:15 +0000 Received: from localhost ([127.0.0.1]:34677 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MPe-0006Zm-Or for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:56:15 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:54703) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MOz-0006RJ-FK for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:35 -0400 Received: by mail-wm1-f68.google.com with SMTP id p74so1258214wme.4 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55: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; bh=oIVbmgYt8LnavYVjeo2g/0p8N8/+RDw6+zRoqMHeIHc=; b=KGP+yJu3IMp3Pq5JQ6emrzY/9+KoclHpYESpVZFiGLGbjSP8SsBpoxDxGu2X/Srk+w Ef70YmOc2xlWWCW9qns9iV39qIe/4iz/zVFuxRoLwcrJVbnXg/H0SuJ5WX0wPjOV54pz dwCl2aeGmRxrdUC0qJMvb3Pw6G7ZWu3s21vieGO9FT0+hAexiRYGYA5+PAYl+bGSB2/X Pp4wrkK2/ZeiHazZPf5VttHBPwUumNZcKsOeNjMyOe5sgnfkklGkyqNSUEIp79FXHwYp h4YwdrInNnPoRBO3S5G9ru5Rp4bG4h0T7GeAwpHohpiP68YTHbQeo69m8k8fYZ50cwDF fq5g== 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; bh=oIVbmgYt8LnavYVjeo2g/0p8N8/+RDw6+zRoqMHeIHc=; b=dkKobdEBXIzzHwb+Agr/4z95e0YBdPTfYxbO5r28e8kGGtKNjeprhsvxLlLBvmmtFn 8FKrDS5YWnJ3RLBIsZwCHJOHHRym7r5dmOOWDkZ3PllVJ0jgDDShmTiavUtY/FzsiXjS usTzSKLNr3X3dYl95Xe148EWdgVEp9O5V4D5xGMrT6FwQXRyfZRdiBYcKw4/br/cGp/p cAKgpeQM1+mtD7jQ4HOEB4Y9IPTF0o2MZxNRpaN3o75mDYBFr1uVu4oS1hMKv/yWTrqD 1rySvulmLaTCHOUlNeHGY30GVLf9Lkp9xUcMH7v2e/WybOe6Setc0BOHAvkfEiAMr/q8 7xkg== X-Gm-Message-State: APjAAAV0aiDaDlytPOzKKogQIplLuMUCjqrd9vjA39hxQTYto5/tmCtj 15Z7BIzcYM5j7BWOb/j1TZyUBab+9yY= X-Google-Smtp-Source: APXvYqyHZXFbJgciR2MapT80lDe4Ovkwh/qd15AueU8Q5o3Gnnezy2PW6PysA0pigjX3se0eRb9M1g== X-Received: by 2002:a1c:1d08:: with SMTP id d8mr4641875wmd.22.1566377727582; Wed, 21 Aug 2019 01:55:27 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:26 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:25 +0200 Message-Id: <20190821085455.18508-31-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-1-m.othacehe@gmail.com> 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 Wed Aug 21 08:54:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15076 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 B80DF17264; Wed, 21 Aug 2019 09:59:11 +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 595D61724B for ; Wed, 21 Aug 2019 09:59:11 +0100 (BST) Received: from localhost ([::1]:45658 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MSU-0001p4-Ck for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 04:59:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59086) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MQS-0008Bb-4Q for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MQQ-0005nZ-OA for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54165) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MQQ-0005n7-4e for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MQQ-0006gH-2x for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 32/61] gnu: boost: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:57: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.156637778325452 (code B ref 36477); Wed, 21 Aug 2019 08:57:02 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:56:23 +0000 Received: from localhost ([127.0.0.1]:34702 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MPn-0006cM-4D for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:56:23 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:54230) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MP0-0006Rd-Gw for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:39 -0400 Received: by mail-wm1-f67.google.com with SMTP id 10so1268113wmp.3 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55: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=0wD/VjiysVkTi8Oyq0Z7V2CCINIwi/qRp15LMRmEvWo=; b=pjjD8xQaArvjjGtXCAofRsgWPKiQoJbrZFJfvoTgvKICkClmowkM29Dq+cXCXLFwxe ifJdzApMA+V3f+EUusaGL8QkoXHEAxS1WNWXhlpq9zDWXxRF3+9kb0yhxT02k/GCiUZa QbUxbZLKLbsmGDvLg7+q34/Zjmixz7GfE9dokcInr2MIo/dZdM6EMTInpQZAYNpbP4MT qIXWkEYaAKnQj8E3PPf+bvvR2qmzHISDU2IYMSb09TzHSlCu/5z8jikeLXoR8uIjn4yV I1Af0AMznKDhE5VAMoSVt/9LO0GM7kgtbtQicbgtdA3+v+Ny1son1hHRt/xOaSEDVdBj 7zDQ== 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=0wD/VjiysVkTi8Oyq0Z7V2CCINIwi/qRp15LMRmEvWo=; b=YQfUghni605socf4zPbgsLLHhNnCJcTq56nGPhI9wMPn4a/M9dMhsi5DCSBhM8BZ6S MHa8SA54QELdMYFZT4TZZQOi4+f/OTNDRzeZYaWDts4vUAaNpSBr7OyH/Hb9VwpcfbCp KdX7+/w2tpMeeGoY5+ku9J+3LS9TUR5QGDcYjCowGZx4WOXqVgTWCsZrxGVkmVLdCUKC jP8RxUnYKimUpKn9EuZGiXW8UIblXh3LaCu1hr/FEZPWRBBRU3MWJs386rbMyMWjptNO UBLIE4XmCxEKaQQ1jHlTQpiOCqjanJPola5Zh13gVQ1vCgnWTWerVmqk2oRCW+M/Pv1i 8vHg== X-Gm-Message-State: APjAAAXE8Xy07DTN0lUldCLNazdZ7gyYzvOH55PUJqMNDJj1AouPKoX6 0pmH8dCzcqj/eiL6lESqPN6FrixKFbs= X-Google-Smtp-Source: APXvYqwiuvfQUA2j3QaIFQEFYzmyX+xpyxnrDneZONcT+5GNzvHopMXsVRxXnhvHvQPdDKdaGbhvtA== X-Received: by 2002:a7b:c8c1:: with SMTP id f1mr4335452wml.87.1566377728493; Wed, 21 Aug 2019 01:55:28 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:27 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:26 +0200 Message-Id: <20190821085455.18508-32-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-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, [arguments]: pass cross-compilation mandatory flags and fill a user-config.jam file pointing to cross-compiler. --- gnu/local.mk | 1 + gnu/packages/boost.scm | 28 +++++++++++++++++++- gnu/packages/patches/boost-dumpversion.patch | 24 +++++++++++++++++ 3 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/boost-dumpversion.patch diff --git a/gnu/local.mk b/gnu/local.mk index 74f09ba42b..a45a1a0802 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -708,6 +708,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..536a4bee0f 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")))) @@ -76,7 +79,22 @@ ;; 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" + "binary-format=elf" + "target-os=linux" + ,@(cond + ((string-prefix? "armhf" (%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 +112,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 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 Wed Aug 21 08:54: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: 15070 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 2F14E17264; Wed, 21 Aug 2019 09:58: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,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 E5F871724B for ; Wed, 21 Aug 2019 09:58:16 +0100 (BST) Received: from localhost ([::1]:45626 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MRb-0000r6-U1 for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 04:58:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58873) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MPm-0006zk-KU for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MPl-0005Q3-Aw for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:22 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54107) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MPl-0005Pt-7f for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:21 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MPl-0006bm-4j for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:21 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 33/61] gnu: eudev: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:56:21 +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.156637777525312 (code B ref 36477); Wed, 21 Aug 2019 08:56:21 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:56:15 +0000 Received: from localhost ([127.0.0.1]:34680 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MPf-0006Zz-5b for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:56:15 -0400 Received: from mail-wr1-f41.google.com ([209.85.221.41]:38073) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MP1-0006Rm-4k for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:36 -0400 Received: by mail-wr1-f41.google.com with SMTP id g17so1238891wrr.5 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55: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; bh=+HxLWYzZW0Hr0WREkiGNAPfQejKpPVvmtO7VILy1EcM=; b=h8UeTgijqCMxMRjXAIpMgnjssX4+hY8iMg1fUJEKBNYSvnS8UcosW1jpTlwQMd4nmP +BUAGs9QC5foVVczTUtAL9LZbe7uVHvTZv7bxP8c+BLrIerrlsKma+dVLowGwdeos7dx tBxHaAfw1dDiM8EybQj9FAxhjUg7LJV3IfE3JJgqXUQtGlRlgSQc5EltgQiJja4ouo4w baB0qawNFvfzc7mwBNLuuSZbvJJiCZX94UaclBahBOS3JG1E5dSmkTWzFg2cc6MYODdJ EzSSl2zrkwMWBk9XXQLt+cWQb3Q1kzMG55uQPfnpSmD5GQD86i0I89+lga/8bD9ZIHt8 zQnQ== 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; bh=+HxLWYzZW0Hr0WREkiGNAPfQejKpPVvmtO7VILy1EcM=; b=fZohicDgHlptCBS1l5M9RcUgzoqtRe3ZxzJ3hVNPeiNT50v94Dz2vxULk74fl30547 5JXOArEhZJ4sMSQHpMOsroyQBIQ5iOw7Mky4QdU4NNZnIIsPvKu9qEUla+7RSHYS/K2I 8rPHxezN/JeuwwT5yA04cM0camQtgAsZiUSWxVxBrzKBY/Wl5YNVzXHcXhq1qK38xZhS Wbqac63/TavEVdrV0u8ZcdVSzg9l+gxcwanoLI+GbS9rTfT1v9ZL661DygCyCEjhJKOw 88zXHQZXPVhxl5eBL/UtO1p5ge6o27EggB0LvQlFt5ldJqZ6OWWZuEU/PAqREsTharIE 3xog== X-Gm-Message-State: APjAAAUHjwNf3dw+s7RDv687aN6LYHpYf7bf0FbjKOG9YIINvDOCMKnJ 3rSVJsquR5yN/kYA02Smavw0d/g8WHU= X-Google-Smtp-Source: APXvYqzrRarQE2WA8KPOZKeZLSgE5a0DbkHbxabV/LfrHhF4199BV3Ck0ZrL7geMGYdIYO/JxrbUOQ== X-Received: by 2002:adf:e3ce:: with SMTP id k14mr36699978wrm.303.1566377729122; Wed, 21 Aug 2019 01:55:29 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:28 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:27 +0200 Message-Id: <20190821085455.18508-33-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-1-m.othacehe@gmail.com> 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 2f7dceca22..f0c0de666f 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 Wed Aug 21 08:54: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: 15116 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 0402A17264; Wed, 21 Aug 2019 10:10:43 +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 C3E221724B for ; Wed, 21 Aug 2019 10:10:42 +0100 (BST) Received: from localhost ([::1]:46024 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0Mde-0001bN-7R for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 05:10:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58884) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MPm-00070Y-Tt for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MPl-0005QZ-Qw for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:22 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54108) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MPl-0005QT-OS for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:21 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MPl-0006bu-Lp for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:21 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 34/61] gnu: lvm2: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:56:21 +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.156637777625321 (code B ref 36477); Wed, 21 Aug 2019 08:56:21 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:56:16 +0000 Received: from localhost ([127.0.0.1]:34682 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MPf-0006aB-OM for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:56:16 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:37392) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MP1-0006SC-T7 for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:38 -0400 Received: by mail-wr1-f67.google.com with SMTP id z11so1243641wrt.4 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55: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; bh=cDufWK6rXY0sd5Gu49W+LHgygdT+etziD8K/YmySRI4=; b=Amz2JZNcORgLztx7NrOEE3QWjY56n1tKilg6sZEnmoD1KXMzFfozJCr5IbEQnrzmxg y1iZdFxO5dyDBuK9g6jf2Ld7WnADnWLKsgZeayIHMRjSqEy5G0u8rLUH4bMmXk1RALSG 5C/d7FlzB9Bncj1eEBw2mUnXvdIP78iUUBfhu24r9zoTJWctsx680Ke+KhBIMUUSAj4q 0MVylrOxNnl8pscBJZYHp2+4guyONNQGp3ifpYmlp3pSeAq4/ZmoUAQPg4wyFWw3SZkA vYv5o2SiYCPT2YggyxHdRZxnSClv9mNfTy9yOKwH61/RpKfRsO8JaHu+efPnHTfkx1fr 5RHg== 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; bh=cDufWK6rXY0sd5Gu49W+LHgygdT+etziD8K/YmySRI4=; b=N/AbeTH4+nT/UPMIRXFuXERgZS3EoQDPjZp1HJKCWzK7qimjTTKqDlmg+8oTCoRYcO IN/jDhDZsJkhUv2NEVF14DJ+5/LKTOpLbPGeFGVdtsPSRq1JMBkYcO70OVRfziWVHzKI e2oW7Icw318GDVnCpASn7c5ErB62m98BOAuC3WKayvGYDSrc2pQUlv7YRDl4nmRqx9iQ dDQDigxsASGNu3taWfaRY2IJI8Oi7Q2N6mAPygG3MKEWdRk38ifPlxwExHZOYWe9Qagc TQM9awJdUaHVSwo1+BJIr/qW0wsGAJPz4qIDMb0Ppygg+Cw7DZmZMvF1Uz4MzS1pmqoR 9BVg== X-Gm-Message-State: APjAAAX6bMAIl1fcyxEXqoytJ2t26yT3SEvwUAD9652qFX0A1v8kGwI3 EQEZVQpwztr9bwfKQjgzwKzCBybBWYI= X-Google-Smtp-Source: APXvYqzlRFIoSAnfAxyBJzZEeIpqPXcD81IjtFPzel9osgwl0T8Y5RAan5mg1EyvBJK7MSjZDA8nOw== X-Received: by 2002:a5d:698f:: with SMTP id g15mr41271075wru.310.1566377730033; Wed, 21 Aug 2019 01:55:30 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:29 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:28 +0200 Message-Id: <20190821085455.18508-34-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-1-m.othacehe@gmail.com> 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 f0c0de666f..0036b85e4d 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 Wed Aug 21 08:54:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15072 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 18A9317264; Wed, 21 Aug 2019 09:58:27 +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 C67FD1724B for ; Wed, 21 Aug 2019 09:58:26 +0100 (BST) Received: from localhost ([::1]:45638 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MRl-00016w-Vd for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 04:58:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58896) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MPn-00071z-Ee for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MPm-0005Qt-A7 for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:23 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54109) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MPm-0005Qo-7K for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:22 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MPm-0006c2-5b for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:22 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 35/61] gnu: nghttp2: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:56: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.156637777625334 (code B ref 36477); Wed, 21 Aug 2019 08:56:22 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:56:16 +0000 Received: from localhost ([127.0.0.1]:34685 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MPg-0006aM-5O for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:56:16 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:41499) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MP2-0006SJ-RS for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:38 -0400 Received: by mail-wr1-f65.google.com with SMTP id j16so1228769wrr.8 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55: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=jj2Jl+L+uX1pOD9lehHiTDGwMAci6XJbMogS9Thh79w=; b=Gk6M5hs6AJau9ddSYnsIAvxxGKhLJ3NiYzE4xqAUfaAxKnIyobbrJ2NKHs0jRz3zc6 +zoGlllodh7qOiJvatsdpQu99qUWeTr4+2cK2gkfFh67r7qAp1d/xOfGcR3vzxb3L2fi xOZPGhMaNaKsjn2R/99qDBE/ipE78oAbf69ct884e218UtJy22UHFbHktmXr8AW8I7Ok jpczs7gXP1h6MHetcTylA8PWpaUjPEm4G5fanb72+/NbAnRWuVW8rawGcPYruB+NLrlP wN2/m6R8Sjjga7n3J0nIT+n3ommOJ0R9P+DA6Ohwk1HqS7Ik/K9cbn+ncVQIe0lSuZtk 2RFg== 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=jj2Jl+L+uX1pOD9lehHiTDGwMAci6XJbMogS9Thh79w=; b=Y2Hy1+iqjhabA6QDSFcWNelf9YcVAPuYOPX64B1bY2Ktcq7/z5zKqCUlHZcEAp1jS2 pNrMu6uJAc55Ag1S9MgLhvMvvDvcH5ibiLOJFiLr8PQS5NkXQJA+0xHLdWtn/VHQIuNs lJvovPVxODcuQsQlWzhsxjbmekXboHBK8gQ/ZqYAgCAoYOBEI7/BExC6rSWAu0jBFzTk hWbzJ4ZUOaCWr9uZbpLrfhCNMI7+na/6qB1jHpPPLgeI9tQpjK3hXKWOq0MovIkrDycB R8E5gY3O6ozOXDDj7K5I+un0vUkDt2WLKa8oDgy4m1hHQRFLMQ2IC5AvaIS+WOC1YTHj RFaA== X-Gm-Message-State: APjAAAV+vA6F9nFui40KVuXcO/didyoJMTV9xhqnG6ESPZ/R558DNYtV EegPtDy1UZj83279atjGprsLSKDZ9Mw= X-Google-Smtp-Source: APXvYqx0/RCUFQ4yK8pejb1fgcsRshXGKcEL57r12QCF3vHC3x0rW2vqS/RBw3Ma+fRroyziuwZSWQ== X-Received: by 2002:adf:dfc4:: with SMTP id q4mr38488902wrn.54.1566377730999; Wed, 21 Aug 2019 01:55:30 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:30 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:29 +0200 Message-Id: <20190821085455.18508-35-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-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 06b3778be2..c0aab76aba 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. ;;; @@ -6447,9 +6448,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 Wed Aug 21 08:54: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: 15096 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 6415B17264; Wed, 21 Aug 2019 10:01:01 +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 1BC161724B for ; Wed, 21 Aug 2019 10:01:01 +0100 (BST) Received: from localhost ([::1]:45748 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MUF-0004Sx-UP for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 05:00:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59079) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MQS-0008BY-1e for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MQP-0005mv-P5 for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54164) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MQP-0005mo-MG for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MQP-0006g9-Iq for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 36/61] gnu: openldap: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:57: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.156637778325445 (code B ref 36477); Wed, 21 Aug 2019 08:57:01 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:56:23 +0000 Received: from localhost ([127.0.0.1]:34700 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MPm-0006cF-K7 for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:56:23 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:36337) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MP3-0006SK-RE for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:38 -0400 Received: by mail-wm1-f68.google.com with SMTP id g67so1293085wme.1 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55: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=TODkwhTat9VGfXsj8+/2TJ/enxT71yfa/D7H12HSna4=; b=rQmesYMW9jE3pfaQ0ZbcWDOkg78WGnFEEgXjaGSP7kRZkU67GnK+23Wbwn4LtdbAX4 GCZWASxiPcW39J9OFioEC7tJx5D0g200Rr9IDPVQyiiQbrGxyz8OZwudUjOeJp8gBn1Q ybiBVAdn9eRfmLRZNWVoveV/m49+GzYxWUIo+vqS8LPXgzHre2JONhV5oWmqC5qQWms/ KA2XzNaJMXuyf7OPUi2qdJ7ZWgeBGf/hOu/lGrVVgTHdw/ZYoC6t958NJrBzXq8vJD4g FCzTAvrzGfI8z/kt85O4gngtBvCW/YrQWoBdeFuFsfPWP97EXscTErzuXqczp70abnzG /Gtw== 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=TODkwhTat9VGfXsj8+/2TJ/enxT71yfa/D7H12HSna4=; b=pE/sdD194y3m6SX7kN2PIjnQD+JOfuceGwzH1UhrtQyVcHPCbGmK9ilGLUGfIESsf1 ZObc28Rd047kUWSPY5NOudADvp0ViR9i7Grr/I0l7KQq8rBPeKhmFwxkxYIEB9cWvAYr egPEa9RoRRT9ilV9QNSZLld8sWZWpwahVI3cQcT0VaOP8rMP0n688WXzVCWxA27DVtNI /xWCVnOAB0dG2aMBMD6tBawo5OspVK6/df8iuYnBLGQzTdRx2WHR9L3miRwU2daeojK3 h2bNF4SbDzx90pThruPkpPWT4UgMqDzjkBpTMNqPfLGWOLK7tIGcadncdMsy1Z1y0uy3 Iz+w== X-Gm-Message-State: APjAAAVBP8VEDZtO7lSZugYukqceCE6JH9a1j3dKz2aWZSIVWdAn4RAR kRzkRRxK7oIiSYG7c3YaEVzfCKyHUIw= X-Google-Smtp-Source: APXvYqxprCh4bZ16JBR7VRblBi7poDID1xwyNRTouqQ/QxLYTD3v6/Sy+HpwpjrnkBbFfOtEWhdxdQ== X-Received: by 2002:a7b:cb0f:: with SMTP id u15mr4421278wmj.173.1566377731897; Wed, 21 Aug 2019 01:55:31 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:31 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:30 +0200 Message-Id: <20190821085455.18508-36-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-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. Add a new fix-configure phase to update outdated config.sub and config.guess. --- gnu/packages/openldap.scm | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/gnu/packages/openldap.scm b/gnu/packages/openldap.scm index 2f80920ed4..c0b1e34385 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,38 @@ (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") + '())) #: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)) (add-after 'install 'patch-sasl-path ;; Give -L arguments for cyrus-sasl to avoid propagation. (lambda* (#:key inputs outputs #:allow-other-keys) From patchwork Wed Aug 21 08:54: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: 15095 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 1C6CC17264; Wed, 21 Aug 2019 10:00: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 D416A1724B for ; Wed, 21 Aug 2019 10:00:48 +0100 (BST) Received: from localhost ([::1]:45744 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MU3-00048C-SC for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 05:00:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59080) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MQS-0008BZ-2j for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MQQ-0005nU-Nc for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54166) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MQQ-0005nH-J6 for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MQQ-0006gO-H3 for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 37/61] gnu: swig: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:57: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.156637778425459 (code B ref 36477); Wed, 21 Aug 2019 08:57:02 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:56:24 +0000 Received: from localhost ([127.0.0.1]:34704 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MPn-0006cT-J2 for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:56:23 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:35769) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MP4-0006SM-TS for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:39 -0400 Received: by mail-wm1-f67.google.com with SMTP id l2so1297738wmg.0 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55:38 -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; bh=RObN42V8bRyLb9W+DkdwbK5oQvTcjUSZj+AGQMQnBKg=; b=oGmk2U1r9ewbmh32/NfM45bU1JaPRwTmdIfOlDti8Tr6wABhwU+VzxgbhOA/TYdhHl kC+1QD9qTbT1y4xUGuL6o2LI3xMhZXS4ewLvwxIoWt4fNhGUJjiGdTh8yFsKmRDl3eFX ODfZN04IiNCjHLyrEfmu/yWRQIwOi0IPLcwl2quFIKeShcjTD+LDbTd2DFnd11tHDp2G 5myaw3AR6Xn6DZOFnyrAKpSJa+XZScrWGO4yRWhNeEyAejqPzktN4qZblcnKUgxV/Vj3 t1s7dy/svsIGcAVv1mA3y61qmn7kr6HY7uNpjoGTFi5+snLBcBYpD9CyWgzDOgF2mp0a uPCA== 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; bh=RObN42V8bRyLb9W+DkdwbK5oQvTcjUSZj+AGQMQnBKg=; b=cqNTiRzgSCiHuvEsqda5FpxKFXP97g6M5KpjMQwrDUSxPObtsWlAwbI3exTMzsfYdY kNbeebYmBvi2MWmMHsnGgofdxccs6LvjqL4JePt5YsqH1Z5fcaVmBbPxujZkWsY6B32d N3vjTBO+knXYkJ1cC9QZKbmK5UoSXY6r0taJp/WDqCyxyZxvKIPIp0C4QWAukH0qNqoL P/7fe06EOGYyoxKf7sELITQMJFlBHLn25ZR1YTccLC7AOQRBTKhlW+jrv2latavHCJR6 I0Ne009YDe2RBajbmT3PusBdQtvgriMv6f8xd9I8ZkQxDn9vS/9iLIqyKF1635XTpfqY h4Cw== X-Gm-Message-State: APjAAAVn0H/H3oH4dR11pAD65V5Bj/J7FjGDr6oEnNikFT9fyngQZN+c bB3AHZHgs02mLTMgXsdCav8SOko8jOg= X-Google-Smtp-Source: APXvYqz0lKqhr7PhpxqC5xC0Clv3Vshe+/KjgXlJfFkur7T8d8SaBBmUTlVAcARZ+Vq0OOXa0SCTKQ== X-Received: by 2002:a05:600c:551:: with SMTP id k17mr4828227wmc.53.1566377733030; Wed, 21 Aug 2019 01:55:33 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:32 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:31 +0200 Message-Id: <20190821085455.18508-37-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-1-m.othacehe@gmail.com> 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 Wed Aug 21 08:54:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15104 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 D973917264; Wed, 21 Aug 2019 10:03:24 +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 9F0531724B for ; Wed, 21 Aug 2019 10:03:24 +0100 (BST) Received: from localhost ([::1]:45838 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MWZ-0007va-R4 for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 05:03:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59083) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MQS-0008Ba-3v for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MQR-0005nr-3v for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54167) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MQR-0005nn-0t for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MQQ-0006gV-VC for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 38/61] gnu: git: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:57: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.156637778425467 (code B ref 36477); Wed, 21 Aug 2019 08:57:02 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:56:24 +0000 Received: from localhost ([127.0.0.1]:34706 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MPn-0006ca-TN for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:56:24 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:45449) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MP5-0006SO-TT for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:40 -0400 Received: by mail-wr1-f65.google.com with SMTP id q12so1207291wrj.12 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55: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; bh=ekhEnSaYOzo7g9VXSRSzA8v/fqFR3nGB9mRmiOw49Lg=; b=kkt/51+m+8773laYCSLrSO6/RJcLA7uiHduvU/Pkc7y1qTjxvmMvThojg+cniIL2XP y66wwYfAj3WIKFGE++aDvlM/9erBJd+1g2lOYfGw3jE8O5f8wlPETNSqQtLb/Cgo0HQ2 G7c0zzBmyGj3vlG9uVQLNOgblVF4bfat4xAMs7dmfmiRmvzDYzVyiY0zDYvCrRUh8Xa6 wYeJQOPlEwf1q1id7vPugjxg7PIs8aJ+EnxPLytQFRtXMlKc+IW+B5M9JnqJfXq9WgK3 HXGIyXSrfov7A0RXEzbgKkTIUhx/hkGX05K5b7/9C8MeCFwRMSICPZmGuoAyrrilsZA5 T30w== 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; bh=ekhEnSaYOzo7g9VXSRSzA8v/fqFR3nGB9mRmiOw49Lg=; b=G99heKXu9gufVmvTQ/dbQFoucVEWmKdPVuBscJPfWNN6i9DhQatbM7cJeElBhjMw47 Kdl3bfOe7CMGLpWKhQdEkYdrlc9eSDtHfMn/SkRHkCp0tpyL5EFCIC3EZd9RVwiqZG5T pht1ICuZy4CAmf+6fwh3SVNF9tHnI3AtwfiCDj93B+VFL0cEo+36+/J5wZJrR43IeOGG jTUCNBhOLShkJ0wOEardXMXYJHW0w8jCug/ALMGRToH+NZLbnfTmOy9WJA0E3+ByMdVj iHHhREHHCBo/XW9dkuWNe2Z6TpImD4hznILVoLevwjr0RSd56E8PF47qTt5/BzBl6LTr sDWw== X-Gm-Message-State: APjAAAXjC5wyYOQ4xMxXyIRuA2WcinbqOgXW77y1qiFP89vDJVkn4A8n +5s/H+u5Gkhyzk0+DjlKAS/HAL5Nq4Q= X-Google-Smtp-Source: APXvYqw+hk2JAVj0cLbCFaXHIg/QiXN/izJ0tJXTrpGPVpd6X+SnUEgoQYv6Rj8Y5w/U0VEsnrn2vw== X-Received: by 2002:a5d:4cc5:: with SMTP id c5mr11753263wrt.278.1566377734020; Wed, 21 Aug 2019 01:55:34 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:33 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:32 +0200 Message-Id: <20190821085455.18508-38-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-1-m.othacehe@gmail.com> 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 0bc882d3d3..62f91fe923 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 Wed Aug 21 08:54: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: 15079 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 76D6417264; Wed, 21 Aug 2019 09:59:21 +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 42B531724B for ; Wed, 21 Aug 2019 09:59:21 +0100 (BST) Received: from localhost ([::1]:45664 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MSe-00027r-8P for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 04:59:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59116) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MQT-0008C1-14 for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MQS-0005oh-3c for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54168) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MQR-0005o8-HA for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MQR-0006ge-EY for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 39/61] gnu: make-linux-libre: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:57: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.156637778425474 (code B ref 36477); Wed, 21 Aug 2019 08:57:03 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:56:24 +0000 Received: from localhost ([127.0.0.1]:34708 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MPo-0006ci-8u for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:56:24 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:35065) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MP6-0006Sh-Mj for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:41 -0400 Received: by mail-wr1-f68.google.com with SMTP id k2so1255473wrq.2 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55:40 -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; bh=DiHWvcxJDycsBWeHgDPr6cJca1VJg9+d4Q2B6jEcu1o=; b=L9cRVRH1WNW/k/Rp6bh4JINYr6MJ0r/85mFNoYzf+pGJonBTlon9/W9drV1gQfRov2 7sIUkasEgWhgDYs6GGKAFJwfsmWZyFLNWkRx767KELEluDDI/qNYt5YcHAIjuWu+PaP4 TtVwkk6lA+NuIf07/1oZ7dkr7Fn7jYTB1nnZiFOGbd4LVJPnR1h9IVNxp7Q2Y9lbZzFU Jvn9BJIoq947UYq6owf6tuTw7HJAMcv5kLS2Y0hyaxWdu37coeKJx1kMPS8w0HAWkScI nLYwRO9jGUs2umErQC+rffSeAYPCD7wVxJ7z9uYZW6L0D2wDOQENsW1lmkDd9aGC6NGf 4k5A== 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; bh=DiHWvcxJDycsBWeHgDPr6cJca1VJg9+d4Q2B6jEcu1o=; b=HtCsJO9hHf2desKPJ4CADH4tmh52FH/T6gW6p1aYcogMpzXd9CNA77tMv1dgKv2cD/ uDyX0PZc290wb1jsnsk8ikij1GWM+FWAtxy6vGhoQg+KEtpbEhUSAzx+e6/B0TBtCaqJ enuoxGMEFqrW6U7JA6zr/v0O4wfo+5Y96Y7vJCh2cWTGKw3aLoewfqGC/zuZVNO5fNQZ holrL7A4P1OfSjMKm6o+7sAJ+S7+vVZainwf8Ihv6n/cHFm41belzSKSgJFdc9Mmo5na mPigVhIFCqtroRxp9RdJ7G4KAcxNjP511YiECEwH9u0+N6AaZTcpEdQUCIKROfnF6KXd YgSg== X-Gm-Message-State: APjAAAVlzp1XOeC6UpXCJT0o4r5qeQ0QDjhWZ46o13xRqiLTz5+nTfMF JXFNjyuqM45aDbeWWaS0txETZpHX1jg= X-Google-Smtp-Source: APXvYqzd5DTYanYFRdepLfYiwxHkgr03rVa1y6A6u18EoVXX7y+/UjXUheFLIKz3kitttzh+4ItxaQ== X-Received: by 2002:a5d:6307:: with SMTP id i7mr40156366wru.144.1566377734850; Wed, 21 Aug 2019 01:55:34 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:34 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:33 +0200 Message-Id: <20190821085455.18508-39-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-1-m.othacehe@gmail.com> 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 0036b85e4d..ac7312bcd0 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 Wed Aug 21 08:54:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15085 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 C596C17264; Wed, 21 Aug 2019 09:59: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 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 932EB1724B for ; Wed, 21 Aug 2019 09:59:40 +0100 (BST) Received: from localhost ([::1]:45682 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MSx-0002fM-MD for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 04:59:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59169) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MQW-0008EU-EB for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MQS-0005on-2w for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54169) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MQR-0005oI-UV for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MQR-0006gl-TB for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 40/61] gnu: procps: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:57: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.156637778425481 (code B ref 36477); Wed, 21 Aug 2019 08:57:03 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:56:24 +0000 Received: from localhost ([127.0.0.1]:34710 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MPo-0006cp-Hz for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:56:24 -0400 Received: from mail-wm1-f46.google.com ([209.85.128.46]:38408) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MP7-0006Sj-Js for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:41 -0400 Received: by mail-wm1-f46.google.com with SMTP id m125so1281604wmm.3 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55:41 -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; bh=cTatLfwn3khUxI2mXOeyDuO+g/jPCp4cvbKKW1jWzpY=; b=Tmlqe7WkLrfZT3AjTJKriRUD8jY0wyv+itj4Iw7/cRSC7DXQpgNGSSOHafQjIQtHQR SdF2gmIgAtkL4TYR4d+iPh5qICbzurtgcTDYPzzxxfVbKlYSKYd12Wjkquqvrf6uVFmH yv6PIs7S38AX823q70Y7HPYqed6qg7HT7OWoCFVqZEggvlHO4XEVQNww4XbZhiC6KEWm T4kL7QzucR2mIytn7XF8w3qmFQ2EK06iPcUqf5xoaW7IxvgU9pY1HKVweUSC65nvO78L cqtnkRbFqsh2fjtXel3sjmJHLoTve/QZ8BhbGXuzNvsn9W56T7aPdY5tZokZ4Ams7GWa kfEw== 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; bh=cTatLfwn3khUxI2mXOeyDuO+g/jPCp4cvbKKW1jWzpY=; b=kESuyHxYMWnfSNorwZ+oFQFSaxQVhGaMVTCy8n6sdTTK+WS1AXDdTuFblG72dRG/Nj rTwXf+BKvmoLaYd5adJRlyTU/HoU15n4ujZIOH/MyOntvLmqr6zRmq4s/3jF7u6k34fZ PbaQzuw9aUecPDVnIezf+VJF/obMFMgUiZkXfyLCsb+6I3NL5H7PQr6hgxLve/TpSg7p 3m2++NxR4+fpmZIOfqIcomkJ4PyOOzMY04wNyw+FydIAogLvaJjb/uVC0vge/GdPoRLa 0PvODmGa1679bFF4TZaf59QKByvzniNablBNBGGjaLcN+qQCMpQKqffyN5/3w5/prf6+ b5SA== X-Gm-Message-State: APjAAAUa44CBnQR3q6QuX/BR9LWE5wYZZO/YKPhvrrqtbJls3s1jf3JA uErxl4EgEF7cNJvuzr/22kbJi2OGE/8= X-Google-Smtp-Source: APXvYqyEsvXmqTnwn3SG5GJJuxtsrr/75Z/dAs1V3Ja+BzmYl2pyXa07myRyfayOSfEksWep74jTWA== X-Received: by 2002:a1c:6a0b:: with SMTP id f11mr4367845wmc.87.1566377735666; Wed, 21 Aug 2019 01:55:35 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:35 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:34 +0200 Message-Id: <20190821085455.18508-40-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-1-m.othacehe@gmail.com> 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 ac7312bcd0..cf403c46f1 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 Wed Aug 21 08:54:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15082 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 1449417264; Wed, 21 Aug 2019 09:59: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 C720F1724B for ; Wed, 21 Aug 2019 09:59:30 +0100 (BST) Received: from localhost ([::1]:45672 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MSn-0002PP-VH for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 04:59:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59130) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MQT-0008CT-MD for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MQS-0005pE-GI for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54170) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MQS-0005p8-DK for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MQS-0006gt-BB for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 41/61] gnu: doxygen: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:57: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.156637778525489 (code B ref 36477); Wed, 21 Aug 2019 08:57:04 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:56:25 +0000 Received: from localhost ([127.0.0.1]:34712 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MPo-0006cw-S0 for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:56:25 -0400 Received: from mail-wm1-f42.google.com ([209.85.128.42]:37057) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MP8-0006Sl-Dq for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:42 -0400 Received: by mail-wm1-f42.google.com with SMTP id d16so1286834wme.2 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55:42 -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=9iQhpcdQYGwq2O4Prcoz853TESRn0Vl4Y11/X8xOTrA=; b=drocBzUIBgsrDQXMkIdwcEqqz1bRV3x7upr7mXnXoguqGce3sjukkQ9tcoz+G9WDLs FfExznOhhbMAsbvSqoAlPOwJpFhuhnmb2hB68nVtm/z8XKm1AAZvTOUTB0KTlENyj7HA K9RHVTGh72mj1s72zgLRroYkvmicMo+/yCHbQZIivgCm99hZdu5w30nO5ww5AjZGElkD 3S62GuqznP6ynIG5ICyvP1eLrpFFcoWSYBq52jlWryn756m+zZVoRFO8JRsl8dwkj4H6 IvMD2iScpyCl4g44zbdYehp7jRCpFlC6TU+gd/wKPq3THJQ+f/y4PYQArNn8jxgLFj5F FEJw== 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=9iQhpcdQYGwq2O4Prcoz853TESRn0Vl4Y11/X8xOTrA=; b=bjSeISpu4405i04phanHjkYWVxlgEpr5UEk0+9wDTHIrpPj0E7HnYBMuOVknpErYc5 En0xRvUQj7c4OD/Tykqn179Wra+PDuDn4FwM7IA/xj/WZnGmUeQ7YX2CIpdWRGEeq1GF kuMDnxhYueaLgl+2deR3AnLwAmrsjb6Aqw1ks1W9KGKu0OmP2zoX9vwUU8J3dqKhBaGd 4deRWdKDS9S4bOmuSrcS2Ktu8SA04rXl6f39U27M+6Ynej3S4YoWAS6rPdUahGdQTOoD X15Nm2OetXUbjVauooIB0tc7qtVi0wer0nIoqlWZ3PHuQnFcIQfS5kjouaKW6VL7eQMp Fohw== X-Gm-Message-State: APjAAAVbN+BhImKtQxZ4IFviIH5nXSbBwZgh9xSRVoZUbm3+HntdwAub fbF9y1tb6odSQ2yvejyGT+J6hyMeI50= X-Google-Smtp-Source: APXvYqxfqXdIn5BVk/sMwGPMmZFY0yVHd6OC3eQy34qO7POhl9RZtTs1HLLY5436UAMjL8Z0noM0CA== X-Received: by 2002:a1c:1d4f:: with SMTP id d76mr4990502wmd.127.1566377736477; Wed, 21 Aug 2019 01:55:36 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:35 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:35 +0200 Message-Id: <20190821085455.18508-41-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-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 Wed Aug 21 08:54:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15097 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 8162A17264; Wed, 21 Aug 2019 10:01:13 +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 1A8BA1724B for ; Wed, 21 Aug 2019 10:01:13 +0100 (BST) Received: from localhost ([::1]:45756 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MUR-0004kg-Uu for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 05:01:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59170) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MQW-0008EW-Dz for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MQT-0005q5-DL for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54172) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MQT-0005px-AD for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MQT-0006h7-7t for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 42/61] gnu: guile-sqlite3: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:57: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.156637779625518 (code B ref 36477); Wed, 21 Aug 2019 08:57:05 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:56:36 +0000 Received: from localhost ([127.0.0.1]:34716 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MPu-0006dJ-ET for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:56:36 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:38630) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MP9-0006Sn-3N for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:50 -0400 Received: by mail-wr1-f66.google.com with SMTP id g17so1239261wrr.5 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55:42 -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=W/9+JUzBCsDR82qPzaNj4afW0PE9gg8bdP1EcJ/nTgo=; b=bizcxpGUmItAOEcz79xH+FkjPxjuQ5OXj/5u7px3IIpWH8K1jiyqdW9vICOiITQVRm n9Y0y6zQCEJgRraaiQs/xZD+IBDEUw6+F8cDGbZjNkZyp6A2/dLek/IZkz3zzI0hpr5g t0gKYWnkeEks6SwtJkW6G1eN1d2ZBVDLisG7xrNKFuClo6KY2OAUUSPc2zkeViEgbIe6 LgzqyRoJav+K2LWlYRyhrB0PLRrVjbsZGNGjRZT8M6okLUDTKDCzHUiegO+zLn6x3tmt DSzQSlM7l2H+kWQ8fZslzRQzBQUTEMjut3r8cr2y7STXkgWoqojHdQmyZIA60isp8LQD 7dKA== 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=W/9+JUzBCsDR82qPzaNj4afW0PE9gg8bdP1EcJ/nTgo=; b=cqD6stJh+tG38NndxrKYlTlJsyom24PiEoRzlAKBddqhifiUHk7KyGfKs1O94+VojP TfRjlkJCqpqJTwAvu5l0vTcs20EOIwE+c5RsgKc8WCIpZQbFg0LBoU43BFHNyjT41bCY z/geHRsNoLSNYUnTFmUaOuGJSXALlgq8J0cH8bbQUE+GON0yrn+zCHd0vDpdyj8Cimu3 C8QdR6nrn3UtwLcL0nutQKcpSpM6zK7mej2u3j7gOJX3pUIm2R83Ks8sL1S6166GUaVh 7BSryFrpDOMrkIIPMBCFsx5ZmJV9BvpSY6ryLpVUhRVKYMCvn2v3fNNTlVye0TfYQcLQ SAPA== X-Gm-Message-State: APjAAAUoDYXinQX4JsQc5san/qBmdHbbfVOTA04KYk0EdfyrEAZs1uYx 0Bw6sHgxSvqSEDuapIJwJ7MZLTIF3ns= X-Google-Smtp-Source: APXvYqxA7Tjj+B2wcA6Wk7DTe//qBFTCs1CkBAW0/xJDjHHOdw5hLQt+3Xy2P8qxp6LPHLz9JbvPEQ== X-Received: by 2002:adf:e6c5:: with SMTP id y5mr37961342wrm.2.1566377737235; Wed, 21 Aug 2019 01:55:37 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:36 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:36 +0200 Message-Id: <20190821085455.18508-42-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-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 a45a1a0802..1bb871a04b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -923,6 +923,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 Wed Aug 21 08:54:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15105 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 56EAE17264; Wed, 21 Aug 2019 10:03: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 8FDE11724B for ; Wed, 21 Aug 2019 10:03:34 +0100 (BST) Received: from localhost ([::1]:45846 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MWj-00089h-QK for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 05:03:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59166) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MQW-0008ES-DV for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MQT-0005pc-0l for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54171) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MQS-0005pQ-RX for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MQS-0006h0-PN for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 43/61] gnu: guile-gcrypt: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:57: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.156637779025503 (code B ref 36477); Wed, 21 Aug 2019 08:57:04 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:56:30 +0000 Received: from localhost ([127.0.0.1]:34714 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MPp-0006d4-65 for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:56:30 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:38631) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MPA-0006TC-Bv for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:50 -0400 Received: by mail-wr1-f65.google.com with SMTP id g17so1239313wrr.5 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55:44 -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=pG3MUM5eizoLMvKAfUsU7403ESYlUpK/5XhNWuZ5v44=; b=AhUi3CcMUa3/HxOgZJ5wETjTppOmYJfKoUq6dc/YLpnLauCV+BKcP8HMeWsmgpwPwL Unr3JmX0WhK+7FKiBOkun4nvWlRd84XfiXx4zsKT+nE4zF/XXSEcyjo3pv2XREglIRYa 5Zn8aQD+peGwd4/HZPrx9Dj/Lc54+nzlAlLPwVaHt5rmjRWCxY/9fH9bJhgO6l0rrAfJ SJmGSkTkNkG7WE8Os83HMozsfemL0FrTBqD24Hjd3ALpBADiCgNe7d1RO7cD60cK9A98 suh5hShlSVG64n/vByAtYa1PKlEVqmLGxHBwtJqGCe4q5O+Pn2jzocu1eXQdUaLzh7Z+ Y4Pg== 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=pG3MUM5eizoLMvKAfUsU7403ESYlUpK/5XhNWuZ5v44=; b=qY+0n0cD4w4LRlWcPFeIRqKhBsRVQz9Cf9H9JzOt7o1uJ+P497QDYS4Q4QzKqIxcN1 sh2XzLirrTvbZ8qW7h9YzUZA5lq7NMfYlWt5UozOvkciF0rb3hZ5XBGJzT3nSSABKF2w ROF83ocmTMngi9W18gN9UU6mXtJvdDT8suBaKHsMZEZ02MerZr/CIx0T/W5P9qhXIk/8 MUaZb/TMMVe/aJnAfodsTxT35axuTBOwXDaq0I9/QRay+bD+G2LQs6gFuZxpc2KgzsXI h8Nr3gmPRtiZ4GqjawcM61m0wvPASKbyiz6gpWVB8RWPv20Fa0aInA35Ftraw5c+OBvv S35g== X-Gm-Message-State: APjAAAXikWfjy1Mmf1NTC8xrlWfJVsfW91/mI/25PDzFudDeN3PdPnlY xsFoN61DB7+IWGPtoupAIoZcnfqyD14= X-Google-Smtp-Source: APXvYqzr5MQfZcLpLrWcl7Y09+8DJKXBIbR+oc8xIxhtWP8m9bpPjX5e23BdcF+hR6SLcvmiJ4wOnQ== X-Received: by 2002:adf:fc03:: with SMTP id i3mr36914747wrr.48.1566377738154; Wed, 21 Aug 2019 01:55:38 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:37 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:37 +0200 Message-Id: <20190821085455.18508-43-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-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 1bb871a04b..9203dc4a9b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -923,6 +923,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 Wed Aug 21 08:54:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15106 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 E3E5C17264; Wed, 21 Aug 2019 10:03: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 985D01724B for ; Wed, 21 Aug 2019 10:03:42 +0100 (BST) Received: from localhost ([::1]:45850 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MWr-0008LJ-SI for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 05:03:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59221) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MQY-0008FG-Ey for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MQW-0005uV-E1 for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54175) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MQV-0005s6-7g for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MQV-0006hU-2z for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 44/61] gnu: libtool: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:57: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.156637779725540 (code B ref 36477); Wed, 21 Aug 2019 08:57:07 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:56:37 +0000 Received: from localhost ([127.0.0.1]:34722 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MQ1-0006dl-AJ for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:56:37 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:40361) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MPA-0006TM-Nf for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:50 -0400 Received: by mail-wr1-f68.google.com with SMTP id c3so1227831wrd.7 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55:44 -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=C4uD20lBlAX3OpnirmWezE1O3QCbZhWRYvt3ogEWxDw=; b=ivmn8S3ml0P0yozsS3JM0/KX6pLQTZ9/VgK0ggz6rUVunYxkw3PD6WlIIwoNDL1IHg CxT8PaB9+DjfG4X9aTtOigPnuQ7yCFtTAljj7KSMRkHYzCWxESXvUEPo1MJx0/Bya3L1 jO5lf8D6EbrLiwiIGd1iSQMmtRg1PsvmkX8LY+4VDE4hgbgEnNfUFmBIyCY/nZto/DCy dD4nqLWIj+RnJITfqSHflJduCpotXeHjlMpGhPsFHYaIZbVYPabMQZfVOWvWPBJDKcbV RkeaOzMCcTKvSGwNwsJQsRXrBNgnLFtxKBZ+CysTfsoiPC2EBjkMquR8p0gT2N/V6u27 1xiQ== 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=C4uD20lBlAX3OpnirmWezE1O3QCbZhWRYvt3ogEWxDw=; b=mQ2jUp1LxShd1MJh22AklK6GCsNj5/Ha0/s9AI0WSg9c8IappJ454qGAPQPVmvaKoa gs9OQuXYx7q7rXGR83MXOQREg4nHNPBOlffuugtNrOZgq3CmZmvpJWzEqn3gflaoGzZr 4isURaq2HI5OAP8vyv/N9AlozYkM2qmKrsaL5Bl6wgtXIaHbHJe+/0bCbTIT32X7vatV Nax73E0ZlQUMxWZmavMGbeqCOhexI20bF3ZIvObKhMzc6fKIoHDOydE8xN0l0L+GggbD e1FHFfZZA8+Z8QJVrDyMQVSPuCPfa8eMu6KBy32zWWtn2E4s/sl1XUmhRKhORaZQYBK/ ot8g== X-Gm-Message-State: APjAAAVmrecY0oi9nOnm0gjce17Mxl/BBa5TArPN867x5zIgbKGIu7W9 0N1IhwxLDepGI0NmbbBWa4D/vpu3H80= X-Google-Smtp-Source: APXvYqyXJDjeiQUfScnnI09lD+CZwogOynD/Oc1vld21FA7oMDJtKotXGiEQ215xhPLeUCfO0akHkQ== X-Received: by 2002:adf:f584:: with SMTP id f4mr9168401wro.160.1566377738802; Wed, 21 Aug 2019 01:55:38 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:38 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:38 +0200 Message-Id: <20190821085455.18508-44-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-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 Wed Aug 21 08:54:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15107 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 1454917264; Wed, 21 Aug 2019 10:03: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,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 C92B21724B for ; Wed, 21 Aug 2019 10:03:50 +0100 (BST) Received: from localhost ([::1]:45852 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MX0-0008WK-6k for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 05:03:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59223) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MQY-0008FH-DK for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MQW-0005ub-E9 for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54177) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MQW-0005ti-5g for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MQW-0006hj-2y for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 45/61] gnu: texinfo-4: Fix cross compilation Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:57: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.156637779825554 (code B ref 36477); Wed, 21 Aug 2019 08:57:08 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:56:38 +0000 Received: from localhost ([127.0.0.1]:34726 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MQ2-0006e0-3K for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:56:38 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:35782) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MPB-0006TS-IN for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:51 -0400 Received: by mail-wm1-f67.google.com with SMTP id l2so1298111wmg.0 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55:45 -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; bh=wdHu+2q1a+FRTbITzkojxl6xX+KDw3hiwBvBasp2vPQ=; b=hqUXDkSYZ2w8qH5jLR3fi4dCUSXQJ+YcJ4PciFVisCL6bUg7ys2PE7Ap0gTZAVwqUz qvJWJoXgcvJog6XEcphQoB8OsjSOOIUhI5zEPgZzRrJ91mCF8hoxrZrivjV3z+zgdJQb 3Jw8Zep2WnfVvSsbezdl09qKraVaWZEjY70Nrmzmtn3TMtBBvc8xZEjWtrma5AIabIZ2 VjItJP9hSedVd/mpetS15bKfxEUOxT558ARUOSetLxo1M735NGiHjyJRT1rfRbsmc9KC WZky4wAocSV4TNl8pggu6xyeXEfDvvLKdp03ufVPdgZIcCyhrdbTZZ/voZ0Xdok9IxsL CSIQ== 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; bh=wdHu+2q1a+FRTbITzkojxl6xX+KDw3hiwBvBasp2vPQ=; b=LHa9GDaVVZERLfnG8q9AzXg0DqZPAgnyam0sqZAfnMOx7KlfRUEC0AM75uS33CPtvP O3uL4XDDvxDqBZ+WTk2YDF0c0ClrPnBg3co+Vft/aJlqDG+FU6sfvXtyHylq8yq+aYV+ 8y7OTKHXNJq5Q96RQwpK3TJWF5WC8A8nK4N+Wp5ac2w2EZt7n/IISgvpNyp3MH/thpD+ cxshwPA6h/vWjf0eekEfqfbN6MgeasE829hrnVyLbwpFO952o+BZj/FuCX+Xtg04h4kS hRi39lHOspj/l7r8BeesElo7KRS2Hfo26sNLV41D5s+AxjfY+5seFicfImJOltVrZWi3 oy2w== X-Gm-Message-State: APjAAAVsupQcCywIVh7e8yqgBHV25U7lP8jUXTxD3aZzZpeevJFMLLoY twi7rWNejBSmNLzKeUd/tHON/o7ltz8= X-Google-Smtp-Source: APXvYqxlTU3bYG8rNbJRsZsMvpA3oLuLJ1kwflASxX4uVZyJ2NBP62y3J1iMwusDUvWm/A96EufGiA== X-Received: by 2002:a1c:6c0d:: with SMTP id h13mr4404100wmc.74.1566377739717; Wed, 21 Aug 2019 01:55:39 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:39 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:39 +0200 Message-Id: <20190821085455.18508-45-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-1-m.othacehe@gmail.com> 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 Wed Aug 21 08:54:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15119 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 21A691724B; Wed, 21 Aug 2019 10:11:27 +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 CBBF41724B for ; Wed, 21 Aug 2019 10:11:26 +0100 (BST) Received: from localhost ([::1]:46038 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MeM-0002Ge-50 for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 05:11:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59220) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MQY-0008FD-Dw for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MQW-0005uj-GV for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54176) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MQV-0005t7-Ml for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MQV-0006hc-LG for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 46/61] gnu: libnl: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:57: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.156637779825547 (code B ref 36477); Wed, 21 Aug 2019 08:57:07 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:56:38 +0000 Received: from localhost ([127.0.0.1]:34724 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MQ1-0006dt-Lu for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:56:38 -0400 Received: from mail-wr1-f53.google.com ([209.85.221.53]:41934) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MPC-0006TV-Bw for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:51 -0400 Received: by mail-wr1-f53.google.com with SMTP id j16so1229216wrr.8 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55:46 -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=okINyQSmSVRHzdI3lQevXFNPn35xWXx+YBIHiITo/hk=; b=Eys5EcZNVO6m+n42aPw2EL69XoUCB0yxgJmg4TfYNU8TxFV5gegB9QfMCNyUnJD2Ft 0lHovX5B1d9q0E37Z13r4U4w0OdB8GMixQo2T8iyHTvXz6I21ik9x1ickOiYb03sQCci TU9VCDDWixVq61eN0AUQ0J5nE37z3eqiTRqBxxh9JJxho3jANbQ4ku5XZiH3n/LfF8iL HoyvZ8RRgArIoVH+Erj58u5csQzsUFOU4gEDI2CK7OzU8qGHSSUew/7CWS8dCezbHVRj S3n/MLjBA303vKz8vj2ZKQGit0IRN3bBEkU4AFUmONSHdMFl45tSrbaZe7mG34XHIuNU nsgQ== 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=okINyQSmSVRHzdI3lQevXFNPn35xWXx+YBIHiITo/hk=; b=JB1iDMQKIbbXEO2uZaTHWWstrtyIeW9y99/2sBeLq/Aw4vqi3qY3aGEyhfYIttmuaE RLpiLUJRDlRT3SB3PCiGU6dlGS9QJ5IhiXx3XlH0jEYVzaijzAy6NsCW4B2I3hAGMeYg x+cmep//QhXICdRlZ0rQTx1VZhMOWHJZqw30jsPucdC7mFQIwRbgeSRkJ9mHjOF0qIDy GpokrNROF86RLminMA47s1/pNdTM7lk4L4vpcuoXFx1Ir/cpNBMVi+rjgOyVXnjVlZBM wQ7GbZWjp0s0AeBpsovikgaYoX7wcud9IRwgqMAIWg9SbU1f8ZDDcJPm7RJnrzfnBkFx 2IGw== X-Gm-Message-State: APjAAAUHC7oVGYwsLPubA7CouzzHZBeTW8uDWvJpbzRHD61R8wo+ncp0 Bkyd18Wm4TTr83GsAhnH1TrVetvZGEI= X-Google-Smtp-Source: APXvYqyYFpqmfMnfeLAwUGZckvfy9s6lRbprcRI0nrZdysRbjmj+JoCsELWp83sClGN+hB3fcvPT7A== X-Received: by 2002:a5d:5408:: with SMTP id g8mr32768782wrv.201.1566377740478; Wed, 21 Aug 2019 01:55:40 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:39 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:40 +0200 Message-Id: <20190821085455.18508-46-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-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)[native-inputs]: Add python-2 and python-3, [arguments]: In install-python phase, use the cross-compiler and linker to build extensions. In install-doc phase, search libnl3-doc in both inputs and native-inputs. --- gnu/packages/linux.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index cf403c46f1..7503e47805 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. ;;; @@ -1941,6 +1942,8 @@ transparently through a bridge.") ("flex" ,flex) ("pkg-config" ,pkg-config) ("swig" ,swig) + ("python-2" ,python-2) + ("python-3" ,python-3) ("libnl3-doc" ,(origin (method url-fetch) @@ -1961,24 +1964,27 @@ transparently through a bridge.") #:phases (modify-phases %standard-phases (add-after 'install 'install-python - (lambda* (#:key outputs #:allow-other-keys) + (lambda* (#:key target 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")) + (when target + (setenv "CC" (string-append target "-gcc")) + (setenv "LDSHARED" (string-append target "-gcc -shared"))) (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 Wed Aug 21 08:54:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15099 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 7AF2317264; Wed, 21 Aug 2019 10:01: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 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 389A71724B for ; Wed, 21 Aug 2019 10:01:40 +0100 (BST) Received: from localhost ([::1]:45766 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MUt-0005QB-9k for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 05:01:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59284) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MQZ-0008I1-U3 for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MQY-0005ww-9I for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54178) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MQW-0005ut-Mr for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MQW-0006hq-JW for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 47/61] gnu: crda: Fix cross-compilation Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:57: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.156637779825563 (code B ref 36477); Wed, 21 Aug 2019 08:57:08 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:56:38 +0000 Received: from localhost ([127.0.0.1]:34728 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MQ2-0006e7-Ef for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:56:38 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:37413) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MPD-0006Tg-96 for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:51 -0400 Received: by mail-wr1-f67.google.com with SMTP id z11so1244169wrt.4 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55:47 -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; bh=zR13IYEH7NtERxtk14hFcgvgZJu2b/UFN3zgzDxdQC0=; b=h24g+LLuTnOhvJ20cHzDdlQ+9Y+7uKIEMcx0r7MyONGGsfrc6BqYdeP73lt0IqAvNR S78CC8irX7P4UgMBcNQBxWPBN4hEXYVlaOzBM0z1wpX/Jb1n/SN01gxMmWAaJO2Tlxe9 DahoU3YqWnlbgvB4UcGUpj0wNVb5j3Zx/irYnoOGkCL7yD27utzZekyUxRYRrD9HgwHP Mga62mo4nAI9wCyD/myHjzEH8XD+hyEp812oxS2kBB4Pz7W9iz3uqcDQAzbwDUj95fNK womjBsm8X3Dd5bRN+kjxqAyjxcYnvyP4k9N4jBc4ah+uiMuvNPzWnrQF/DqGkHfZirro GUmw== 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; bh=zR13IYEH7NtERxtk14hFcgvgZJu2b/UFN3zgzDxdQC0=; b=DquEgj+yM7wFnLED/vDAOJyOrtDo51kPM7QDCzdv03eDh9UO9IikVylHr5OSkfpD5l ZxGB+0rjoyPzrFT7B3G6KXYGzGVs70B/HRSQQ94l9WTH+/aW/ZhR+45RYhnt8v96jz5Q XHxmaiAwUfZa1qCTPuWNUZuxzZTe1d7DQIP/C/Nbe9pSrkP4z4jWakXapaVPQCN0W2Xt t5k8+uxqNKT4vJidB4zA0folqNHrGNyQSw+XbGi/alXReLp116wt52hPGOZUVTb3C0DW sbBjoiL4EvHRO0gY6rEx8FnWYj6oNALo5keNtBaBJwGv9V3MmFZ3eBUwxAt7eUtYTDdi 9Lbw== X-Gm-Message-State: APjAAAX8qeg8u0mdqRVLtID77V9kHD6pMspaI1mFSpjQpmxV6Fs85Nya AtHw3KOIwjDzTluCJbpLicTcZNDxHy4= X-Google-Smtp-Source: APXvYqzpRcGgLgOOC2wwlTFfeGQp2vrWIIyILoZq6vPeN5rVwgKzJdoNyuAZzCqkUONEmXforikg4w== X-Received: by 2002:a5d:664a:: with SMTP id f10mr39973428wrw.90.1566377741429; Wed, 21 Aug 2019 01:55:41 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:40 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:41 +0200 Message-Id: <20190821085455.18508-47-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-1-m.othacehe@gmail.com> 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 7503e47805..26cba842d3 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2793,13 +2793,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 _ @@ -2809,37 +2819,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 Wed Aug 21 08:54:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15117 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 2614C17264; Wed, 21 Aug 2019 10:10: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,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 D8DDE1724B for ; Wed, 21 Aug 2019 10:10:50 +0100 (BST) Received: from localhost ([::1]:46030 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0Mdl-0001np-SU for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 05:10:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59165) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MQW-0008ER-DS for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MQU-0005ql-GU for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54173) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MQU-0005qd-7F for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MQT-0006hF-ND for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 48/61] gnu: guile-xcb: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:57: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.156637779725525 (code B ref 36477); Wed, 21 Aug 2019 08:57:05 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:56:37 +0000 Received: from localhost ([127.0.0.1]:34718 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MQ0-0006dX-NV for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:56:36 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:38640) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MPE-0006Tn-5f for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:51 -0400 Received: by mail-wr1-f68.google.com with SMTP id g17so1239510wrr.5 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55:48 -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=ZHNehG3F6tHYLAoELkWum6s7geqjj/kqzOMc8gZsWe4=; b=OZJVmip0eQ2sU85mV7AftYDQxm0IyteEPs9gspMebO1ifcDlLSM8248Udh4WhxJyx/ XwAAtw2KxDLLGSe68vKIz2RKO28YsgM75RYQscXM9A8gXaiAgX5oCaRrmYXCh27UbnBD vOQXvvHvz9cxQ9Rdq7ldMd3651/fJTeoTynUcADiPipEnYVxNnZ+32qMxnEb9Am9Dymr DicmOdR64RGDEBpd3OEf6b9SPszlKZEROgBONft3IpCObUMLfGbr2BnpDlpTDaclECoC sbJ1JmelJvgR2WLrGYFbtRq7XsMniMGoVT2ffjO+T7+qGo1pQxfnw7buxO/E/P0Feyup 9dwg== 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=ZHNehG3F6tHYLAoELkWum6s7geqjj/kqzOMc8gZsWe4=; b=tsihmOsxl9MYYW0SB3TiJ+9u/g9E/y8O7ySES9AZx36lYZTkAwaYLE1RqP47zEmmzu tcprugLNJoUXr3ILTwwOjBbYNpM6zkSPx5jvLAerMBxKaHjiM/K4aU5D6fwH/mo1LvQW fqir1i4afURac2jJOCc7VgvZLYEuAZQyHn+ilPexQ34s4VoBHt7FR7gJPrlQCVuVVXrg 8Wsv/4Jb9ZPwQGuuAIoJo5kLOHpZiOnwvVZ+bnMTL4Ow62qRlYBYfrhmkX7Ws7Ok++UI 6y8rrVFTpavMg15dvStPyb//PQ/dGrWbRclDI0mhU2rDkB1P0yetJL3XVzdQSYfpX/z1 YGJA== X-Gm-Message-State: APjAAAXTytj0eoxdCABgN0lJtCTquWapeTQ0LLRBuZPV3duqJWPcJzMR 45HR1SD+sIuMZJDngAiLhEiRg37hmFQ= X-Google-Smtp-Source: APXvYqyWDBPgJJTu+Epr/Ja3YGUOPssnvFE7ckzeXUBehOjYp9Tv2twBDoX6TKRk0GSpdHxUegEyRg== X-Received: by 2002:a5d:4cc5:: with SMTP id c5mr11753866wrt.278.1566377742316; Wed, 21 Aug 2019 01:55:42 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:41 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:42 +0200 Message-Id: <20190821085455.18508-48-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-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 Wed Aug 21 08:54:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15118 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 C034317264; Wed, 21 Aug 2019 10:11: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 83C7A1724B for ; Wed, 21 Aug 2019 10:11:08 +0100 (BST) Received: from localhost ([::1]:46036 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0Me3-00020q-RX for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 05:11:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59215) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MQY-0008F2-AN for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MQW-0005uP-EO for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54174) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MQU-0005r0-M7 for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MQU-0006hN-Jv for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 49/61] gnu: guile-wm: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:57: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.156637779725532 (code B ref 36477); Wed, 21 Aug 2019 08:57:06 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:56:37 +0000 Received: from localhost ([127.0.0.1]:34720 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MQ1-0006de-0v for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:56:37 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:45464) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MPF-0006To-0l for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:51 -0400 Received: by mail-wr1-f68.google.com with SMTP id q12so1207680wrj.12 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55:48 -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; bh=2uLQozcOnXn74yAurmUQTITfTukTksywcMavCvA1sWA=; b=NTLHT2wSzvCKVpAxGlPUsATdRsJHcj+F9Quy970toIewH3DKHj4qYRYTW4he4qeVV0 nLQ7ej2Pg8pN38+o9nMJgzoyuiQwD9n98N0DNgFXrghXKJDKbsXCd8HHgVoULIPmb8yX 4XoZqq7Pg7ztFvOpe2latYJ8jUmIFFpFPgxlTNucA8E2ObJw/SoKH79Gy6RUTBN2kdOm Vu3hnJ9jI0vRLULlr0M73/TmpjewmKOhkPBnvXL1XWpTDJFyvaMvAIlFY5wCQe/WTtk9 PV59HCXB4I/GjwMqTpxTe/1MYd54UMyrxZndGUbc7M/pUxThB1KMwkr1HZz5px9cxkEZ eegQ== 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; bh=2uLQozcOnXn74yAurmUQTITfTukTksywcMavCvA1sWA=; b=W5I1C/AGt2LoubL8x1Fsf0AMRdShGoMofJJKxxxAqV7cLAf0ZVkxyWNphT76U1va6w NJGmn6NbTcRTia62mDDox1MXK7FLye6g7qKxpvNGzl5aH33QeIcoQEGJGV2wFhZ8wTyL ZbZvOPYloj4X+YyMGcoenWy1L/p9Q+lQqqecV3ohey396u7SUxaZEj4jZ9GTxcYjkVHg ewSxogUFvS1k+bEyNAoT+DAYGjMqM68O4QqmDNV+54aUqYS+CIWCLd1uPKav1Fjsy5FD hiVr9D13qcg+lVdhqGjaLr3glhAOzBAUaJT5MGBFpTn9sfb4VdqhElp8vOXkJYxXvozl so4w== X-Gm-Message-State: APjAAAUv2Ur66vUwVjnIK0jcnW0SDfsduS4qUa84fQ5cydOW/UFf58oF 8Nzsl0wZB9oDzZDyFG9y6XeHm7qXnxg= X-Google-Smtp-Source: APXvYqw0idZKOIgKLEibFqxgFbCcy7RAAxC5BMm7v2kraMuHrqOcjcLT99hjH4W15Z6Ow2luYsS/YQ== X-Received: by 2002:a5d:6a45:: with SMTP id t5mr10136923wrw.228.1566377743208; Wed, 21 Aug 2019 01:55:43 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:42 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:43 +0200 Message-Id: <20190821085455.18508-49-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-1-m.othacehe@gmail.com> 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 Wed Aug 21 08:54:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15098 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 958CD17264; Wed, 21 Aug 2019 10:01: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 586351724B for ; Wed, 21 Aug 2019 10:01:25 +0100 (BST) Received: from localhost ([::1]:45758 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MUe-00054r-3I for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 05:01:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59279) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MQZ-0008HT-Nd for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MQY-0005xS-Dl for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54180) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MQX-0005wL-L3 for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MQX-0006i5-Io for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 50/61] gnu: cmake: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:57: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.156637780025578 (code B ref 36477); Wed, 21 Aug 2019 08:57:09 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:56:40 +0000 Received: from localhost ([127.0.0.1]:34732 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MQ3-0006eN-7M for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:56:39 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:40370) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MPF-0006Tq-Vj for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:52 -0400 Received: by mail-wr1-f66.google.com with SMTP id c3so1228103wrd.7 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55: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=wt01iLXERxC3NgljfLqUzZO/f3ByWWutDdotc+bTNv4=; b=jvjzja/G/nlPPK6RXc9ppGIEIj1eGxMQC7wmRnVVf6ZWWkK7n/e0NzQMPtW14ZxdPb 89SlSCihObAEhe4dAqbqzDwX58kx6r+14BH9ORgZh84AxA5dkna/KaVTB089bgobAv9M jkU6gBYD5TjQeQIGCo1LWhoxOdc2kS/UlIvinq4j3+F5sQ9xkNeMT48NgZx5MHhZYi5/ YF31B0hw55SugYgVHJd0W6260POGsdNNK9j1A8uiIBuH+XU4mKu5KFMo5UHlXn5AGX1W jsrLqxTqUO/hlQqoTi2BT629sVSm73bXPHmgffK+yEncp8s0SCDPHzofPpKejyhwBErB vhig== 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=wt01iLXERxC3NgljfLqUzZO/f3ByWWutDdotc+bTNv4=; b=j6F4rOxXdJXIyRENZ4zwIcdGtFyMHA3GS7hduGxdbcOruzSrMzzwLN+Z+TZDPIPKKv PU/EhzRLXAPG/cymLADoT5A5xGzqfF2CyaQhk9UIF5p0BrhQ1oY2T5UTD+AdzYvBH/NG pdcIpDKpX6FekB/8sZxawGvmxl189oyEM6rn8c1RiZ5Jb2+O0W6L7xXQx7NCpVBtuBYI fGTkDepK6cMVm6wF8e4+WS77CMhX492RQdx1Te0bt4poEbrEg9a/PQcLvoy1MhQ+Dtsr yu4HnGRUAzGTNR3VxeFl0R1/2qdSZDOtr+OFUY2h+F6lFQ/zlaw+trF0w4lSyUoty0ls OmwA== X-Gm-Message-State: APjAAAUdOnO0ALAQU8rlMlwQEwwBjAPymE+T1JNipMf3hTpXZgfDj82O EWHvChAnOL8CT60PA2C4cmgNdkYKZRE= X-Google-Smtp-Source: APXvYqxU/2YyIp3zkI072B0XxFmmkEJIP9++mYjuoCbXXe1c7xgIv/v/8TMOcs/u2iMVkvfDk87+9Q== X-Received: by 2002:a5d:52cc:: with SMTP id r12mr31678361wrv.272.1566377744151; Wed, 21 Aug 2019 01:55:44 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:43 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:44 +0200 Message-Id: <20190821085455.18508-50-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-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 Wed Aug 21 08:54:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15120 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 5A28B17264; Wed, 21 Aug 2019 10:11:34 +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 23E871724B for ; Wed, 21 Aug 2019 10:11:34 +0100 (BST) Received: from localhost ([::1]:46040 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MeT-0002Td-Eq for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 05:11:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59280) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MQZ-0008HW-P4 for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MQY-0005xM-C0 for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54179) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MQX-0005vc-4O for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MQX-0006hy-2n for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 51/61] gnu: console-setup: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:57: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.156637779925570 (code B ref 36477); Wed, 21 Aug 2019 08:57:09 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:56:39 +0000 Received: from localhost ([127.0.0.1]:34730 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MQ2-0006eG-Rr for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:56:39 -0400 Received: from mail-wr1-f47.google.com ([209.85.221.47]:37488) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MPH-0006Ts-21 for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:52 -0400 Received: by mail-wr1-f47.google.com with SMTP id z11so1244362wrt.4 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55: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; bh=lwhfgbfqRdyuTQ8j7gBX1+dXb3ylK1tN+lL/hBN+Rck=; b=fEzkmoOhxr1YUehU+du5mnLBcdGp8Ks/vCUGCE4yKILKUhPOrRevNQGHDoH2QI8Z8B M0rhRCk5nUARt8WTAIabbySAUaWHMd25DdomkgJO3jhI23PbN/P/nyjYU8TXspHnrpOV 2yMzJ1m6OnQz2xPo+pOmeJm/YZ0xa3XyTMljz81CUQxgsJ61DNCv7/AYRsX6X3jQo3WN OIxi0qqG5dQbmWkCtzopaPa+oAau6Nvf85bAy0LsbMih6dMLvg6J6YmX6dxWxxq3sXRi nuBIlRdgURzpDyoyYfX7/y5lyiEaEORyLCAnp6YN4zYTywXfXWBsE415ldYWl/sxyVvJ mdxA== 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; bh=lwhfgbfqRdyuTQ8j7gBX1+dXb3ylK1tN+lL/hBN+Rck=; b=OwUhvm0yud3s4u08yPdN37LYZsw7/WI0HxjoB97wSGLaB/8ijO4P6rFAVlktZS/FpP yDiEowvS/vEmWAxBG4eVGMfoP6z2J9QMOnvyMp4677X9yCQpeqCkdLVpwEk7qAGH1fuj LBsDaCgFMnENemUlAxxVXo7ZkTYOFGcxGAmN15qlTCbGNUhKMHJyZ768e2h3bwXQguC7 nb70/bLz8SXjqw57UgMmv7aLavVsmnjVKNKhFtK/XD+/630XbzDu8rJ6v6lyMqYEojKG 56kHLyzJxgie8eh8wl2u4cj7Y28UjqxmbWeiuMhFWikAxgpGhCNyVUdLFwHJYF3I2wvt XSCQ== X-Gm-Message-State: APjAAAX/v1Bz+ceDykCyYRqdJpzP8l1Noj1MbWqI/1CLzEcgb6iRR9gF 1Y2vqn/XqoWc9cI7ScpNSf+xmUrdSgs= X-Google-Smtp-Source: APXvYqxYHrq292XTPQuCGVI/ZrhEaZxQQnFCQSLvfN+71p6EAhH5tcxDDs1iH+EtqAogm4C2YBIS/w== X-Received: by 2002:a05:6000:1603:: with SMTP id u3mr4992638wrb.286.1566377745175; Wed, 21 Aug 2019 01:55:45 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:44 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:45 +0200 Message-Id: <20190821085455.18508-51-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-1-m.othacehe@gmail.com> 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 d4ea12be95..c695177c9a 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 Wed Aug 21 08:54:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15108 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 DD2C217264; Wed, 21 Aug 2019 10:04: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 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 AA3C01724B for ; Wed, 21 Aug 2019 10:04:09 +0100 (BST) Received: from localhost ([::1]:45866 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MXI-0000HY-OH for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 05:04:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59311) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MQb-0008KL-31 for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MQa-00061U-2S for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54181) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MQZ-00061J-Uy for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:12 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MQY-0006iD-2L for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 52/61] gnu: mdadm: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:57: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.156637780025585 (code B ref 36477); Wed, 21 Aug 2019 08:57:10 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:56:40 +0000 Received: from localhost ([127.0.0.1]:34734 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MQ3-0006eV-Ri for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:56:40 -0400 Received: from mail-wr1-f49.google.com ([209.85.221.49]:46904) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MPH-0006Tu-Tl for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:52 -0400 Received: by mail-wr1-f49.google.com with SMTP id z1so1207786wru.13 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55: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; bh=p0iJWeQM4P49uByDIXzv59ogn92yPq4f2poEVFJ+0Zw=; b=sjytbJ5MbGcluzXP88eCWnbBdmQtKlafh9JTuWC/6CnCyBq8KguoZZMc+mxwnOZoS+ KO893rdbNOIF56XCCrxQvxuAeBzctX1OBWs71+mrWzBCwQByzw+P6DFojh0vsFjLfpRL zOVqghamrkhqD8uuHAlamJ3c2UoMvWEzHy65031ZPTvFKSf2CDPSkX2fra2f2W/ownMA HyyXmy8nOhGbbDPuIvK2o2ErMl9uEKIoDGa6s2CotCaw7ahjGBjBthbDV5+zdBebUh31 g1DMW1w1UijiAU7cmA5Vam61djeKRX2QEfR0gXADZWcudoqL7SlQrt7gx480WlsDBgfP sAmg== 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; bh=p0iJWeQM4P49uByDIXzv59ogn92yPq4f2poEVFJ+0Zw=; b=gDFbkpTMRh+Yn8N0ci8FG/VShNdub94su8kW65zkyYy0hfrKDL5BdNbT9lHnQZkHAZ hmICQje/21zQeb/9kXE/YUi5E5zaP6ujGD0iskXRxBonWO3vsyvEhzjmKUuNqTmk6yH0 XxU5zUb9z6S7p+KIKXZbZ6GFacGo0tj+vFu6GiJgZkEguQTzFpo0sgsOYLXyFfucN3zS MjthsxLnGEZaf/XAYEH8sYM88DVuX5/HZwyCGPKlPnO9GOZ1dBQXvTCJ085c7dKeX620 rX5MVGj7TJCSZcdI5NJH9oLx6AZszAC4eOGcQ0wkveGVSnDy77Kw/q7kP4oosOnpmXXS cyyA== X-Gm-Message-State: APjAAAUbI/TBwSpZUymRBjqiLnWDU3f54wnKnjQPeWAp4+BeMt+K+GUn SIRZGw53GQGSo9WdO0/gcDA2JMH4s5Y= X-Google-Smtp-Source: APXvYqyeM0f2lboaKhgp0r8JbY2KB9cVWYbe5MPCKEs0LIF5YQ+M8F7LZaqXnHkKWNvsAcyoCb9fXw== X-Received: by 2002:a5d:6ccd:: with SMTP id c13mr33274430wrc.4.1566377745966; Wed, 21 Aug 2019 01:55:45 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:45 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:46 +0200 Message-Id: <20190821085455.18508-52-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-1-m.othacehe@gmail.com> 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 26cba842d3..4283894008 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3525,8 +3525,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 Wed Aug 21 08:54:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15100 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 901F217264; Wed, 21 Aug 2019 10:01:52 +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 53BEF1724B for ; Wed, 21 Aug 2019 10:01:52 +0100 (BST) Received: from localhost ([::1]:45776 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MV5-0005mC-3n for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 05:01:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59326) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MQb-0008LL-Or for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MQa-00061n-IW for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54182) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MQa-00061g-FR for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:12 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MQa-0006iM-Cl for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 53/61] gnu: grub: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:57: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.156637780025592 (code B ref 36477); Wed, 21 Aug 2019 08:57:12 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:56:40 +0000 Received: from localhost ([127.0.0.1]:34736 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MQ4-0006ec-5J for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:56:40 -0400 Received: from mail-wm1-f46.google.com ([209.85.128.46]:56051) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MPI-0006Tw-TT for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:53 -0400 Received: by mail-wm1-f46.google.com with SMTP id f72so1257744wmf.5 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55: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; bh=4xnHTmjVDui5nVD3cucNF5qppjN5En3KEWtVRDGkeuA=; b=YmtN8ujR5H4l0hXa7znfVEFPqo9qpMUONyttzYo0xfmiWQH7ySGYZt5sZZipuAaLI9 f/AI+PZeraaVAMHAloKnuKYdOC4M99f8enr5cbyQTc8nOom+AZzq8EMeppNFC+2t/22a MdkF65HNwOHLJB21cxVS2fmlM+9PF3ifsY44+lyhw8TeOUaiYe7Gp75oxTva02imSgCW AMvwIGqKxDaTJkNUiyqidZEc7yB9ntzST77Qj+6J1hGV+m26ghB7psmC93sFWBWAOBc1 KxvBgRHggktgCIMmIIdCKNISjEKkGWkSDstFa3zes4wbTRiArERy14G0NHQf/dSUjXD/ TWqg== 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; bh=4xnHTmjVDui5nVD3cucNF5qppjN5En3KEWtVRDGkeuA=; b=i8PGhu0kpm8PNG88O9BtaHm+YGCSRHLO9DTED3SD/JFZZQBCX3e5s9NdRhtPoSEm2S 5pYCluJ+UyuOOjK27y7MpRK9EWsfWfPslgjLrBwFypHI5DRsU6rhLpBhEPBseY1WP5L2 3eQBgorUrDSCuqROsPxoqgcO0CEb4ieNtP4vZXlyiXBYS4hQlaeCZ/i0O+cT1JjnyJ7I ITVWj2d731jrItIxKQtviqZkhAml8S7delG8jtxjiAYIDvMTOOkzAh1+q+L9owZtiIuU fMZU1YWeVxaLt/G5Nc5CE9r+EwBHm8cDbXnTQ7szP1W52ktjs5mBcfaIhWV/2I2c33Bz VI7w== X-Gm-Message-State: APjAAAVIR4CClG2rugPudOiDNrt1MfSsTGSgoOQNeI1yxeH+GGvFgYIz S31TdsS/MXj4LsTYqdzqILd4ruJsjBE= X-Google-Smtp-Source: APXvYqzwHgRgBTy8m05DJEiAe18xvBQXwat7mRdLR+nRyP73A1WICp3tvR4EdNGLhz8G/w4UcM31uQ== X-Received: by 2002:a7b:c246:: with SMTP id b6mr4931645wmj.13.1566377747044; Wed, 21 Aug 2019 01:55:47 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:46 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:47 +0200 Message-Id: <20190821085455.18508-53-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-1-m.othacehe@gmail.com> 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 Wed Aug 21 08:54: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: 15101 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 EF52317264; Wed, 21 Aug 2019 10:02: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 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 BD9B61724B for ; Wed, 21 Aug 2019 10:02:02 +0100 (BST) Received: from localhost ([::1]:45780 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MVF-00065d-PJ for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 05:02:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59334) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MQc-0008M7-3F for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MQb-00062D-1H for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54183) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MQa-000626-UM for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:12 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MQa-0006iT-Sr for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 54/61] linux-initrd: Use native gzip. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:57: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.156637780325602 (code B ref 36477); Wed, 21 Aug 2019 08:57:12 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:56:43 +0000 Received: from localhost ([127.0.0.1]:34738 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MQ4-0006ej-G2 for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:56:40 -0400 Received: from mail-wm1-f42.google.com ([209.85.128.42]:33590) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MPJ-0006Ty-Mg for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:54 -0400 Received: by mail-wm1-f42.google.com with SMTP id p77so4277988wme.0 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55: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; bh=ukNvIWXfhcbrIt7Aq6Kia6x3wETiN20GtljSYNw0bdE=; b=dYd5IWUY4qAzFE6O7qEbY4IVG1g1KXvo2u5sOMRhSuEGq0GdDwYdH5wzfOSZKh6L1Y NOltzjtMglKBqkb75TQjNuvxRwqFSfks/OsNp2pRRlIpu3dRb5ZnbkDYpom4H6rQe8pR Wg6GjPz3HUn1A736y80WUg0BiN2UnFh1fsN9sBweZFWurv6APCC+GEn7988yISc5jvOv E4z4y85U5qjZf8EbawYdeNqErLvlnbd18iIWqnN6fWeT7e3dWE07ZZjKS8jyj7EcHsc5 /JlNvf1OZlAh/oYUHIw/Fs2JXt25bPrb90tKYU2BT8o5iGO+LHdue72FkSj1VdroJzSI NtTg== 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; bh=ukNvIWXfhcbrIt7Aq6Kia6x3wETiN20GtljSYNw0bdE=; b=QG/8D12vak7tqAwRAtLWgLff8GiEH/TsZc1un+Yh4Z1/3lP6FmVeTWVhSKu9J7Yq+F xGUdGuv9GZkzh9sb5waqpoZTYnycqmWIkoU2hWfZ9i6JdN/u1iGzBXVLDLZBP6/FephG p61oHXAh2MJdoGBVqCZxA52BRyWCTyqhYbSF3deYpkv8e8Lf1HmZ2soDJuA/3C8X3Xrz aIqdck6l1SY13+kEXenHL8Fnp4HP25F+1ltaBW61Ah99ER4QGY6a/yPHadpm49sbIqQz R9nozVssdSD7VtA5J7rZSI74yo4ZpByqr8v8vnKvlkNzSAbd+dPqsMDkfbuAJT/ROmcA ooFw== X-Gm-Message-State: APjAAAWUgF10etvutzZe89zmsiCj2JpBiiQFInSNGCZY055uwuzk0uuF l1pdB3DrxsYmZmSXeFhEFkciURp60CY= X-Google-Smtp-Source: APXvYqxoxGZGM8O+ELCgl7QxKDEIkeM7xBU+NEX2A46g4hbVXpQ32rg8h7BNuFVlnh6aAI+UCvWcLA== X-Received: by 2002:a7b:c1c1:: with SMTP id a1mr4993856wmj.31.1566377747859; Wed, 21 Aug 2019 01:55:47 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:47 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:48 +0200 Message-Id: <20190821085455.18508-54-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-1-m.othacehe@gmail.com> 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 c90b87c023..34062a3517 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 Wed Aug 21 08:54: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: 15102 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 C298017264; Wed, 21 Aug 2019 10:02: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 DBB641724B for ; Wed, 21 Aug 2019 10:02:13 +0100 (BST) Received: from localhost ([::1]:45788 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MVQ-0006MM-Qy for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 05:02:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59346) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MQc-0008N1-H4 for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MQb-00062U-GQ for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:14 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54184) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MQb-00062P-Cu for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:13 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MQb-0006ib-BU for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:13 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 55/61] gnu: linux-libre: Enable built-in ext4 support. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:57: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.156637780325609 (code B ref 36477); Wed, 21 Aug 2019 08:57:13 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:56:43 +0000 Received: from localhost ([127.0.0.1]:34740 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MQ7-0006et-Aw for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:56:43 -0400 Received: from mail-wr1-f43.google.com ([209.85.221.43]:32793) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MPK-0006Tz-LW for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:55 -0400 Received: by mail-wr1-f43.google.com with SMTP id u16so1262147wrr.0 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55: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; bh=/Jwik5zoM/W/BFb8aJruUnY11C6zex3zb3wXecN1nQQ=; b=R57e+MUP7ozreiuGo6WVehvtGPJf4MpmF4KaJKffIJF7+ForK02nYIf8Xk3fZ1tXBc wUDzYQXIVME0QHOfEaZoomadicPlC9IwGlXOcj386N71IDSlzo2ZEdj3XGPPze5JaX9F Ti2Ry31ungDmPgtadJdiY4voGVJPTGg7O3yXQqBRpOeLQ7iJVtUWbgKdmN5qZsBHZ8uv 9h+OysmD69/kcW6QD3sAqw/1OPrF+uxl/F8XCQxdiTHYmadU2+S6TmEAqIy9Aa4UURYQ sitT+lojdFkEn+jGt2rliY1bTE+5GAObJLJW4QalFpUXp2D50Qp/JLTkAnWbgceGW1d8 HCJA== 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; bh=/Jwik5zoM/W/BFb8aJruUnY11C6zex3zb3wXecN1nQQ=; b=dS5fTFrA/+pxQ5o9f8aBi3kCgDamz3RSAN54LKx4Vo0478vjwF7gVgxyDBc1exVfMs 1Jji63jeAtWSJ9kNG0GcC+4uuaMLO2uaXRYwk2DE2oq6RancoTmqmhfmNBhgctpRCf91 8py/AUnKB3YtOGxBXCSpj6Sr8QCqa+ghpqiPJ3RviPlrfTBADNIy234jZ6T5jqB4gX46 jApV3WtV8Ey3GZOBCeYnaNTxKyliGlr3Y2UFC0XgEMRdZXWp6IzyBJgyY/8dhrhn2ujX y8RcGf23C+4GdmUcwebe+/6GdOvUnT4YW52BE09HGBbj3/u8VROOGY5aAbQyv9TpR3k+ Laug== X-Gm-Message-State: APjAAAXU/2IGYmhEVaj8T+t92/AC14j8QCPPuxXTWvFU1kpql3cXGbsP MdTSoz3Xdp0kFV0WplUjuJwRCrYWByM= X-Google-Smtp-Source: APXvYqw4YJsWZH48KQ56BTKUTiw0h560XbDLu+KKXnUSvdqXCa5pSfx0NczvQShUr6BmHWDXtWH5UA== X-Received: by 2002:a5d:500c:: with SMTP id e12mr20122325wrt.213.1566377748705; Wed, 21 Aug 2019 01:55:48 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:48 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:49 +0200 Message-Id: <20190821085455.18508-55-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-1-m.othacehe@gmail.com> 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 Wed Aug 21 08:54:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15103 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 BF36E17264; Wed, 21 Aug 2019 10:02: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 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 87DA21724B for ; Wed, 21 Aug 2019 10:02:22 +0100 (BST) Received: from localhost ([::1]:45804 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MVZ-0006ew-QY for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 05:02:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59362) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MQd-0008Nt-0t for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MQb-00062s-VP for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:14 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54185) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MQb-00062m-Rv for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:13 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MQb-0006ii-QD for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:13 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 56/61] gexp: Use cross extensions when cross-compiling. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:57: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.156637780425616 (code B ref 36477); Wed, 21 Aug 2019 08:57:13 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:56:44 +0000 Received: from localhost ([127.0.0.1]:34742 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MQ7-0006f0-Kv for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:56:43 -0400 Received: from mail-wm1-f53.google.com ([209.85.128.53]:50420) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MPL-0006U3-Gi for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:55 -0400 Received: by mail-wm1-f53.google.com with SMTP id v15so1277818wml.0 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55: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; bh=cvvFyfXxc0+gE+jTUwIPrClR0dbwyLH+FAo14RGWnBI=; b=C601qCrJNc2gNCvYtG517CHXhrz2v7RvcdEpMXeTTczPXJNmqTjOkyc8Np4rve8DrE X2GZMmpPEegHnnsvN4OtOfilqAfA8nPkECbuM/eBE14yJs2koDAqvbD3bx4bs+MsiKhp NpkoZXNaFlwck6pecdkM0lSoyoFRpO66urRtRE6yu1Coz6a75kGo8uISy4qu4u7Rh8Oe kTwXa0u8uHv7Og57qWlKi2o47eR+YzmMfa8OVi1rWN5oVGj8QCeH+IdHhN12veaGNTN0 eu31SAXzjFlmyxGWZgwVR9nN6QuHIHF7nWMY0NL/6C8PqNipsXaA0G6yCWMPzU6jn48u yPJQ== 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; bh=cvvFyfXxc0+gE+jTUwIPrClR0dbwyLH+FAo14RGWnBI=; b=MvfFJa2MYsqCYK3JLx/hDK05AEqlOP09DszS+hsCtmG19H1hNl8jMmnQPLr1BDyhF8 EDvxeNGRoYqTjQzQV8RPF+fOMmcULI5/27tLAnpU365nvsYeonaPa86LhvqK98Z8ZD8M RM+LnX70x9cdJe3ebMQwE4tCanGQc4A0Nle2igHyS0sSNqHO58DC98fn0vmrAqY4AzSa sg0iJvRJXoVLu0bS9I7yLCZ/FIuIbnUUVMKPuOsZHW2hUApqAWkInMJmZHpXADfHq/dn JFihYoKUCHl8DiD282+45YelFSRbrRtnHxvfupcFbcXbo0350PLOuxrIfjwcUwpLYWNz RKQg== X-Gm-Message-State: APjAAAW/xtvoIWJ6xEZeKkxDFg2vLETHX5SshIw4QrMYVQCm0R765dNx DCxveHSndmUWg4tsYvkwof8w+C0nZRU= X-Google-Smtp-Source: APXvYqwhWOSEudWT1vXrZ7TFgm/3c/LqmWCgaOCKRUEac5mji+GiYiQEBZCiqcu0j3ybxZOrl1Wzgw== X-Received: by 2002:a05:600c:228f:: with SMTP id 15mr4488584wmf.160.1566377749581; Wed, 21 Aug 2019 01:55:49 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:48 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:50 +0200 Message-Id: <20190821085455.18508-56-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-1-m.othacehe@gmail.com> 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 Wed Aug 21 08:54:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15121 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 2295317264; Wed, 21 Aug 2019 10:11: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 E18301724B for ; Wed, 21 Aug 2019 10:11:40 +0100 (BST) Received: from localhost ([::1]:46044 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0Mea-0002fx-Bi for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 05:11:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59376) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MQd-0008OR-Cm for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MQc-00063K-DF for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:15 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54186) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MQc-000636-9m for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:14 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MQc-0006iq-7y for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:14 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 57/61] 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: Wed, 21 Aug 2019 08:57: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.156637780425624 (code B ref 36477); Wed, 21 Aug 2019 08:57:14 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:56:44 +0000 Received: from localhost ([127.0.0.1]:34744 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MQ7-0006f7-V4 for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:56:44 -0400 Received: from mail-wm1-f54.google.com ([209.85.128.54]:54982) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MPM-0006U8-DR for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:57 -0400 Received: by mail-wm1-f54.google.com with SMTP id p74so1259341wme.4 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55: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; bh=ST4l1KbI9iHj9KXKzbTI80//GXml2ygK6ky/tShFgJQ=; b=fDiJ6CZZtkuV6idYxrJ2UuSqcFxtpNqO7rPBg1ejlQxdvqxtcPumW+w5l71OpbyHN3 akiR1MGe+UgAjU+m+xM1K2u9P2keGq+jRq8i7jTFwRsqNvrQJhTBi8NN5bJRLEUpIzrm NnT2+xJDEBNM+escpt2NA3XlZTjoCgvHtmVBIRHq57RofMQEv6Ge50QFksoyJ+PNl3ar D9h++p2fdixY1bXPTYyAuDI6Ewxh4VP7ei+5vykdH3GgQMkUoPMg1+R8cwdJzdItMWi2 0O91zKDfzxgWiXBtKft5wdB58yML9rcIrH6B7JaHAqwPysxC32ie0SahUGDWn8EB1Si3 iwQw== 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; bh=ST4l1KbI9iHj9KXKzbTI80//GXml2ygK6ky/tShFgJQ=; b=colwv3Re3emlfxW1ZBJjjHbgMlFQ6D8Lcxd5uQ6eI3uQy742IeL36zVDKjiYuZZbau sAvvseO/wDs8w+aVcMCfkaDhgfCx0udUpl6ltIbrTM6vN7qSVgw3akbn0Nk5Z6tRbnpE iuld3D2CWIo4eZ9/1i+YkvWhAakSHJlxsya1lFg+p2ByxPG8Ak4zw6yEN0yNMOV+MNEp d6QpxZ0mM/qTYJIuJP7p9Y1M2baQMhn1SpGQvJEOS7L6bn+AyLV0QaFdYY1s5uyVY3Sa 2jh15yxtUMcBno94jEmjlf3vheWM3Wra9QnQl29vGvupELp20Na9DlZsf9gcs8C86Elb 2XIA== X-Gm-Message-State: APjAAAXLA19E29R8D8TSb1Pxmo7DXok/mRXkPgeuVFILKNPggl+CsDaU 3xG9Xbuy84rAUjAygmkd0v+ydqaQT/c= X-Google-Smtp-Source: APXvYqxUPJf3jjpeS0tDwaHtaDbgow1Jk0p0T2P+sQhii84pLG+ZCmKLNJXbYYVXekHuaIWoT9YZRQ== X-Received: by 2002:a7b:c148:: with SMTP id z8mr4985211wmi.168.1566377750424; Wed, 21 Aug 2019 01:55:50 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:49 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:51 +0200 Message-Id: <20190821085455.18508-57-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-1-m.othacehe@gmail.com> 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 Wed Aug 21 08:54:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15089 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 AEDE017264; Wed, 21 Aug 2019 10:00: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 766211724B for ; Wed, 21 Aug 2019 10:00:08 +0100 (BST) Received: from localhost ([::1]:45702 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MTO-00032l-PX for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 05:00:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59385) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MQd-0008P8-Rp for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MQc-00063i-RI for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:15 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54187) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MQc-00063Y-O3 for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:14 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MQc-0006ix-MH for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:14 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 58/61] utils: Use target-arm64? and target-arm? helpers. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:57: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.156637780425631 (code B ref 36477); Wed, 21 Aug 2019 08:57:14 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:56:44 +0000 Received: from localhost ([127.0.0.1]:34746 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MQ8-0006fF-8b for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:56:44 -0400 Received: from mail-wr1-f49.google.com ([209.85.221.49]:41951) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MPN-0006Uo-6c for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:57 -0400 Received: by mail-wr1-f49.google.com with SMTP id j16so1229700wrr.8 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55: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; bh=cXSRfja10rg0I4hDCOE+6pUFl9D2a5/TMWty+UQVIQ4=; b=nPsaFRGy0upWNbDttg0pN35e9YEw/edreIKRdtQUr01GjWASf5x/JzV6asvw5BKnN2 dK7MzSGPMvaOj77/65MOPxfdeR0L+GAuo9ljAnbD6fBTOOQNHw8y/mcQfYig56vGIol3 XZDYIDXgO1xksxDnrb5lYAxn+rm6CJ+9fRMWaE8pwIzlva+7iNCAmo5HsxPE+QlJXfTO M3ozWxqqcktNhhEyGboTn5qfBctQ4Y9XUoXvLS+iD3sVGUp7cW3YbIEZZiXE2jL6yAfH /fWd2WYDwnavH9trWi5t6NCrzQ55Mt8c/t0Xwu/02Hv5s72zRSBn1GBtfknxUNJ9qKSH 63/g== 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; bh=cXSRfja10rg0I4hDCOE+6pUFl9D2a5/TMWty+UQVIQ4=; b=PcK2kbYDv1SuL95xgmBiSHTHS3SUqqzeSwtm3M4b6auT93YXGg35EZqg/LKpzwYMts qU9HWt/Q0e0LfG5jEPj0OxNL+4ve41aQz2nWbjK0xopfoT0lfuKvXDU+1eAWOkOPEs7b KRoZ7i/HsOiBkJJi7xSfFdFspcecbNZHBsdm3inWdQzR7gR/USGjtk7e8l107w1Fro+t RPpSUhIk/GrQU1NG3JToZm4IfshgDQbYGl1QbgfYrf7Mx1pzbhkaSwX9+bz7+dzoMWoA G8H/3rER1olXF8bohVJQZ0ZBZEHZzEyajbUdx1cKjTRDM2yUIi1wjJyn3q63c6sVBk8m E7sA== X-Gm-Message-State: APjAAAU6p1VgXVArPPeVU6XB3MEqM0Gm8AIoURc/bbdFewPeJ7g4Bjmz vRK+GNGbrXt6hI/H44/1MZNH0VYr5cs= X-Google-Smtp-Source: APXvYqy5h6fGR/gEHlfQCEPQ5PHmP2s6V5A1xg2MZV95YCc0t2EQ11k12LmOdaEpITLOcLeZjNw9cA== X-Received: by 2002:a05:6000:4d:: with SMTP id k13mr39618402wrx.196.1566377751333; Wed, 21 Aug 2019 01:55:51 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:50 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:52 +0200 Message-Id: <20190821085455.18508-58-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-1-m.othacehe@gmail.com> 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 Wed Aug 21 08:54: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: 15091 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 4A0D817264; Wed, 21 Aug 2019 10:00:21 +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 02C501724B for ; Wed, 21 Aug 2019 10:00:21 +0100 (BST) Received: from localhost ([::1]:45718 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MTc-0003LT-1O for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 05:00:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59402) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MQe-0008QZ-JC for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MQd-00064D-As for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:16 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54188) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MQd-000640-6q for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:15 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MQd-0006j4-4B for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:15 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 59/61] system: vm: Add arm64 support. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:57: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.156637780525638 (code B ref 36477); Wed, 21 Aug 2019 08:57:15 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:56:45 +0000 Received: from localhost ([127.0.0.1]:34748 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MQ8-0006fM-I8 for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:56:44 -0400 Received: from mail-wr1-f47.google.com ([209.85.221.47]:34198) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MPO-0006V8-76 for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:58 -0400 Received: by mail-wr1-f47.google.com with SMTP id s18so1259141wrn.1 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55: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=D9y4SeOncI+wFwwiB9xKA6Cngxs/F0jOUAfL7wM0Kpg=; b=W4OrAzfaztKe6J5Y52uVD3rOHU1XzA+dEfHmp21A+WS/dT0LU0uNeMQ6Bp2roV55av +iTcx7F/n/dqLrsDxv+fUfEO2Gn+3W1RUNuzEsXFon7W0LmSxIZ2XhKbT7u80SsatDqJ gdTbY7Q15MrmT4nI7Z5f5Jmm1j8xeWvVcroOqNDL8s1oJUsVwAiIyGWb7WEiELlum6Q6 y/wTC+X6DSzxx0I8Dj3Y8yKWD8YVls5oLDEbCJf9TujEI9yVEdDkNVeQNewygoTJUFFl SnvZt6Ezxsm342B3pHSETpGgLbLKMiq7dzohaAvlli57TAWzDQKx37D92vkXoKI25Nil dCKw== 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=D9y4SeOncI+wFwwiB9xKA6Cngxs/F0jOUAfL7wM0Kpg=; b=nmiglYGt4eIdpYTrcSagjTrws5OOMlKs6lMf6DfOR7bs5mfDeHCJcqsFplO0ZYVvNm ZExCOtzop/RaV5P3SH11fzytOcE+pX+4ViXm2SkGg+0rA8IAaw9AseuBpCfUyDkLkfid ToRXK9RpcQWd7x0PZKj992KEjugSacxMBuJ7XOD1qvvLy++L8+5/9vI+Z4zdRlz9CucZ Ji6V5ng8455kpAdPPRKMy2KcRCalVqnCJjpJopfywAaL2XAO0FQPNn+nrEN1Sf+V+VH8 ijDbyio1FvIVpEZDnEAN8hMv1jzSKKyCaOOkzzXBF4echZMzvvYQMvO2SV0k18YwATR/ dGdw== X-Gm-Message-State: APjAAAWv9CJxI9jLWvMSkpx26wxmZrq/KOSqO3lNQduOZ+t6dzp1fIg/ alOe6pE7beOeGN3uQMg89+lMLtjcpHY= X-Google-Smtp-Source: APXvYqw1VSoAcei/q2ZyFQu96Yfx96qfC6r4+3lAw6ZO1Xfo+zCfeud4WogNSwkAOhPk8W6ne8Os1A== X-Received: by 2002:a5d:4cc5:: with SMTP id c5mr11754409wrt.278.1566377752246; Wed, 21 Aug 2019 01:55:52 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:51 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:53 +0200 Message-Id: <20190821085455.18508-59-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-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 a5d9fefa62..6a1c164a41 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,16 +98,27 @@ 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 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") '()) @@ -117,11 +129,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 Wed Aug 21 08:54:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15093 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 AF0B717264; Wed, 21 Aug 2019 10:00:34 +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 5B9D71724B for ; Wed, 21 Aug 2019 10:00:34 +0100 (BST) Received: from localhost ([::1]:45722 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MTp-0003eD-EX for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 05:00:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59415) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MQf-0008Rt-C5 for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MQd-00064a-Pq for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:17 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54189) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MQd-00064R-MU for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:15 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MQd-0006jD-Kd for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:15 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 60/61] system: vm: Support cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:57: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.156637780525646 (code B ref 36477); Wed, 21 Aug 2019 08:57:15 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:56:45 +0000 Received: from localhost ([127.0.0.1]:34750 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MQ8-0006fT-UU for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:56:45 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:40394) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MPP-0006VW-6U for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:59 -0400 Received: by mail-wr1-f68.google.com with SMTP id c3so1228541wrd.7 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55: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; bh=cCtQCncHylGJKH97u8Zs7Y6eJAkhgnHnM6y+HwkFZoY=; b=RNNzy+XXtL3hOvTjE097pT2jisJ5zbndK3sKUaLcIomzQNSk9BUyIMItFoDi6mUvYi whaSmMec7N2YzLqf66D4q9M+IoldgY+pLUs0Z3vgxmG8LCsH8IVkS1XNcUskD5ZvWhRf s4MQu7v/4RbS8X4rtcM+Kbce6ZBNyCowpYsPTaRDzwVhuSqoXXsygiq8SWWrfmhCNa8Z Zoa1MogFv1tXCx1xf+GFmehhKZeOUm66pdqQSaiKkbrhky8PC/EYX7BNd0CYUmTizubr IfiheyR1YGoxjpp7CCBxVZiP+MSPmHnBPe5FubF99hVgyoMSHYaIibdCKul7ikqNrKmv xwpA== 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; bh=cCtQCncHylGJKH97u8Zs7Y6eJAkhgnHnM6y+HwkFZoY=; b=dXzGttljQjBYN+OE55kD/vBCH03ssmnDu926/D4e/Yo+FmGmJJFnKoJRbBJ2Us8opm gdjpYAKjhsbFZDAWggPs/Xxq2JDSR5kMXn2A/cpPfeX24olEGQtc7kp0S53+ZTETR9Yt p7+cJGZLz7FYbYjsLAJL8BR8788a8TOxMTvKciMz+dLTfYAEq9Cs01MfEaliLNGU5oHp BKY/L3s1o9s+5Cs4x9E/hynUjz3H6xuK+v2o0euN1W2xx5g7XtxnaF5wz5kDYn/SVZO4 RUlxlSIA7j2dvXR/SWHE4tsDPsFEnLDZs4EPaLJek+1AVciCK5uQQiaUvPYhki1/QJQH xqwQ== X-Gm-Message-State: APjAAAWzbsQule34lG95WU5hz5Uxdsjk1/+qRjXofuGBXQpi5xXggDfD 7E4S5sDWPT8rBKIkdVQ2aAex1KEtZbY= X-Google-Smtp-Source: APXvYqyXd/rsgdTe+5yzHLoKhEqNfpOnkTp1cZvz9WwqOJZ+WCvw5DNNzbmvW6cvaFbooejjIrS6Gw== X-Received: by 2002:a5d:554a:: with SMTP id g10mr450171wrw.9.1566377753275; Wed, 21 Aug 2019 01:55:53 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:52 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:54 +0200 Message-Id: <20190821085455.18508-60-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-1-m.othacehe@gmail.com> 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 Wed Aug 21 08:54: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: 15109 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 B258A17264; Wed, 21 Aug 2019 10:04:21 +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 656511724B for ; Wed, 21 Aug 2019 10:04:21 +0100 (BST) Received: from localhost ([::1]:45878 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MXU-0000Yd-LB for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 05:04:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59419) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0MQf-0008SA-Ks for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0MQe-000651-7t for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:17 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54190) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0MQe-00064q-4c for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:16 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i0MQe-0006jK-36 for guix-patches@gnu.org; Wed, 21 Aug 2019 04:57:16 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 61/61] scripts: system: Add --target option. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:57: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.156637780525652 (code B ref 36477); Wed, 21 Aug 2019 08:57:16 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:56:45 +0000 Received: from localhost ([127.0.0.1]:34752 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MQ9-0006fb-D6 for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:56:45 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:41548) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i0MPQ-0006Vq-71 for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:56:00 -0400 Received: by mail-wr1-f65.google.com with SMTP id j16so1229844wrr.8 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:56: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=ATBSAAGOjyRP6A/DLGSBsGQxENa+fkdmJrQbDu2ADg8=; b=pLiyelGS2RruG5sEsvEvyDoYwLXZiqNCB6rt6G9E7sCKmpFuR4RjkcTl9USKvKzO3R hov4Ok5BmkFV+f+U+Cq9udv1nvhDcUPLTHEIjSfdbA8d3cPSd5NcnLNASZ3i48uTKdOd vtKaINMS1IKTmPAcCpMmqAQTDVnvkJ0Pq27glO/TfbKRYfbBBU/PbEplQfSXg5lbt6gl AVLL11hKZw8tq4YEEVBc5EMADpX6mbgnFH7wI7v+My3oTzmT5tI1yYJV2t6YhY6Tlecz 56r2KP7Kq81u1XHHrLSnnulzOioDEg+5eZIB2GKKmf5KhR3v9qsot026VU2WQi079yHk slrA== 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=ATBSAAGOjyRP6A/DLGSBsGQxENa+fkdmJrQbDu2ADg8=; b=klAOy8cSZ+yxhFangr34qzIVw+0L0zTYfMilkm0zF7qlOcG0kMhRkB3fa5AkNaxGai pVplvGWZcrDIPviZA9gmctzT60B7x+prM+tp3GmGEWlurvipXLkBVsWYlydrwb91jdO1 thOnOQgrFHRcO8xaEiviIAWcDplYfF39ldCMMOg2Myckq49Rwgz0O6AemIT3jJGQpWEb o+JAYo1mpev4FcPIF6sw9thcU4eux63uUt28vhIzREmhnEZtbo81IWPFem2IsVT4YbHd cQjBkrzkYC7iJW+/5R1SDEc3CjhbFobrMrUAyjGbGmTpAH7+8JODStRPO0J2NLxg3Ihj AGDg== X-Gm-Message-State: APjAAAW8L/gR9f6WBqA4wkba0fjvtGPTQ2daX2e0ZAG/Va2dkkfS1k9z vvx4+FixC1j2ZmigQwLK968RICjM3bM= X-Google-Smtp-Source: APXvYqyjxzj8Y2NQ03gMXUluF7sUxVrHqRMWX1Eb68bqfkgakHnxuDiRxN7I3f00ZvX6cPOmeVJOuA== X-Received: by 2002:adf:d08e:: with SMTP id y14mr38729207wrh.309.1566377754348; Wed, 21 Aug 2019 01:55:54 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:53 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 21 Aug 2019 10:54:55 +0200 Message-Id: <20190821085455.18508-61-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-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)))