From patchwork Fri Apr 12 13:15:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 3272 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 0D30116E5B; Fri, 12 Apr 2019 14:25:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham 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 DF00F16E5C for ; Fri, 12 Apr 2019 14:25:10 +0100 (BST) Received: from localhost ([127.0.0.1]:37256 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEwB3-0004Pi-KI for patchwork@mira.cbaines.net; Fri, 12 Apr 2019 09:25:09 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57753) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEw3P-000204-IB for guix-patches@gnu.org; Fri, 12 Apr 2019 09:17:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEw3L-000559-0q for guix-patches@gnu.org; Fri, 12 Apr 2019 09:17:15 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42089) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hEw3D-0004zt-Md for guix-patches@gnu.org; Fri, 12 Apr 2019 09:17:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hEw3B-0003M5-Oa for guix-patches@gnu.org; Fri, 12 Apr 2019 09:17:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35244] [PATCH 1/6] gnu: bash-completion: Fix cross-compilation. References: <20190412131331.24892-1-m.othacehe@gmail.com> In-Reply-To: <20190412131331.24892-1-m.othacehe@gmail.com> Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 12 Apr 2019 13:17:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35244 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35244@debbugs.gnu.org Received: via spool by 35244-submit@debbugs.gnu.org id=B35244.155507497512773 (code B ref 35244); Fri, 12 Apr 2019 13:17:01 +0000 Received: (at 35244) by debbugs.gnu.org; 12 Apr 2019 13:16:15 +0000 Received: from localhost ([127.0.0.1]:55623 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hEw2Q-0003Jw-E7 for submit@debbugs.gnu.org; Fri, 12 Apr 2019 09:16:14 -0400 Received: from mail-wm1-f53.google.com ([209.85.128.53]:50422) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hEw2J-0003J1-QK for 35244@debbugs.gnu.org; Fri, 12 Apr 2019 09:16:12 -0400 Received: by mail-wm1-f53.google.com with SMTP id z11so11263829wmi.0 for <35244@debbugs.gnu.org>; Fri, 12 Apr 2019 06:16: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:mime-version :content-transfer-encoding; bh=whYJFem/ce1KVAfvvGHSVyiIN28uIrNft6GaPHPx9gg=; b=N4NkIfodES+aQGA1mgUuYmFfvHwyuh2CUZaTjZNywJFnG+kScFDTpZf4flkOYCvMAD KGeZY0zUxMf0C42ov5/nBTZl4Nf2U4gGrwem8Uxa0WLWGH15zRUP29s0bVwyOUWN331I /m0dNBLuOUsnbx95Uy9n7QhW1GrhsgBAJxaKvdmC/bNfcj10V2UKK1RMoZxOIHe3PseC IIoyZ1d8tiQ9jx8ii6csL3iJ0iGxmd+zqlC7rswsE9mhCqrdK8VBQZxdCBNy4pIeIP0M lj8WcJJeqlrf/3/KwnpC8ScjCztVCPG1f0BhgBiO+Y/Lnk1yVMGthhU2pk3+Sp8jPF+T z70g== 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=whYJFem/ce1KVAfvvGHSVyiIN28uIrNft6GaPHPx9gg=; b=QdtGYc7bE7/el2NUc1SnFHHZ7sQC5g+24P6ymHcOUzA2m74NhsAdTgLFdMHLs0p9yM Ds1VHiEWdBNrPlUv0UN83PwTIoJ5dv5C9z1+TxlsLjYF3wK3ojPAT+acC/cOxTF/2Dfn za1SqM14oAk8mSICiqYcxjvBFmZQ0Ww4Kf+egxe5AZUjWD2rkcv01gWtZVyLBBkU1pTD bYSaxC+f/lEiP8ODt7gUS8mDWAu5ig2BPxXIpV9XiLo2GkzjEQPQLMddrBAyLCpoHZTP 0+s6RFYt+mrxR65NpwuGMY9UaNNSuwP5b1n+3Xl2dDflmWlec6uEg486OEJpt+R7G7VE 4MaQ== X-Gm-Message-State: APjAAAVIobNac+jb3WGVmksD8yZGuCZz/MPx9DP2N1Bj0Kak8ObTbJqi /rH0ow2haMLOAI9myJ/ges6iSfvV X-Google-Smtp-Source: APXvYqzqBHZ9xigo7g9sN083V6VEmaZK+C/cln9Qi5raUGpyCYlrWKkBxf0SLMJX58EernDvc44Fcw== X-Received: by 2002:a1c:6c17:: with SMTP id h23mr605300wmc.122.1555074961767; Fri, 12 Apr 2019 06:16:01 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id d4sm35932882wrv.42.2019.04.12.06.16.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Apr 2019 06:16:01 -0700 (PDT) From: Mathieu Othacehe Date: Fri, 12 Apr 2019 15:15:51 +0200 Message-Id: <20190412131556.25282-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-Mailman-Approved-At: Fri, 12 Apr 2019 09:25:07 -0400 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/bash.scm (bash-completion)[arguments]: Search for util-linux in native-inputs and inputs during "remove-redundant-completions" phase. --- gnu/packages/bash.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index fb4e3f4be3..ef93a11085 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2015, 2017 Leo Famulari ;;; Copyright © 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -291,13 +292,16 @@ without modification.") `(#:phases (modify-phases %standard-phases (add-after 'install 'remove-redundant-completions - (lambda* (#:key inputs outputs #:allow-other-keys) + (lambda* (#:key + inputs native-inputs + outputs #:allow-other-keys) ;; Util-linux comes with a bunch of completion files for ;; its own commands which are more sophisticated and ;; up-to-date than those of bash-completion. Remove those ;; from bash-completion. (let* ((out (assoc-ref outputs "out")) - (util-linux (assoc-ref inputs "util-linux")) + (util-linux (assoc-ref (or native-inputs inputs) + "util-linux")) (completions (string-append out "/share/bash-completion" "/completions")) From patchwork Fri Apr 12 13:15:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 3275 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 4205316E5C; Fri, 12 Apr 2019 14:26: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=ham 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 B992D16DEE for ; Fri, 12 Apr 2019 14:26:20 +0100 (BST) Received: from localhost ([127.0.0.1]:37299 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEwCC-0005Nc-AJ for patchwork@mira.cbaines.net; Fri, 12 Apr 2019 09:26:20 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57751) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEw3P-000203-GL for guix-patches@gnu.org; Fri, 12 Apr 2019 09:17:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEw3L-00054z-0W for guix-patches@gnu.org; Fri, 12 Apr 2019 09:17:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42090) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hEw3E-00051m-4u for guix-patches@gnu.org; Fri, 12 Apr 2019 09:17:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hEw3D-0003MF-Vx for guix-patches@gnu.org; Fri, 12 Apr 2019 09:17:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35244] [PATCH 2/6] gnu: groff: Fix cross compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 12 Apr 2019 13:17:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35244 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35244@debbugs.gnu.org Received: via spool by 35244-submit@debbugs.gnu.org id=B35244.155507497712788 (code B ref 35244); Fri, 12 Apr 2019 13:17:03 +0000 Received: (at 35244) by debbugs.gnu.org; 12 Apr 2019 13:16:17 +0000 Received: from localhost ([127.0.0.1]:55625 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hEw2Q-0003Jy-T7 for submit@debbugs.gnu.org; Fri, 12 Apr 2019 09:16:15 -0400 Received: from mail-wr1-f54.google.com ([209.85.221.54]:39598) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hEw2L-0003JA-83 for 35244@debbugs.gnu.org; Fri, 12 Apr 2019 09:16:12 -0400 Received: by mail-wr1-f54.google.com with SMTP id j9so11916432wrn.6 for <35244@debbugs.gnu.org>; Fri, 12 Apr 2019 06:16:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Qev/i/e3Ck90jGWsFFru/WOFtE5ErVTPTWqOcqPMMkg=; b=oEnbpaOhFFGxK/FgvR3L2ff51BDEM/NqeH+hiilRgWhQWpHNfYZDWdRp8lWYhiUuyr xcXt2h1+4we07HkGZeqgin7KlBx5JbPKXOKwFT+Jga0I6C4tp9WPedsUFx0UDd5tnLCi jr33ID9NIRLUvEi7B4w1xauKgfFKLZKTjCyUS2KHaGEcRL32sOdEa0W/jM0qedbbFTPK OSl87G8fUNSHUl3e5KE8j4ymuGYnVfhPNIVc4GCem3QzwXc+zpfvhRi1klcwqWISsbJU cT3p9mR55UZW6j7lX7GhBGUrTrd45tZQB/8sOXVR8jCkKZUBO0jdAlZ1MhE9w9FTmgGF U7rg== 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=Qev/i/e3Ck90jGWsFFru/WOFtE5ErVTPTWqOcqPMMkg=; b=rQr27ZVI0CVIAkQjjlz3bm1M4XMmIPWNyGktHbeCfi8iH2q8lh3WfWMTQb5OufQKYN 4Z/FmkCPYasn1T+ID7d894GEhjZkgEreTM6Fy7oW0kOMqEmvqpKhdkxMNDiWMumA54+F oU3GcsPxuoR1Xxi3z029PpSDkyBGYlF5npwMUvc1w7IpzzLoRPwdWu56fznIodWOr858 bT/oOpD07kJteSkvcGOuKKkYd3Q83kpqOeOjNoe9fkcLNB1FxUGOt7T+SrqzvIwam0ZC JhzhIqbtL6EfDv553wqkZsLf0QLmtGpNPqw8JxmvHgKbStDwfsNW0ULKny6c4XQq+Xc1 tyTw== X-Gm-Message-State: APjAAAVa/gwds0nUxqOi7A5/8vvoBWKOj8MguZiRVyxY7cuQo9Zbl0eF m/4aMjBrjXtiIpW3Df3MqxhTMVfL X-Google-Smtp-Source: APXvYqw2ZJDTfL9Ef+MDte+HpZXvI+Z+mD+cnZ+cX0Zv3WfG9rLMXL6YK/3HtmsJxE00p0mbtXTALg== X-Received: by 2002:a5d:6646:: with SMTP id f6mr13325690wrw.68.1555074963154; Fri, 12 Apr 2019 06:16:03 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id d4sm35932882wrv.42.2019.04.12.06.16.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Apr 2019 06:16:02 -0700 (PDT) From: Mathieu Othacehe Date: Fri, 12 Apr 2019 15:15:52 +0200 Message-Id: <20190412131556.25282-2-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190412131556.25282-1-m.othacehe@gmail.com> References: <20190412131556.25282-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-Mailman-Approved-At: Fri, 12 Apr 2019 09:25:07 -0400 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 an input. --- gnu/packages/groff.scm | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/gnu/packages/groff.scm b/gnu/packages/groff.scm index cf392f5468..6f01395691 100644 --- a/gnu/packages/groff.scm +++ b/gnu/packages/groff.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2014 Mark H Weaver ;;; Copyright © 2016 Ricardo Wurmus ;;; Copyright © 2017 Ludovic Courtès +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -53,6 +54,7 @@ ;; own HTML doc, nor does it change its capabilities, so we removed netpbm ;; from 'inputs'. + (self-native-input? #t) (inputs `(("ghostscript" ,ghostscript))) (native-inputs `(("bison" ,bison) ("perl" ,perl) @@ -65,7 +67,31 @@ (add-after 'unpack 'setenv (lambda _ (setenv "GS_GENERATE_UUIDS" "0") - #t))))) + #t)) + (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 @@ -86,7 +112,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 Fri Apr 12 13:15: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: 3271 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 E034616E5D; Fri, 12 Apr 2019 14:25: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=ham 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 BA9A716E5B for ; Fri, 12 Apr 2019 14:25:10 +0100 (BST) Received: from localhost ([127.0.0.1]:37253 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEwB3-0004PV-3n for patchwork@mira.cbaines.net; Fri, 12 Apr 2019 09:25:09 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57779) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEw3Q-000207-90 for guix-patches@gnu.org; Fri, 12 Apr 2019 09:17:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEw3M-00058t-B2 for guix-patches@gnu.org; Fri, 12 Apr 2019 09:17:16 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42093) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hEw3F-00053G-IF for guix-patches@gnu.org; Fri, 12 Apr 2019 09:17:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hEw3F-0003Mc-CU for guix-patches@gnu.org; Fri, 12 Apr 2019 09:17:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35244] [PATCH 3/6] gnu: glibc-utf8-locales: Always use native package. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 12 Apr 2019 13:17:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35244 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35244@debbugs.gnu.org Received: via spool by 35244-submit@debbugs.gnu.org id=B35244.155507498612829 (code B ref 35244); Fri, 12 Apr 2019 13:17:05 +0000 Received: (at 35244) by debbugs.gnu.org; 12 Apr 2019 13:16:26 +0000 Received: from localhost ([127.0.0.1]:55631 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hEw2Y-0003Ke-P4 for submit@debbugs.gnu.org; Fri, 12 Apr 2019 09:16:26 -0400 Received: from mail-wm1-f53.google.com ([209.85.128.53]:36115) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hEw2M-0003JD-3N for 35244@debbugs.gnu.org; Fri, 12 Apr 2019 09:16:15 -0400 Received: by mail-wm1-f53.google.com with SMTP id h18so10996837wml.1 for <35244@debbugs.gnu.org>; Fri, 12 Apr 2019 06:16:10 -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=1l19LfrN4LoFQJPK2/aWVF5HNucP7ayb/09Mx0r9Gao=; b=sqSncxvFch9fQjNST44geYbloRCpZhg6NgW09tha9nBrd4UHIIORpaPQJtyzS1bLHr Z2r+L6N6mEvI63uwYPuTB7C+M2yDGYPUUnTwQinZUfvkMQ2RqD4TmWqz72pDrGPNO8Bo vkjK4lRTQzooeMe20anvscuTDy0m/jXa3BSelq8VZeXewxRjwGM8Y0BJV3gg/Bg49kYE W3hlRpAv+YhpF8i/2EuqsCpR1wiDQM1ug3hZJ/a9qGYNFkCOoq74R4KFAEs9XKW+nTj2 EDmv78r35QD7STCyJpdnViomPW+govBYaKWQl83yBB38o4U4w/n3x9grMQN6jYW2vIY9 mt4g== 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=1l19LfrN4LoFQJPK2/aWVF5HNucP7ayb/09Mx0r9Gao=; b=LmBVtoej6c1L9K/yzYUORPkrp1EKGEbR95al+YXuEnZUY68TPPf/DP591BzZrcku+Q V/aLXPciruend2wiwhwR1rV1kRXGxRcXReQo4kYl4SnzqU8WgpqgiK2597p5DwAkqqUX kR0LEZiRJXjyEgOgXR71mgMtTVDn7lp5z5lYeqppzZG1iHixORg1G4o1u+x7nnLfQv45 wX5m4AlhxJZ2JHYaPhceZbO5MYDfI3bbVoV5xw3np8x7DWsS/F7VRhzIS47IUlOQWJCF JAL5rl3BnT/GGV9LEO+By8Ev6A5SL03MZAcgzszqy8gjXsyH+Eweo0mMbpqHpWHMarhv lOew== X-Gm-Message-State: APjAAAXVq+pCGSRZm7ZmBBT1QZWQtRmTmccjtrWDcxgFlqdoWvmvjj6L 63cWxch0j3rNYc/vnVGv/j2EY+IO X-Google-Smtp-Source: APXvYqz5317vF20qF75LZeo7qj6byvb97j9nKwYnhxuOPS+oSL3WETdWifJv9C0UeJij7s338plcRQ== X-Received: by 2002:a1c:6c04:: with SMTP id h4mr11238372wmc.135.1555074964296; Fri, 12 Apr 2019 06:16:04 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id d4sm35932882wrv.42.2019.04.12.06.16.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Apr 2019 06:16:03 -0700 (PDT) From: Mathieu Othacehe Date: Fri, 12 Apr 2019 15:15:53 +0200 Message-Id: <20190412131556.25282-3-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190412131556.25282-1-m.othacehe@gmail.com> References: <20190412131556.25282-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-Mailman-Approved-At: Fri, 12 Apr 2019 09:25:07 -0400 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/installer.scm (build-compiled-file): Use native glibc-utf8-locales. * gnu/services/base.scm (guix-shepherd-service): Ditto, (guix-publish-shepherd-service): ditto. * guix/profiles.scm (profile-derivation): Ditto. * guix/self.scm (guix-command): Ditto. * gnu/packages/package-management.scm (guix)[inputs]: Move glibc-utf8-locales from here ..., [native-inputs]: ... to here, [phases]: search for glibc-utf8-locales in native-inputs and inputs in 'wrap-program phase. --- gnu/installer.scm | 4 ++-- gnu/packages/package-management.scm | 16 ++++++++++------ gnu/services/base.scm | 6 +++--- guix/profiles.scm | 3 ++- guix/self.scm | 3 ++- 5 files changed, 19 insertions(+), 13 deletions(-) diff --git a/gnu/installer.scm b/gnu/installer.scm index 50e2e7d85e..bbf2441061 100644 --- a/gnu/installer.scm +++ b/gnu/installer.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2018 Mathieu Othacehe +;;; Copyright © 2018, 2019 Mathieu Othacehe ;;; Copyright © 2019 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. @@ -62,7 +62,7 @@ version of this file." (define set-utf8-locale #~(begin (setenv "LOCPATH" - #$(file-append glibc-utf8-locales "/lib/locale/" + #+(file-append glibc-utf8-locales "/lib/locale/" (version-major+minor (package-version glibc-utf8-locales)))) (setlocale LC_ALL "en_US.utf8"))) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 4808687227..6720cac783 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2018 Eric Bavier ;;; Copyright © 2019 Efraim Flashner ;;; Copyright © 2019 Vagrant Cascadian +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -217,7 +218,10 @@ (setenv "SHELL" (which "sh")) #t)) (add-after 'install 'wrap-program - (lambda* (#:key inputs outputs #:allow-other-keys) + (lambda* (#:key + inputs native-inputs + outputs + #:allow-other-keys) ;; Make sure the 'guix' command finds GnuTLS, ;; Guile-JSON, and Guile-Git automatically. (let* ((out (assoc-ref outputs "out")) @@ -230,7 +234,8 @@ "guile-bytestructures")) (ssh (assoc-ref inputs "guile-ssh")) (gnutls (assoc-ref inputs "gnutls")) - (locales (assoc-ref inputs "glibc-utf8-locales")) + (locales (assoc-ref (or native-inputs inputs) + "glibc-utf8-locales")) (deps (list gcrypt json sqlite gnutls git bs ssh)) (effective @@ -258,7 +263,8 @@ `("GUIX_LOCPATH" ":" suffix (,locpath))) #t)))))) - (native-inputs `(("pkg-config" ,pkg-config) + (native-inputs `(("glibc-utf8-locales" ,glibc-utf8-locales) + ("pkg-config" ,pkg-config) ;; XXX: Keep the development inputs here even though ;; they're unnecessary, just so that 'guix environment @@ -288,9 +294,7 @@ ,@(if (and (not (%current-target-system)) (string=? (%current-system) "x86_64-linux")) `(("boot-guile/i686" ,(bootstrap-guile-origin "i686-linux"))) - '()) - - ("glibc-utf8-locales" ,glibc-utf8-locales))) + '()))) (propagated-inputs `(("gnutls" ,gnutls) ("guile-gcrypt" ,guile-gcrypt) diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 65f7ff29c8..760d65e5ca 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016, 2017 Leo Famulari ;;; Copyright © 2016 David Craven ;;; Copyright © 2016 Ricardo Wurmus -;;; Copyright © 2018 Mathieu Othacehe +;;; Copyright © 2018, 2019 Mathieu Othacehe ;;; Copyright © 2019 Efraim Flashner ;;; ;;; This file is part of GNU Guix. @@ -1638,7 +1638,7 @@ archive' public keys, with GUIX." ;; file names such as 'nss-certs'. See ;; . (string-append "GUIX_LOCPATH=" - #$glibc-utf8-locales "/lib/locale") + #+glibc-utf8-locales "/lib/locale") "LC_ALL=en_US.utf8") #:log-file #$log-file)) @@ -1774,7 +1774,7 @@ archive' public keys, with GUIX." ;; as 'nss-certs'. See . #:environment-variables (list (string-append "GUIX_LOCPATH=" - #$glibc-utf8-locales "/lib/locale") + #+glibc-utf8-locales "/lib/locale") "LC_ALL=en_US.utf8"))) (stop #~(make-kill-destructor))))))) diff --git a/guix/profiles.scm b/guix/profiles.scm index dfc9ba1ca0..252910d0e5 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2016 Chris Marusich ;;; Copyright © 2017 Huang Ying ;;; Copyright © 2017 Maxim Cournoyer +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -1477,7 +1478,7 @@ are cross-built for TARGET." ;; install a UTF-8 locale. #~(begin (setenv "LOCPATH" - #$(file-append glibc-utf8-locales "/lib/locale/" + #+(file-append glibc-utf8-locales "/lib/locale/" (version-major+minor (package-version glibc-utf8-locales)))) (setlocale LC_ALL "en_US.utf8"))) diff --git a/guix/self.scm b/guix/self.scm index 7ba2764eb9..dc0aba8987 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -421,7 +422,7 @@ load path." (string-append (if locpath (string-append locpath ":") "") - #$(file-append glibc-utf8-locales + #+(file-append glibc-utf8-locales "/lib/locale")))) (let ((guix-main (module-ref (resolve-interface '(guix ui)) From patchwork Fri Apr 12 13:15:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 3273 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 EC88F16E5C; Fri, 12 Apr 2019 14:25: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=ham 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 9D54A16DEE for ; Fri, 12 Apr 2019 14:25:26 +0100 (BST) Received: from localhost ([127.0.0.1]:37277 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEwBK-0004eO-5A for patchwork@mira.cbaines.net; Fri, 12 Apr 2019 09:25:26 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57755) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEw3P-000205-J5 for guix-patches@gnu.org; Fri, 12 Apr 2019 09:17:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEw3L-00057S-EM for guix-patches@gnu.org; Fri, 12 Apr 2019 09:17:15 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42092) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hEw3F-000537-2Z for guix-patches@gnu.org; Fri, 12 Apr 2019 09:17:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hEw3E-0003MV-U3 for guix-patches@gnu.org; Fri, 12 Apr 2019 09:17:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35244] [PATCH 4/6] gnu: firmware: Fix cross compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 12 Apr 2019 13:17:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35244 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35244@debbugs.gnu.org Received: via spool by 35244-submit@debbugs.gnu.org id=B35244.155507498212815 (code B ref 35244); Fri, 12 Apr 2019 13:17:04 +0000 Received: (at 35244) by debbugs.gnu.org; 12 Apr 2019 13:16:22 +0000 Received: from localhost ([127.0.0.1]:55629 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hEw2V-0003KW-0O for submit@debbugs.gnu.org; Fri, 12 Apr 2019 09:16:22 -0400 Received: from mail-wm1-f52.google.com ([209.85.128.52]:39111) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hEw2N-0003JF-Bg for 35244@debbugs.gnu.org; Fri, 12 Apr 2019 09:16:14 -0400 Received: by mail-wm1-f52.google.com with SMTP id n25so10983437wmk.4 for <35244@debbugs.gnu.org>; Fri, 12 Apr 2019 06:16: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=DEc2rAlEd9pbl5JJmSS9luN7s9avQp4WjCnnYbizeb4=; b=op5YBB+CAWFzNDSpJAKdYHDTSUmKUYsoUwY1yN+6ywkutvxhlzavy33n4tzJ36A/DW q3kKeBnyo4J6/vkbP5NqZCb8aMdrh3QBTYzwXQyS0C51zdEAoeRfV+m+XMHDvzy29vX0 7OC1C94Drii8j9XjrzFfTjY7byCk+hbAwbcnr7ZMFDnt0mL7RRtj16nX8sRdFRtUz4r5 PSC09bynR4QAmm4SY9oEtACKu5EwxletI40Hv4XlQMSwoKge5OcAuT8ODR86FFFU2Tbo NiS7HbXxvsYhhMV9LoE3JaKSwRz6lTwUUCO+3vrcb/CIsjAzOh8D5tHSlOzbLlxK/6TM 4a+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:mime-version:content-transfer-encoding; bh=DEc2rAlEd9pbl5JJmSS9luN7s9avQp4WjCnnYbizeb4=; b=sZB6rek/kGmp7m/NlY5sJen9fV3AHWLEGpEGEN7W9NpcfLlzstlfAAc/q6cqie7OvC J7LqrWVYeyupLO+eSKPTazQOWxZbzVCw0qGhdt/lWU9HIE+GjUJkOAIEPcUR4+O2OYtf r4Kwc8Vpm3gEzIKKGjlLcq18t0m5IW4y8Wqrg4bIblBk9uPtEOO0NrPqx39a+krwr24B hpVGm2Ic7XZpNbZx1Q9D5tnkTHx3kJPWQcyOKzXpw1u5DMVoVBwl/SK9t2eswfeVP6Y1 U6kJbfO1lBFFaVRv5AiTgu8RE3PwFgeqESUF5AyTAz3hPOpt4hw30L6WYjI7TkmdBwzq oDgA== X-Gm-Message-State: APjAAAV0yOjRFqM7W7xI7Kz95EyFktnnnkj8zzKUNcIRSzMubLv3lZ4J ZfW5K8/NQI6nQi/64dn9PiWissC3 X-Google-Smtp-Source: APXvYqyI1vo1gi3cAZ1OwaxGNhtyATYULUGhdvNpQ31EQO8Ci0pnOYMmsOhTR9wghmJZhBeMdyP2Vw== X-Received: by 2002:a1c:a64d:: with SMTP id p74mr11694389wme.89.1555074965357; Fri, 12 Apr 2019 06:16:05 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id d4sm35932882wrv.42.2019.04.12.06.16.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Apr 2019 06:16:04 -0700 (PDT) From: Mathieu Othacehe Date: Fri, 12 Apr 2019 15:15:54 +0200 Message-Id: <20190412131556.25282-4-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190412131556.25282-1-m.othacehe@gmail.com> References: <20190412131556.25282-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-Mailman-Approved-At: Fri, 12 Apr 2019 09:25:07 -0400 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 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 4df4b22843..68476ed826 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 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 native-inputs "cross-gcc") "\n"))) #t)) (replace 'install From patchwork Fri Apr 12 13:15: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: 3276 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 0842616E5C; Fri, 12 Apr 2019 14:26: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=ham 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 93FD616DEE for ; Fri, 12 Apr 2019 14:26:26 +0100 (BST) Received: from localhost ([127.0.0.1]:37305 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEwCI-0005Ul-5O for patchwork@mira.cbaines.net; Fri, 12 Apr 2019 09:26:26 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57746) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEw3P-000201-Ev for guix-patches@gnu.org; Fri, 12 Apr 2019 09:17:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEw3L-00057M-EA for guix-patches@gnu.org; Fri, 12 Apr 2019 09:17:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42091) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hEw3E-00052u-JZ for guix-patches@gnu.org; Fri, 12 Apr 2019 09:17:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hEw3E-0003MN-E5 for guix-patches@gnu.org; Fri, 12 Apr 2019 09:17:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35244] [PATCH 5/6] linux-initrd: Fix cross compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 12 Apr 2019 13:17:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35244 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35244@debbugs.gnu.org Received: via spool by 35244-submit@debbugs.gnu.org id=B35244.155507497912802 (code B ref 35244); Fri, 12 Apr 2019 13:17:04 +0000 Received: (at 35244) by debbugs.gnu.org; 12 Apr 2019 13:16:19 +0000 Received: from localhost ([127.0.0.1]:55627 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hEw2T-0003KD-2G for submit@debbugs.gnu.org; Fri, 12 Apr 2019 09:16:18 -0400 Received: from mail-wm1-f48.google.com ([209.85.128.48]:53072) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hEw2O-0003JJ-Fx for 35244@debbugs.gnu.org; Fri, 12 Apr 2019 09:16:13 -0400 Received: by mail-wm1-f48.google.com with SMTP id a184so11202839wma.2 for <35244@debbugs.gnu.org>; Fri, 12 Apr 2019 06:16: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 :mime-version:content-transfer-encoding; bh=tY7JsMUT2twM0z4e6sQsusf8r5hedkxppnh4WWh3EOM=; b=uBUwccW2fAg6wZjeucIuVAGqmTvhCM99PhgAqo32jmKG5XRodqeRUllCHwPzPGJUXx cuLHgctRZ3zkTyrep1G7f37jZgOS7Ob5gWcKXq7qIivwn/xIS37MJubpo497K2zn8rDk Vx50rpyuopfbey3S1QzOS8/l6cpfxw6jINdk7xbfHsb1mudb1snzMLV0EPdFhwnTZ06y cnQIIbphM0LspYgELBQC6p7WMA8N8snxKZmk2dPOhs2rzrCX3RQd6xngFXB1iZNt3at9 MqIFJwVUebiLamj06nQQQUANX64oRDT3rgD46KLvV2ZlMmhu7u53nOVVhzVtcsgTjX4R /MCg== 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=tY7JsMUT2twM0z4e6sQsusf8r5hedkxppnh4WWh3EOM=; b=gTdyzvjDiqLDYX3wjcYCOR1aF90cxiAEg3wUTEJxhagJUhmfgMf7bIgmRBitHDE73e qLJ+UOMbQ5cN40HiiJSFWLsgKnhbDupYJCSYUziNdgxIviRPWQ5YcdTMDIW0/OypCR5P Pqr4qsANVq2wUHbd8aM/eGW/bdgJD4kf65xIJ+K2qQD7TpLFY3hmGapQx/cjKKZp7hm4 ka2eLLGK6QHLzrprZFwx3cRfh3tekXNkXeePIav3Wpor2FEXjvBXJCJ4gZtFokzha41A FkvL9a44NdG82u1XBw3yiXDGgCVGNGEkxxYNnDWu0KqYByyAcco9zUKGcgiZKuiEb3vd N1bA== X-Gm-Message-State: APjAAAVXZhk1gfNL4Q/vo0gcCCL9ZKytBHLAtZ6VBKimDOjRmDbSFtXN 3B8hXSCmK3jCzkdBCntu+59Xh4BP X-Google-Smtp-Source: APXvYqzj+eaeKy0bDd19tQhC0wL/IVPOZEe9YfyyqGsfNh+wQcSz5Rv3ov/NHdZhmeV6nx2WHAg0cw== X-Received: by 2002:a1c:a9d4:: with SMTP id s203mr10654019wme.117.1555074966581; Fri, 12 Apr 2019 06:16:06 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id d4sm35932882wrv.42.2019.04.12.06.16.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Apr 2019 06:16:05 -0700 (PDT) From: Mathieu Othacehe Date: Fri, 12 Apr 2019 15:15:55 +0200 Message-Id: <20190412131556.25282-5-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190412131556.25282-1-m.othacehe@gmail.com> References: <20190412131556.25282-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-Mailman-Approved-At: Fri, 12 Apr 2019 09:25:07 -0400 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 (default-initrd-modules): Check system name against %current-target-system first in case we are cross-compiling. --- gnu/system/linux-initrd.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm index 656afd1ddb..c90b87c023 100644 --- a/gnu/system/linux-initrd.scm +++ b/gnu/system/linux-initrd.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2016 Mark H Weaver ;;; Copyright © 2016 Jan Nieuwenhuizen -;;; Copyright © 2017 Mathieu Othacehe +;;; Copyright © 2017, 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -273,7 +273,10 @@ FILE-SYSTEMS." (append-map (compose file-system-type-modules file-system-type) file-systems)) -(define* (default-initrd-modules #:optional (system (%current-system))) +(define* (default-initrd-modules + #:optional + (system (or (%current-target-system) + (%current-system)))) "Return the list of modules included in the initrd by default." (define virtio-modules ;; Modules for Linux para-virtualized devices, for use in QEMU guests. From patchwork Fri Apr 12 13:15: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: 3274 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 158BB16E5C; Fri, 12 Apr 2019 14:25: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=ham 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 8B26E16DEE for ; Fri, 12 Apr 2019 14:25:35 +0100 (BST) Received: from localhost ([127.0.0.1]:37279 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEwBT-0004pw-3F for patchwork@mira.cbaines.net; Fri, 12 Apr 2019 09:25:35 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57788) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEw3Q-000208-Br for guix-patches@gnu.org; Fri, 12 Apr 2019 09:17:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEw3M-000597-Og for guix-patches@gnu.org; Fri, 12 Apr 2019 09:17:16 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42094) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hEw3G-00053P-1O for guix-patches@gnu.org; Fri, 12 Apr 2019 09:17:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hEw3F-0003Mk-SI for guix-patches@gnu.org; Fri, 12 Apr 2019 09:17:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35244] [PATCH 6/6] gnu: python: Fix cross compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 12 Apr 2019 13:17:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35244 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35244@debbugs.gnu.org Received: via spool by 35244-submit@debbugs.gnu.org id=B35244.155507498712835 (code B ref 35244); Fri, 12 Apr 2019 13:17:05 +0000 Received: (at 35244) by debbugs.gnu.org; 12 Apr 2019 13:16:27 +0000 Received: from localhost ([127.0.0.1]:55633 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hEw2c-0003Ks-MZ for submit@debbugs.gnu.org; Fri, 12 Apr 2019 09:16:27 -0400 Received: from mail-wr1-f44.google.com ([209.85.221.44]:33685) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hEw2P-0003JP-Kf for 35244@debbugs.gnu.org; Fri, 12 Apr 2019 09:16:17 -0400 Received: by mail-wr1-f44.google.com with SMTP id q1so11954942wrp.0 for <35244@debbugs.gnu.org>; Fri, 12 Apr 2019 06:16: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=/B/lUy/YsdEySqztggbh917WkL56txfDwBa4dmcxhCM=; b=kfWukoL8VXR/nHQmxSasphD+vFPtRvx4OEEjbt/80gCqGC4NUXf4pAjp/ObaC9gxZ3 MtRqsYtI6UHzjd0zfgMziO3bl+676482Cqg1eooERzXnYTEj12CLUfmtAtcy5zz2z4ec YkKtZHPtagafhSqc7/u9VtfPiVSrS2hp5nlxWiU0jwy2ShLmERMx5HEQq+P0WwDzOPTF NrM3tPyefmnv861fVlzFmBhRrjOIzfzbty0XdmSYfFhLY88uk5WpM6ynzSkZAzxWLpn2 /0GGnHWG8q0nUYNvH4tn1Mn1GZw5pL7iPc7kIixs29HsdupPBJJUfLLKPnM2lRvfcbXl 2c0w== 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=/B/lUy/YsdEySqztggbh917WkL56txfDwBa4dmcxhCM=; b=pcQHjVm2zbjNuh3xG3TXjP7QKs7NKThh9tIxb/9xJnjju9Wr58auUrXSviE5dAB3Km 6Nm6357LxyCnP8tna2sKj7t0urCSUsYEa92469sZGX6NZyx6pikmFqbtsLERnKIhxYBd /VJV4pPaFJG2ViwyEzUmGjcqGz0ELRJOLWM3SfJXlluL5AWrjHthqEC81/piA39KbPLT zGl1noRpmHdFO9EzdQtA59SSbRj5eCKZQlYStmeKlr+6qrcC8oIWcSXg3cNohiPoSrW2 sSTVNYCxyxg09j0MvS9N4lMFuUVeNGYeGo+1DmIsLsXAdQf8jsVAajQWbqJS71PVEGqO JtGQ== X-Gm-Message-State: APjAAAVqCqpJ3JxYyjNSozQQx11iNgYBnEuL2aeDEUF4RyxS8ukg04KS FR0mj07ADLpBh+iSbVFlFwkuZsEQ X-Google-Smtp-Source: APXvYqxO+rvbawMtHEcwv577XKjeGV0Mny/Iucbl07w/+btrFojO3RGwHRal32NdrzWHnXS6y7i9Cw== X-Received: by 2002:adf:db0c:: with SMTP id s12mr35913572wri.184.1555074967665; Fri, 12 Apr 2019 06:16:07 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id d4sm35932882wrv.42.2019.04.12.06.16.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Apr 2019 06:16:06 -0700 (PDT) From: Mathieu Othacehe Date: Fri, 12 Apr 2019 15:15:56 +0200 Message-Id: <20190412131556.25282-6-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190412131556.25282-1-m.othacehe@gmail.com> References: <20190412131556.25282-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-Mailman-Approved-At: Fri, 12 Apr 2019 09:25:07 -0400 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 --- gnu/packages/python.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 57ced499cb..e3a484f5cd 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 @@ -134,6 +134,9 @@ "--with-system-ffi" ;build ctypes "--with-ensurepip=install" ;install pip and setuptools "--enable-unicode=ucs4" + ;; Disable runtime check failing if cross-compiling, see: + ;; https://lists.yoctoproject.org/pipermail/poky/2013-June/008997.html + "ac_cv_buggy_getaddrinfo=no" (string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out") "/lib"))