From patchwork Wed Oct 2 09:58: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: 15556 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 7EFAF1749F; Wed, 2 Oct 2019 11:00: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 2A07E1749D for ; Wed, 2 Oct 2019 11:00:24 +0100 (BST) Received: from localhost ([::1]:53124 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFbQk-0003ir-0Z for patchwork@mira.cbaines.net; Wed, 02 Oct 2019 06:00:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50982) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFbQV-0003hl-HQ for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iFbQU-0008So-AO for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54911) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iFbQU-0008Sk-6n for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iFbQU-0000Xo-0F for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v4 01/23] gnu: openssl: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 02 Oct 2019 10:00: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 Cc: Mathieu Othacehe Received: via spool by 36477-submit@debbugs.gnu.org id=B36477.15700103681736 (code B ref 36477); Wed, 02 Oct 2019 10:00:05 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Oct 2019 09:59:28 +0000 Received: from localhost ([127.0.0.1]:35434 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFbPs-0000Rv-3J for submit@debbugs.gnu.org; Wed, 02 Oct 2019 05:59:28 -0400 Received: from mail-wr1-f54.google.com ([209.85.221.54]:36217) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFbPp-0000RK-Nu for 36477@debbugs.gnu.org; Wed, 02 Oct 2019 05:59:26 -0400 Received: by mail-wr1-f54.google.com with SMTP id y19so18915118wrd.3 for <36477@debbugs.gnu.org>; Wed, 02 Oct 2019 02:59:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eNEcqbvCnwl3+DTASpixa1L+oCaYc/dkJ5rb6f0iszo=; b=JaVFgn6KTjSn5mWfLzTHGTInD+MIkcTmv2InJCMgELxxo1anWYTj+zBw53+xbWKSLd aPPlwiAr1Z7cvvmYBasS2FYkgomLy6171NkEcG62FHx1P/wbsLEi1NdO3pc0X2CEQyqD A7bpwB5V8/MQQ6HJH5OHbxUHQC0YBNqG5JDZsr94pS5+KheEa5ds5rOdecpJNwfCmCPC nHTVVpKDedAnrOPMO4KGob6fXZhRYZiBXKKIGiHgQVCeNarFqyokx5pibAbQTXexM/rD jRwSx/I1BIWtE+6bRVcsjaSxWOK5KTm2+sCULXKCaPl63UsgYeoT2ok9Fi/lSDNzr0A2 +WEA== 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=eNEcqbvCnwl3+DTASpixa1L+oCaYc/dkJ5rb6f0iszo=; b=ULy5e0MaXNQ1m4sxnzPLq4V8tHcUcTgfPXcnT6IE6iBxfiU+QTEizL0fL7GMlkKetx tXr+oP7v568auZaCxe4UN7OHbSyVaag2L42VMZpmwKd6EQTTVdDqjsNpQjEhxz+EZaaN PzQKdfUrlkFXyzTs6yYnKm8niviTPA/also4Bri2TJpf2MSzNsdenMFU/T3ujFP6XG2p i/4jXHISngSWuUgEWPVYmTFZg16QReTEfewRcaa97Q78hYP8bPOjMmvuYF166fSidXM+ gg+C2b8n0JpxFro4cUTh2roBZPlaXS2j1sggEwPDVPnYt0hNTLlwtw+O2TcUEnFcMN9V 9ltw== X-Gm-Message-State: APjAAAV0ZkqW5MXnex8XSQ9TET3C2gZ1HVDJKzlad5GbxMMJ0N5PutvI aKpJRacYQ+6oE0R8zdL5cIjCeibO X-Google-Smtp-Source: APXvYqzrC0iKPusURck6psfoJyuro7GKP4vNupvY2LEeVVo8AEsw2JbdRUabv07Bz5nWa6lGT8IpNA== X-Received: by 2002:a5d:4c92:: with SMTP id z18mr1900848wrs.111.1570010359718; Wed, 02 Oct 2019 02:59:19 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:fa:a50:21e:67ff:fe5b:4283]) by smtp.gmail.com with ESMTPSA id w12sm29621318wrg.47.2019.10.02.02.59.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Oct 2019 02:59:18 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 2 Oct 2019 11:58:42 +0200 Message-Id: <20191002095904.6325-2-m.othacehe@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191002095904.6325-1-m.othacehe@gmail.com> References: <20191002095904.6325-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: , 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 6689375da6..8797429dcf 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. ;;; @@ -301,6 +302,23 @@ required structures.") #:disallowed-references ,(list (canonical-package perl)) #:phases (modify-phases %standard-phases + ,@(if (%current-target-system) + '((add-before + 'configure 'set-cross-compile + (lambda* (#:key target outputs #:allow-other-keys) + (setenv "CROSS_COMPILE" (string-append target "-")) + (setenv "CONFIGURE_TARGET_ARCH" + (cond + ((string-prefix? "i686" target) + "linux-x86") + ((string-prefix? "x86_64" target) + "linux-x86_64") + ((string-prefix? "arm" target) + "linux-armv4") + ((string-prefix? "aarch64" target) + "linux-aarch64"))) + #t))) + '()) (replace 'configure (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -310,7 +328,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" @@ -321,7 +341,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. @@ -435,21 +458,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 Oct 2 09:58: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: 15560 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 709091749F; Wed, 2 Oct 2019 11:01: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 0A1F21749D for ; Wed, 2 Oct 2019 11:01:03 +0100 (BST) Received: from localhost ([::1]:53140 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFbRN-00046w-Av for patchwork@mira.cbaines.net; Wed, 02 Oct 2019 06:01:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50995) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFbQW-0003hv-BR for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iFbQV-0008TM-8L for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54912) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iFbQV-0008TH-54 for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iFbQV-0000Y8-3y for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v4 02/23] gnu: cmake: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 02 Oct 2019 10:00: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 Cc: Mathieu Othacehe Received: via spool by 36477-submit@debbugs.gnu.org id=B36477.15700103691750 (code B ref 36477); Wed, 02 Oct 2019 10:00:07 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Oct 2019 09:59:29 +0000 Received: from localhost ([127.0.0.1]:35437 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFbPt-0000S9-Fq for submit@debbugs.gnu.org; Wed, 02 Oct 2019 05:59:29 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:39976) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFbPr-0000RM-71 for 36477@debbugs.gnu.org; Wed, 02 Oct 2019 05:59:27 -0400 Received: by mail-wm1-f66.google.com with SMTP id b24so6250971wmj.5 for <36477@debbugs.gnu.org>; Wed, 02 Oct 2019 02:59: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=0/xKezzp3clIb0E78khCoupsd0kxknWZjL8IJ24f42k=; b=jKWU3/2o/Lcpu8T4NAaTFju/BkmBAMnvej1F70l9Qn3x8CzVTlJc6wq9b4wXHPXTgz qaaoHGc8/gzSQWub7Z+ByXMVS2AB6EkP0+fL01M3TcJI92GO4t1d0NqNhnE7c+WAyPFw xIFs9D1WTFkBy/GZv822U2f6szjBRBKqpBoO2Y5BjXg4Vtnh9JeQk/pfJgqPE6wnJ7xK MfdP82T3iua8AEUszilzBAswBnBy1qZJuWNT5Xwvde7nOp+i3sRyE+lY7/UJjNexQM7y DPf+6Mq5GEEinVMJbD1RUhPKNywLOf1aiHS8TqgMZEQzPmYWos+mGO2WAFXyW/XOcTOl u4Fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0/xKezzp3clIb0E78khCoupsd0kxknWZjL8IJ24f42k=; b=hlKITM0+fHYkZ1EwwnfXujMGPLA9PBlDyNgzGHugNl10fBfndwu5e49M2dfS9Vj8k1 L/ovEt9NUXtrW1HPxHg0/581Y6gNBpxPGXvi7XuZuOdyX0jB7ZhulEEgcx/0PADTG9/b dmNVWDmps1mYoPFcWobnqu/oEncBJa8jb1HlJ48KIPTmUJFLCyytXHPuA61O2dAAXn3r I8SaurClyAPI//NUIsrcyExjmsS2tbhNwrb8+qUjmfv2f3TCugsjsXBhcz5UiDsxGt2A Dz5TEq5gDYgTLeXQWRmFmEprLurg8DxpOzp8A3YeRDch/OaWH3fHqLTkpnK1qD5KVxZb f5Zg== X-Gm-Message-State: APjAAAXJNN92KV/4esjaT+VWQhEhnXBbG/7ZK01Lo0BuAFD9WGWXxHqr MWxX3s1y+jT6g3k0jmjy1b1CVZcB X-Google-Smtp-Source: APXvYqwsL7ffgg/T0V1dgYA+KDAtzN7DzpS25wOtH9JYe7I79zr4Mu/SIwXdo9K/kNZl0q6y9uxVzg== X-Received: by 2002:a1c:1f89:: with SMTP id f131mr2068291wmf.72.1570010360868; Wed, 02 Oct 2019 02:59:20 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:fa:a50:21e:67ff:fe5b:4283]) by smtp.gmail.com with ESMTPSA id w12sm29621318wrg.47.2019.10.02.02.59.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Oct 2019 02:59:19 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 2 Oct 2019 11:58:43 +0200 Message-Id: <20191002095904.6325-3-m.othacehe@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191002095904.6325-1-m.othacehe@gmail.com> References: <20191002095904.6325-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: , 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 64349be444..13252a9486 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -219,6 +219,14 @@ and workspaces that can be used in the compiler environment of your choice.") (append (search-patches "cmake-curl-certificates.patch") (origin-patches (package-source cmake)))))))) +(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 Oct 2 09:58: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: 15563 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 A3FE21749E; Wed, 2 Oct 2019 11:01:20 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID 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 5E3861749E for ; Wed, 2 Oct 2019 11:01:20 +0100 (BST) Received: from localhost ([::1]:53152 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFbRf-0004TN-1R for patchwork@mira.cbaines.net; Wed, 02 Oct 2019 06:01:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51006) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFbQW-0003i2-TW for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iFbQV-0008Tf-QL for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54913) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iFbQV-0008Tb-My for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iFbQV-0000YG-Mf for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v4 03/23] gnu: groff: Fix cross compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 02 Oct 2019 10:00: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 Cc: Mathieu Othacehe Received: via spool by 36477-submit@debbugs.gnu.org id=B36477.15700103721776 (code B ref 36477); Wed, 02 Oct 2019 10:00:07 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Oct 2019 09:59:32 +0000 Received: from localhost ([127.0.0.1]:35441 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFbPv-0000SU-ON for submit@debbugs.gnu.org; Wed, 02 Oct 2019 05:59:32 -0400 Received: from mail-wm1-f47.google.com ([209.85.128.47]:54629) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFbPr-0000RO-UT for 36477@debbugs.gnu.org; Wed, 02 Oct 2019 05:59:28 -0400 Received: by mail-wm1-f47.google.com with SMTP id p7so6485050wmp.4 for <36477@debbugs.gnu.org>; Wed, 02 Oct 2019 02:59: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=I2r7lgWbIpNroSEdP6SwJdKsGrlgbLjO8ONRgr2+d6U=; b=ZF0slDCb6rtLxzzbgPQ4774BdJQ06XyHtKCrGRO0P0U9nYBjuJ11oRh0G7q3V0idhC qKhgLvyMcmpn5+Uhg+ZtWiE8KJoKKvXAQaxPtpPv1AFckdSFBNAJ0IvZq8gan8+ScKz0 FfizVPL3hXhVeEs1Cu95XLoNrhmUyuWDRvzvoh88aOEEGcusa9Mx3bYS5d0svsGaRS4x my6wy9F0LibRqIJPfJoifPiiNEn403s3TNTnkwVYkEv/get3lcKLmbJ9RpsTgOBzMSi6 DmT+h+UjNF/8+E8ZUuuJ9xz5TIPlto4jriEgRwEOyoqLQlHqwOEs2aeNl4n9mzZXX2PL /2CA== 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=I2r7lgWbIpNroSEdP6SwJdKsGrlgbLjO8ONRgr2+d6U=; b=selIWkgk1KV4kvNFpvckHrsSMKjVIBGheFaJLrzv8qMHqv20CVQkDyJcHdfYW1FxIy zkg3iunr8j93CT609YdcK3cAKBSOLokCySXVb4XYWojsqbVzE4IBldEuCd3oUMdQ64Js Wm+Tb3cEuMxS9su5COU5ei/pB3wwUajrrItiKEu+PI202QoA00p3jc1lL4dl2QfkIcDz YjyUx0ictrtIjGQZFpu5oxRGLgnEn8U9FHh+gyGrlzoVOfg7C3wurZpLISwDVqOBChRq GR/6glxWzpCRlEhhAIkAEDWxisR7oNan7XpMuvEL2FXi56swOpAJVQLIaUmThkiOPOiK yQog== X-Gm-Message-State: APjAAAV3uloZY+UQtESAh6CIYA+zyN9uDofkcIc90MJD47Qj9p8wyAk8 X7NVNc6DdckG/Ht9XYCvuZH5Ywwl X-Google-Smtp-Source: APXvYqwSbhxXqV/2NKePq6LZ1Egj8rYhyR2A+9HWCDvgdc260K6waFwFFvFebX9Yk360J9QOCmaPgA== X-Received: by 2002:a1c:cfc9:: with SMTP id f192mr2047740wmg.85.1570010361911; Wed, 02 Oct 2019 02:59:21 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:fa:a50:21e:67ff:fe5b:4283]) by smtp.gmail.com with ESMTPSA id w12sm29621318wrg.47.2019.10.02.02.59.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Oct 2019 02:59:21 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 2 Oct 2019 11:58:44 +0200 Message-Id: <20191002095904.6325-4-m.othacehe@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191002095904.6325-1-m.othacehe@gmail.com> References: <20191002095904.6325-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: , 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)[native-inputs]: Add self, [arguments]: set GROFF_BIN_PATH and GROFFBIN variables when cross-compiling. (groff-minimal)[native-inputs]: Add groff. --- gnu/packages/groff.scm | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/gnu/packages/groff.scm b/gnu/packages/groff.scm index 98f17914bf..5fe353a901 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,12 +56,28 @@ ;; 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))) (arguments `(#:parallel-build? #f ; parallel build fails + ,@(if (%current-target-system) + `(#:make-flags + ;; In groff-minimal package, that inherits from this package, + ;; we'll need to locate "groff" instead of "self". + (let ((groff (or (assoc-ref %build-host-inputs "groff") + (assoc-ref %build-host-inputs "self")))) + (list + (string-append "GROFF_BIN_PATH=" groff) + (string-append "GROFFBIN=" groff "/bin/groff")))) + '()) #:phases (modify-phases %standard-phases (add-after 'unpack 'disable-relocatability @@ -115,7 +132,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 Oct 2 09:58:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15557 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 AF2C41749F; Wed, 2 Oct 2019 11:00:33 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 56FEE1749D for ; Wed, 2 Oct 2019 11:00:33 +0100 (BST) Received: from localhost ([::1]:53128 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFbQu-0003mY-An for patchwork@mira.cbaines.net; Wed, 02 Oct 2019 06:00:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51025) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFbQX-0003iq-OZ for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iFbQW-0008U7-E6 for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54914) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iFbQW-0008Tw-AV for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iFbQW-0000YO-9b for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v4 04/23] gnu: cyrus-sasl: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 02 Oct 2019 10:00: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 Cc: Mathieu Othacehe Received: via spool by 36477-submit@debbugs.gnu.org id=B36477.15700103761805 (code B ref 36477); Wed, 02 Oct 2019 10:00:08 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Oct 2019 09:59:36 +0000 Received: from localhost ([127.0.0.1]:35443 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFbPw-0000Sb-2t for submit@debbugs.gnu.org; Wed, 02 Oct 2019 05:59:35 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:33306) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFbPs-0000RQ-Up for 36477@debbugs.gnu.org; Wed, 02 Oct 2019 05:59:30 -0400 Received: by mail-wm1-f67.google.com with SMTP id r17so4541740wme.0 for <36477@debbugs.gnu.org>; Wed, 02 Oct 2019 02:59: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=nFkg0qIbp35QLLEDNk6u85RA07fXG5PqFPTPaj94Las=; b=DRAWiSSsX+M2oH1uL87wRUeIigAiaKPpVW3W3OhkqTC2JOJbH/+Mfk/+ELXZD6Hc7Z C7Kc5bE+ro5KgSxW3ayZgzy0zDf5wU7dzpnIRabww/RKxBh7XBcgaetsvyKz0w6YZAnD SsnWwy63pFApLy/6he0R9v/J9i0jkYguoyDYhTqfLAdd1ZmSjDiz6AoTQ8vwTbDXVALJ 9K0ttpuwKs1dVufylvpJrw6KMIyUV5GAl0IiU50c9Vd0+sX33uW6p9nCIrrgCI1LJjSa 8z/tykDAIw7YU+NvH9k3GAHPN6neTJFbVI1I3fNS5XKK7siw+XptPjD4qz+XAK4adbJy Nf8w== 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=nFkg0qIbp35QLLEDNk6u85RA07fXG5PqFPTPaj94Las=; b=TpXldJPEnUO0nce+UiHX54o7qV8Jsd99w+klGwqQAtYMwnRUENL2mKGsllInpHeEHW 5NMK1rD4ySGUaLTZcP/m1yAh0YKdFQeJkAx3aE1jvwO6a4kYr0ZfLjSks3UfuoBL/S/L 8JffhOa2XDUyM41+4cFADr2n1RQbpPCWZ4Rdlegkv/Gj4du6CJnnenIbbMvUxFwjhvMY dVJL5LIAATdtJ6c8YmsioY9Xg/wI4q0qj5AURfK973rFgBoZpEEsXqktcet5ygFBSbtc EFrSgg44SOQekCSkKf7myJ2d4/th/MDWN4R4GIgYpDNMoInFtpxgMMMToS+mO/gi4QxI PKfg== X-Gm-Message-State: APjAAAW6pG4a+HlbsugxW/ib7knUeYGR42PYnlcjBhXsZOhKitgUlhpY WpapQAOvNLctvRpwVc0bOrWktqbQ X-Google-Smtp-Source: APXvYqwJ9QHcHKbJGiC0bIZgn/x3mh0aS2fwSOePQRsUF23wRKJEaxfSTpxiQ1p56d+DYitd+mMiUw== X-Received: by 2002:a1c:bc46:: with SMTP id m67mr2192826wmf.126.1570010362915; Wed, 02 Oct 2019 02:59:22 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:fa:a50:21e:67ff:fe5b:4283]) by smtp.gmail.com with ESMTPSA id w12sm29621318wrg.47.2019.10.02.02.59.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Oct 2019 02:59:22 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 2 Oct 2019 11:58:45 +0200 Message-Id: <20191002095904.6325-5-m.othacehe@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191002095904.6325-1-m.othacehe@gmail.com> References: <20191002095904.6325-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: , 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 a1190af0db..3acb44e450 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -758,6 +758,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 Oct 2 09:58:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15561 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 B89171749F; Wed, 2 Oct 2019 11:01:07 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 6C0E51749D for ; Wed, 2 Oct 2019 11:01:07 +0100 (BST) Received: from localhost ([::1]:53142 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFbRS-0004G9-7z for patchwork@mira.cbaines.net; Wed, 02 Oct 2019 06:01:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51041) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFbQY-0003je-O3 for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iFbQX-0008Uc-76 for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54915) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iFbQX-0008UU-1y for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iFbQX-0000YV-1I for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v4 05/23] gnu: icu4c: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 02 Oct 2019 10:00: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 Cc: Mathieu Othacehe Received: via spool by 36477-submit@debbugs.gnu.org id=B36477.15700103761812 (code B ref 36477); Wed, 02 Oct 2019 10:00:08 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Oct 2019 09:59:36 +0000 Received: from localhost ([127.0.0.1]:35448 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFbPz-0000T4-Td for submit@debbugs.gnu.org; Wed, 02 Oct 2019 05:59:36 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:55505) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFbPt-0000RS-Vy for 36477@debbugs.gnu.org; Wed, 02 Oct 2019 05:59:31 -0400 Received: by mail-wm1-f68.google.com with SMTP id a6so6458586wma.5 for <36477@debbugs.gnu.org>; Wed, 02 Oct 2019 02:59: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=fjXVKqA00qO5p1WiysL/bCpKHq9ohnRt2tYJ3t6RNNY=; b=UL68+YJ+PMvkIGKdgXrtvRnsNvfWU07MMJNtgUlBkjMq8XXJa8piPV1lgPfJwSEVg/ nMeMLUDB8s23eTog4eQqJ7Z5TB5vsE2pRLsljl6skTR83QepkXj70gzTENxZcnyC31+F wKoDhm5Fzg+4dL+7LmfSEYWawFk6JePD5UjSHzZFJLhm+I4sC4ICyfSo/zKEqNRKGsN7 39o5k7lJMAkp8vwvPoxW/pp6EtNhuhuswKfAablYzaH9WTld0IcW3zNVewxbbByec67b 1mD7/x5GikhebqOHCRfMyNy+A+nXEQHeqZRQTq2BCUmhj22PHr2VjUM4sdPmSzIdBXpV n1mQ== 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=fjXVKqA00qO5p1WiysL/bCpKHq9ohnRt2tYJ3t6RNNY=; b=a5Kb30J+vfIgLzzpV3kiUPrUT7LQipQCjIs4cBqfnzNJ/YpMpWbHCbQt5jtgUD1fwO ezOxox9DFZo2J5KsJemhW4X5znSto7TNNK/dgT0MY/0HO6DoT3ejTQM77W/vRMv6cEL/ 8RpHV431D5aVaE9EOHz5oQKhoSZUuUD7qHAdT/xpywIF3rWIQ8/Bq4jsGPz1aSlW4ZWB zreUAfVPH0YJo+ZWR8fboL5HwbrJQz2UoJDhUW7M9HqlBpGTXzXLGaTaVPaHNNypkgw/ JXG5IuAcgaiceqVWpd7LP2qw+pSMMaBAdcp9ql+HNJLjkDGQXCMTM8yi5KEM5ZMDuxek SC+A== X-Gm-Message-State: APjAAAWdH+yCgPGR7N/6HVtPSSXxMZAg4KJVJ0Gu576Gux57PjPrgAoH watk0FmX+8hPQI7z9ur3T4g1DDOZ X-Google-Smtp-Source: APXvYqxA1N8JZqFxXRu2ZpcFUcwR0dlaTS3SdA73us62av2trfwXfHVaIwIcfaZGDZ0FexNkZrtqMg== X-Received: by 2002:a1c:5fd6:: with SMTP id t205mr2139747wmb.124.1570010363981; Wed, 02 Oct 2019 02:59:23 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:fa:a50:21e:67ff:fe5b:4283]) by smtp.gmail.com with ESMTPSA id w12sm29621318wrg.47.2019.10.02.02.59.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Oct 2019 02:59:23 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 2 Oct 2019 11:58:46 +0200 Message-Id: <20191002095904.6325-6-m.othacehe@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191002095904.6325-1-m.othacehe@gmail.com> References: <20191002095904.6325-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: , 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 Oct 2 09:58:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15559 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 BEB0A1749F; Wed, 2 Oct 2019 11:01: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 4A1DE1749D for ; Wed, 2 Oct 2019 11:01:02 +0100 (BST) Received: from localhost ([::1]:53136 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFbRM-000467-Lu for patchwork@mira.cbaines.net; Wed, 02 Oct 2019 06:01:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51066) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFbQZ-0003kc-Jf for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iFbQX-0008Vg-PQ for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54916) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iFbQX-0008VW-Lq for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iFbQX-0000Yd-KC for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v4 06/23] gnu: boost: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 02 Oct 2019 10:00: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 Cc: Mathieu Othacehe Received: via spool by 36477-submit@debbugs.gnu.org id=B36477.15700103831853 (code B ref 36477); Wed, 02 Oct 2019 10:00:09 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Oct 2019 09:59:43 +0000 Received: from localhost ([127.0.0.1]:35451 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFbQ0-0000TB-Dh for submit@debbugs.gnu.org; Wed, 02 Oct 2019 05:59:43 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:39986) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFbPv-0000Ra-3V for 36477@debbugs.gnu.org; Wed, 02 Oct 2019 05:59:31 -0400 Received: by mail-wm1-f65.google.com with SMTP id b24so6251211wmj.5 for <36477@debbugs.gnu.org>; Wed, 02 Oct 2019 02:59: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=1RaAbdaRDU7I3w4VSsxVX6OCnzGMJFsHT4wdA720YDI=; b=eiP09lbkOMVJwjBUf5yMGz4Zn59jcHxCySUPIpHxl3tkaJmllLhdMxbV8ig9fY8die 94A0CI9jiPj44VT3ukFAJm5L+TonQ/0JIcyVom0jfM7SwI8SPyLTUskQhrAh4RRfsbVv y6pqrxF77Gqlw66fZvHjo1L3VNTDltGklRDEAnmxQfzB0zW2I5gmoTmNjVJJwitE/eyq 6hVvHQ+TacQP0JMvAqxZ73GVQhLMYyU7hBA04jRaWXUDDKGIYiHPH4dQyEXdzZ4k/X1/ dX15B7NeVIzbw4OUKsSUI1P0K6/wXg45Mzxr2YQKVj+U1z1DT6gSE8srX9ngwNolhh/N jbaw== 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=1RaAbdaRDU7I3w4VSsxVX6OCnzGMJFsHT4wdA720YDI=; b=MIozPcqGfKwrN2/cbJ7QmFexZRgnKnmfv1TRHGW4j7M2FAqBIbZtm6P9b9yQzULPuY x6dc9sJSw9L9/antrvvi/GrvWrM9MeVPUsSUhXtVeuwzp0MMbsALYT4UBuXm3k/XZ46Y hiycGwwt/AKgO9zHdww9gU3xbv8uQZV09rhSjP74Uu0geAyxebIelmy5SPIwHix30FSd 4iG8douzp3Qg/I2judVU7YiK0o7JR4cUV3BQIw89wiUPw3Q5p6h4qv16Y+Xwi+POLUF2 J3asbbWVuaSzIKwKbwQuLtpF7bxsO3tvAYQ/k92lq5XzLMQNwaikIKYIrwrpQXB54sQy Vw4Q== X-Gm-Message-State: APjAAAXKBLuY396DKh5bUgGYJarvPRMr5xmV3il6tSSBOEnA+ly2AV3h awBDqKhnt+8B4HeKyR837Rzscvii X-Google-Smtp-Source: APXvYqzceoGLrhIBz0zTWBrJcftOmdp0UT+U9F8Ah/KgOQqMZvmspd60TgP+zN8ge35KGSjaxwgp8w== X-Received: by 2002:a7b:cb8b:: with SMTP id m11mr2208922wmi.145.1570010364941; Wed, 02 Oct 2019 02:59:24 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:fa:a50:21e:67ff:fe5b:4283]) by smtp.gmail.com with ESMTPSA id w12sm29621318wrg.47.2019.10.02.02.59.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Oct 2019 02:59:24 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 2 Oct 2019 11:58:47 +0200 Message-Id: <20191002095904.6325-7-m.othacehe@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191002095904.6325-1-m.othacehe@gmail.com> References: <20191002095904.6325-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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/boost-dumpversion.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/boost.scm (boost)[source]: Apply it, [native-inputs]: add python unless cross-compiling, [arguments]: pass cross-compilation mandatory flags and fill a user-config.jam file pointing to cross-compiler. Disable python support that is broken when cross-compiling. Disable provide-libboost_python when cross-compiling. --- gnu/local.mk | 1 + gnu/packages/boost.scm | 59 +++++++++++++++----- gnu/packages/patches/boost-dumpversion.patch | 24 ++++++++ 3 files changed, 71 insertions(+), 13 deletions(-) create mode 100644 gnu/packages/patches/boost-dumpversion.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3acb44e450..2ec5ffe29e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -715,6 +715,7 @@ dist_patch_DATA = \ %D%/packages/patches/binutils-loongson-workaround.patch \ %D%/packages/patches/blender-2.79-newer-ffmpeg.patch \ %D%/packages/patches/blender-2.79-python-3.7-fix.patch \ + %D%/packages/patches/boost-dumpversion.patch \ %D%/packages/patches/byobu-writable-status.patch \ %D%/packages/patches/calibre-no-updates-dialog.patch \ %D%/packages/patches/calibre-remove-test-bs4.patch \ diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index a2253a9efc..4e1e68204f 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2018, 2019 Ricardo Wurmus ;;; Copyright © 2018 Maxim Cournoyer ;;; Copyright © 2018 Efraim Flashner +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -54,6 +55,8 @@ (string-append "https://dl.bintray.com/boostorg/release/" version "/source/boost_" version-with-underscores ".tar.bz2")))) + (patches + (search-patches "boost-dumpversion.patch")) (sha256 (base32 "0y47nc7w0arwgj4x1phadxbvl7wyfcgknbz5kv8lzpl98wsyh2j3")))) @@ -62,7 +65,9 @@ ("zlib" ,zlib))) (native-inputs `(("perl" ,perl) - ("python" ,python-2) + ,@(if (%current-target-system) + '() + `(("python" ,python-2))) ("tcsh" ,tcsh))) (arguments `(#:tests? #f @@ -76,7 +81,24 @@ ;; Set the RUNPATH to $libdir so that the libs find each other. (string-append "linkflags=-Wl,-rpath=" - (assoc-ref %outputs "out") "/lib")) + (assoc-ref %outputs "out") "/lib") + ,@(if (%current-target-system) + `("--user-config=user-config.jam" + ;; Python is not supported when cross-compiling. + "--without-python" + "binary-format=elf" + "target-os=linux" + ,@(cond + ((string-prefix? "arm" (%current-target-system)) + '("abi=aapcs" + "address-model=32" + "architecture=arm")) + ((string-prefix? "aarch64" (%current-target-system)) + '("abi=aapcs" + "address-model=64" + "architecture=arm")) + (else '()))) + '())) #:phases (modify-phases %standard-phases (delete 'bootstrap) @@ -94,6 +116,14 @@ (setenv "SHELL" (which "sh")) (setenv "CONFIG_SHELL" (which "sh")) + ,@(if (%current-target-system) + `((call-with-output-file "user-config.jam" + (lambda (port) + (format port + "using gcc : cross : ~a-c++ ;" + ,(%current-target-system))))) + '()) + (invoke "./bootstrap.sh" (string-append "--prefix=" out) ;; Auto-detection looks for ICU only in traditional @@ -108,17 +138,20 @@ (replace 'install (lambda* (#:key make-flags #:allow-other-keys) (apply invoke "./b2" "install" make-flags))) - (add-after 'install 'provide-libboost_python - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - ;; Boost can build support for both Python 2 and Python 3 since - ;; version 1.67.0, and suffixes each library with the Python - ;; version. Many consumers only check for libboost_python - ;; however, so we provide it here as suggested in - ;; . - (with-directory-excursion (string-append out "/lib") - (symlink "libboost_python27.so" "libboost_python.so")) - #t)))))) + ,@(if (%current-target-system) + '() + '((add-after 'install 'provide-libboost_python + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + ;; Boost can build support for both Python 2 and + ;; Python 3 since version 1.67.0, and suffixes each + ;; library with the Python version. Many consumers + ;; only check for libboost_python however, so we + ;; provide it here as suggested in + ;; . + (with-directory-excursion (string-append out "/lib") + (symlink "libboost_python27.so" "libboost_python.so")) + #t)))))))) (home-page "https://www.boost.org") (synopsis "Peer-reviewed portable C++ source libraries") diff --git a/gnu/packages/patches/boost-dumpversion.patch b/gnu/packages/patches/boost-dumpversion.patch new file mode 100644 index 0000000000..7df779cfe6 --- /dev/null +++ b/gnu/packages/patches/boost-dumpversion.patch @@ -0,0 +1,24 @@ +This issue is described here: https://github.com/openwrt/packages/pull/8685 +and has not been solved as of 1.70.0 release. + +--- a/tools/build/src/tools/common.jam ++++ b/tools/build/src/tools/common.jam +@@ -973,18 +973,6 @@ + } + } + +- # From GCC 5, versioning changes and minor becomes patch +- if $(tag) = gcc && [ numbers.less 4 $(version[1]) ] +- { +- version = $(version[1]) ; +- } +- +- # Ditto, from Clang 4 +- if ( $(tag) = clang || $(tag) = clangw ) && [ numbers.less 3 $(version[1]) ] +- { +- version = $(version[1]) ; +- } +- + # On intel, version is not added, because it does not matter and it is the + # version of vc used as backend that matters. Ideally, we should encode the + # backend version but that would break compatibility with V1. From patchwork Wed Oct 2 09:58: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: 15568 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 5F17F1749F; Wed, 2 Oct 2019 11:01: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 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 1EF051749D for ; Wed, 2 Oct 2019 11:01:42 +0100 (BST) Received: from localhost ([::1]:53158 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFbS0-0004q0-Ng for patchwork@mira.cbaines.net; Wed, 02 Oct 2019 06:01:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51063) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFbQZ-0003kU-JB for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iFbQY-0008WP-CB for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54917) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iFbQY-0008W0-8S for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iFbQY-0000Yx-78 for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v4 07/23] gnu: eudev: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 02 Oct 2019 10:00: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 Cc: Mathieu Othacehe Received: via spool by 36477-submit@debbugs.gnu.org id=B36477.15700103841861 (code B ref 36477); Wed, 02 Oct 2019 10:00:10 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Oct 2019 09:59:44 +0000 Received: from localhost ([127.0.0.1]:35455 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFbQ7-0000Tq-PV for submit@debbugs.gnu.org; Wed, 02 Oct 2019 05:59:44 -0400 Received: from mail-wr1-f44.google.com ([209.85.221.44]:45852) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFbPv-0000Rg-Vq for 36477@debbugs.gnu.org; Wed, 02 Oct 2019 05:59:32 -0400 Received: by mail-wr1-f44.google.com with SMTP id r5so18857553wrm.12 for <36477@debbugs.gnu.org>; Wed, 02 Oct 2019 02:59: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=vDUqeO/8QkaQqGbd8ampa/50/l6TlAdE2E92whWdgt0=; b=pOVjJhaE+Dc41x3fj/a36mRHXAZTHrpVzS46vTTUZ4tAtWNuhUXymUkAZWQad7Gc3e 5MncNzi/JTvrFOqRh2k6W3hBAfjcu3yofPz3uVjQsvzGvN4dSXj5OEjWu1dI2XaqnxRY gF2fNrWB/V5ADC4RbV3qctO6Nac2EudtgfSBthqZ2LvLChYdHy507CoPGkB/5SVkqax7 brogeRL8IMud4VQ615L7i8H890nvW7lqXquN8z1ORriHyczJaPpZDnL02KHQQsnjUxly qkrMAnUtJufg580WOMhC7sHiq4ULp491xvfJqzA3+dd8g+XgoL1j852DkQkSqNEDM1oO Q/ZA== 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=vDUqeO/8QkaQqGbd8ampa/50/l6TlAdE2E92whWdgt0=; b=jFoqeYdQniyBcrv98cMhJFRrSVSIuVTQWb7Fe1kM+p8Nf1huejm8N6DG4Fj8INFbqb eGlCCnMVxmvsFTqqWHL49r3W9sNHAZFm4xzVoyao9FJYE4xHldvwOb0INGQWgaIIQg4c yOjSm6A2qpj3085Vy1FinLGyUflOwAIZ6Rvo19v+PJanKdw7PXB9alB0egBUM+cg6Z8f qGL828dCyYznXUlaTMybpXgrfYNoGyF7zAwmA7UWym0DixDHu8LGjdtSPDDmlnLFOJJv He9P/V2QiEHVIdI4LM5WX9mpLgLdvgxf1HSejloTVDXj5nUMcsFWbByzevFAs4ZjJmGn XuUg== X-Gm-Message-State: APjAAAUpOwB46c0QaGiq0HXgmBd1izwZPE4AdpbV5Yo8aNgED3QVSDAK QDI/jS7j482mdF7bmjZb0kbYdTcu X-Google-Smtp-Source: APXvYqzUh/MsLGMipnJQ41+liN/48NMZrA3TXlE2n+cQs+I6FicjX2HakcWF5sOosCcOJc/9d1RdJQ== X-Received: by 2002:adf:f287:: with SMTP id k7mr2095246wro.206.1570010365972; Wed, 02 Oct 2019 02:59:25 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:fa:a50:21e:67ff:fe5b:4283]) by smtp.gmail.com with ESMTPSA id w12sm29621318wrg.47.2019.10.02.02.59.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Oct 2019 02:59:25 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 2 Oct 2019 11:58:48 +0200 Message-Id: <20191002095904.6325-8-m.othacehe@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191002095904.6325-1-m.othacehe@gmail.com> References: <20191002095904.6325-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: , 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 461c019d64..c40072a706 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2576,7 +2576,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 _ @@ -2585,19 +2585,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 Oct 2 09:58: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: 15558 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 A560D174A0; Wed, 2 Oct 2019 11:00:37 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 6CD7D1749E for ; Wed, 2 Oct 2019 11:00:37 +0100 (BST) Received: from localhost ([::1]:53132 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFbQx-0003qM-C7 for patchwork@mira.cbaines.net; Wed, 02 Oct 2019 06:00:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51077) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFbQa-0003lK-B9 for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iFbQZ-00006K-2t for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54918) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iFbQY-000065-Tk for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iFbQY-0000ZN-Oc for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v4 08/23] gnu: bdb: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 02 Oct 2019 10:00: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 Cc: Mathieu Othacehe Received: via spool by 36477-submit@debbugs.gnu.org id=B36477.15700103841872 (code B ref 36477); Wed, 02 Oct 2019 10:00:10 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Oct 2019 09:59:44 +0000 Received: from localhost ([127.0.0.1]:35458 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFbQ8-0000Ty-7g for submit@debbugs.gnu.org; Wed, 02 Oct 2019 05:59:44 -0400 Received: from mail-wm1-f53.google.com ([209.85.128.53]:50378) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFbPx-0000Rw-C6 for 36477@debbugs.gnu.org; Wed, 02 Oct 2019 05:59:33 -0400 Received: by mail-wm1-f53.google.com with SMTP id 5so6507257wmg.0 for <36477@debbugs.gnu.org>; Wed, 02 Oct 2019 02:59:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tFKhO97sjfpfswaeM5Wjh39FT3rexFnXrpbVJD2LEmw=; b=UaC+53KEGiB+Be04vTergzmDKHVq51VftOXkRbjzo/Rzi2osR/7ecEQ8lvD8Cu3PoJ E6B+ZwZhOGkBscJ4r6M/KKusE1Ri0H/B1KavMer/rmgUS9xSXTYoECyidX333UCgyUaX wKgdrNAjdxtygG+tH8xfrOvEEBiMJJ1PfOJGfWD/5sWhfRzhLNLzA3nAqpLlOsY+sEb9 D9d9P8nJ6/epZi1VfUqqAWBY374tFvpCMeHKCpFt0tBmIQJCi9z+CjBzM15XBWhPtW1i ZoP/Vbzz6WRhnhztCE4FFVdIERkPv/7qdPmCvJsoywViqr/xLU7xbznoTGQ9o6KfMPIV t9+w== 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=tFKhO97sjfpfswaeM5Wjh39FT3rexFnXrpbVJD2LEmw=; b=Tykdqr4uMJnzyrCHP2g88gIqfkk5efouApL3Dqz+KH7Wjr9URJrjR2QLq9zC1oWlf0 Se99g7jXLmg2nqJ4hahrOBtKg6O22+F4uDeyeM8TYa+ZwcipjXQlYHUlzkzxqqSbGnzR XXTtxrdndHqwypDVgDZNuT+idjYwI8BRqc3NspmhZOY3iIMr8WhOXWKVvZKPfBwakGH0 w6fDQ1wZocEZbo/frVLXBRiRT+R1C5c7Tfv3L3JC2/KvBIlnBKjyDArYE+GzmpoN3aSV PW61DICccb+GRa99PEaKWo8eB9yw/B5JGVmY3VsPoE8JWxkvlxtkqVu6lpP5tURxEqx2 i7TA== X-Gm-Message-State: APjAAAVVKqAkKbMXUuBE+8Ik83Bd0ISo+wVlgv5FLgZRE/sgsJNRAOQG leFl+lbNeXdZ9ifJvhtjzW61C/B3 X-Google-Smtp-Source: APXvYqyxMetv/yGRm58pAPK8HN3pJIIMHyiVlVwUoRG8TReA/etZzB7p0gW2rdF7hWGOd8tvliFQbA== X-Received: by 2002:a1c:4846:: with SMTP id v67mr2159527wma.120.1570010367367; Wed, 02 Oct 2019 02:59:27 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:fa:a50:21e:67ff:fe5b:4283]) by smtp.gmail.com with ESMTPSA id w12sm29621318wrg.47.2019.10.02.02.59.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Oct 2019 02:59:26 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 2 Oct 2019 11:58:49 +0200 Message-Id: <20191002095904.6325-9-m.othacehe@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191002095904.6325-1-m.othacehe@gmail.com> References: <20191002095904.6325-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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/dbm.scm (bdb-4.8)[arguments]: Pass host argument to configure when cross-compiling. --- gnu/packages/dbm.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/dbm.scm b/gnu/packages/dbm.scm index 5191c475c2..84c5817a79 100644 --- a/gnu/packages/dbm.scm +++ b/gnu/packages/dbm.scm @@ -55,7 +55,7 @@ #:phases (modify-phases %standard-phases (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) + (lambda* (#:key target outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) (doc (assoc-ref outputs "doc"))) ;; '--docdir' is not honored, so we need to patch. @@ -74,6 +74,10 @@ '("--build=aarch64-unknown-linux-gnu") '()) + ,@(if (%current-target-system) ; cross building + '((string-append "--host=" target)) + '()) + ;; Remove 7 MiB of .a files. "--disable-static" From patchwork Wed Oct 2 09:58:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15567 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 0EB611749F; Wed, 2 Oct 2019 11:01: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 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 B3F181749D for ; Wed, 2 Oct 2019 11:01:41 +0100 (BST) Received: from localhost ([::1]:53160 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFbS0-0004qK-9H for patchwork@mira.cbaines.net; Wed, 02 Oct 2019 06:01:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51115) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFbQc-0003nD-1h for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iFbQZ-00007a-HT for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54919) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iFbQZ-00007N-Cd for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iFbQZ-0000Zr-By for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v4 09/23] gnu: openldap: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 02 Oct 2019 10:00: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 Cc: Mathieu Othacehe Received: via spool by 36477-submit@debbugs.gnu.org id=B36477.15700103851882 (code B ref 36477); Wed, 02 Oct 2019 10:00:11 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Oct 2019 09:59:45 +0000 Received: from localhost ([127.0.0.1]:35460 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFbQ8-0000UG-Vk for submit@debbugs.gnu.org; Wed, 02 Oct 2019 05:59:45 -0400 Received: from mail-wm1-f43.google.com ([209.85.128.43]:54642) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFbPy-0000SA-VN for 36477@debbugs.gnu.org; Wed, 02 Oct 2019 05:59:35 -0400 Received: by mail-wm1-f43.google.com with SMTP id p7so6485477wmp.4 for <36477@debbugs.gnu.org>; Wed, 02 Oct 2019 02:59: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=fmVOYdeeqDuBBhwj3aZNr5DV6sPIrHGCeIwWQebuYIc=; b=lZ1WN6uwIwEv8B/+L8FLrmqcFIvmryZqXSEzYzJEIAYXXZnQDUIdxEow/rmd0arwwe ZPXKdOeBOGo0TnwN5C6w6D6/TR8Y1BiPufj/rtw4bJ5h15lp9rxgXUiO/C3/RpBLVhLH +JV8qo/WT3aeBhgor6mgqFfCEl7NJwY7x3IX3+yA7eSIbyfS2OnGqwpVFPIY+qyURzzy TYUQ+KgCiWz26AkH77NGaIaRtwqWQ8CHQWYrXrkAAmhfApdXhnAyCaSr0d5BUpnCztPv SO6bfg2Ug5ujk+hMc142zMJkMZQzL0H5WXjkemV8UECepZhKJMtGegI2uMMt/qir2Wfw fI4w== 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=fmVOYdeeqDuBBhwj3aZNr5DV6sPIrHGCeIwWQebuYIc=; b=KIXiFproLSKq/GlYZirm8xlfBLSmDY5fc8NDDykHDDPSbM/dTrLESFv8bAGYK8Q+LA RoGYNqY6f7QTVNkN1lZ+ce+qu3WFXggzArVJSKOr7Kog12Iw1kdhSz1RKMel5ZbFrJgi uENw0rapMTH5ka6leylVZ1QTxqp7Xg9Fr/dm5+AVXuWfeX4/QdVkM25cmNRTa6Whg7yB q43QPqmL6vh+lUPkP2mRhUDYB9GeE0Q5oLa892gU71yzbVokkeIu6VfX2ICv9boBvpIZ XIy3N30DKSdibWRFCfGHQuBMC4HNJ6Bur3610f9xbhUq7g1hEevp+wJgfzwNkQv9V7T7 x9yg== X-Gm-Message-State: APjAAAV0cKAZHAO3vsJPG2UmjlOUK/MlhYZ98axLLSW6qyyFy3q6Srsn e6RtfGC+ebpVNHU4Knlzuudd/3Kc X-Google-Smtp-Source: APXvYqwe9TCmgSvcuAVOgq3vAjF4OCuZyvNDJdwp7IhLOigYflqmQKzEHi7Cfj2OyiYHBQN0BG2F6A== X-Received: by 2002:a05:600c:22d9:: with SMTP id 25mr2028388wmg.133.1570010368860; Wed, 02 Oct 2019 02:59:28 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:fa:a50:21e:67ff:fe5b:4283]) by smtp.gmail.com with ESMTPSA id w12sm29621318wrg.47.2019.10.02.02.59.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Oct 2019 02:59:27 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 2 Oct 2019 11:58:50 +0200 Message-Id: <20191002095904.6325-10-m.othacehe@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191002095904.6325-1-m.othacehe@gmail.com> References: <20191002095904.6325-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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/openldap.scm (openldap)[inputs]: Move groff from here to ... [native-inputs]: ... here. Also add bdb and automake. [arguments]: Add cross-compilation specific configure-flags. Do not strip when cross-compiling. Add a new fix-configure phase to update outdated config.sub and config.guess. Add a fix-cross-gcc phase to set CC variable to cross-compiler name when cross-compiling. --- gnu/packages/openldap.scm | 38 +++++++++++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/gnu/packages/openldap.scm b/gnu/packages/openldap.scm index 2f80920ed4..2c9b0d428e 100644 --- a/gnu/packages/openldap.scm +++ b/gnu/packages/openldap.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2017, 2018, 2019 Ricardo Wurmus ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -50,6 +51,7 @@ #:use-module (gnu packages) #:use-module ((guix licenses) #:select (openldap2.8 lgpl2.1+ gpl3+ psfl)) #:use-module (guix packages) + #:use-module (guix utils) #:use-module (guix download) #:use-module (guix build-system gnu) #:use-module (guix build-system python)) @@ -79,16 +81,46 @@ (inputs `(("bdb" ,bdb-5.3) ("cyrus-sasl" ,cyrus-sasl) ("gnutls" ,gnutls) - ("groff" ,groff) ("icu4c" ,icu4c) ("libgcrypt" ,libgcrypt) ("zlib" ,zlib))) - (native-inputs `(("libtool" ,libtool))) + (native-inputs `(("libtool" ,libtool) + ("groff" ,groff) + ("bdb" ,bdb-5.3) + ;; For up to date 'config.guess' and 'config.sub'. + ("automake" ,automake))) (arguments `(#:tests? #f - #:configure-flags '("--disable-static") + #:configure-flags + '("--disable-static" + ,@(if (%current-target-system) + '("--with-yielding_select=yes" + "ac_cv_func_memcmp_working=yes") + '())) + ;; Disable install stripping as it breaks cross-compiling. + #:make-flags '("STRIP=") #:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-configure + (lambda* (#:key inputs native-inputs #:allow-other-keys) + ;; Replace outdated config.sub and config.guess: + (with-directory-excursion "build" + (for-each (lambda (file) + (install-file (string-append + (assoc-ref + (or native-inputs inputs) "automake") + "/share/automake-" + ,(version-major+minor + (package-version automake)) + "/" file) ".")) + '("config.sub" "config.guess"))) + #t)) + ,@(if (%current-target-system) + '((add-before 'configure 'fix-cross-gcc + (lambda* (#:key target #:allow-other-keys) + (setenv "CC" (string-append target "-gcc")) + #t))) + '()) (add-after 'install 'patch-sasl-path ;; Give -L arguments for cyrus-sasl to avoid propagation. (lambda* (#:key inputs outputs #:allow-other-keys) From patchwork Wed Oct 2 09:58: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: 15564 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 E50551749F; Wed, 2 Oct 2019 11:01: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 1AE8A1749E for ; Wed, 2 Oct 2019 11:01:21 +0100 (BST) Received: from localhost ([::1]:53150 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFbRf-0004Sb-5i for patchwork@mira.cbaines.net; Wed, 02 Oct 2019 06:01:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51095) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFbQb-0003mB-3B for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iFbQa-00008b-4H for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54920) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iFbQZ-00008D-Vy for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:12 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iFbQZ-0000a1-Sr for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v4 10/23] gnu: swig: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 02 Oct 2019 10:00: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 Cc: Mathieu Othacehe Received: via spool by 36477-submit@debbugs.gnu.org id=B36477.15700103861890 (code B ref 36477); Wed, 02 Oct 2019 10:00:11 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Oct 2019 09:59:46 +0000 Received: from localhost ([127.0.0.1]:35463 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFbQ9-0000UL-Ki for submit@debbugs.gnu.org; Wed, 02 Oct 2019 05:59:45 -0400 Received: from mail-wr1-f46.google.com ([209.85.221.46]:43705) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFbQ0-0000SN-41 for 36477@debbugs.gnu.org; Wed, 02 Oct 2019 05:59:36 -0400 Received: by mail-wr1-f46.google.com with SMTP id q17so18895967wrx.10 for <36477@debbugs.gnu.org>; Wed, 02 Oct 2019 02:59:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=197cZ6RhYY+WWluGjjSg/s3FT1d6jrEyDazsrJE0Uok=; b=pgwRgw2+NLdVdwXAlNa0xKsaas6yrEawUC8t1bvV9fqSVi/tdf7XjNfr1lP2P3bDpW 6NNp3Q6r1ORwykzexZm7ly46t/El+lz6sL15T0wicxNY442CTxmBqV2WRoEtBPChOcoi hjq8eMZwjO/9vBMT3btp0JX/pvf+6byDpiJsFK0rhZiYGI/5IUp/T+ros3xGDw3r6bTD Guh1B3jMDZEdIoxyjL2MzOUVpkwv2QN2TE7yGNGgnF27M7uBkHrcj2i0D+vx2oj8mGSb rVtiwJXPG0MX5tCP7+dqpnn0hNj1e+DB5CO01bYm2zJBOHIHbyHa+eoWByJVrkckXS8G SNwQ== 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=197cZ6RhYY+WWluGjjSg/s3FT1d6jrEyDazsrJE0Uok=; b=q8mfWjbAS+0eca7mvH19CJad6ZPeULD5LC1hkYFiw1S6O4JmJniVQOZWg4AFrrn7NB BmyBVCwu+SQf2r2ta1Hgs/I2Uii2aYTNkHN2vPfmnKsUVZYDJQcHXlsGZMjCFQth8SPN p4NRTfOuHZbCjj80SOyHlQTIBNuEDcpAUyAa43jLTuIdbEYexN9XuKuGr46nLdXhrUXd Ev18B748c/GaOktdKWNjalhRDV3k6V8m38GZgPM868WRQT6GhRxczZMZukNni6Iu1t6Y KYSYrVuEwIbV7K+blb6RrWLVdHkGXQqKGBI+OHV+80EPPPmwGN2GluxpWrRPlTL5VeJz PQKA== X-Gm-Message-State: APjAAAUsVh0PbacuN+pxMBldo/vV1Wi7Kg+hf8dI2GvKFnfqPfHlnRbG F4gzgnY5e+ucC54b77X8r1BFEvKG X-Google-Smtp-Source: APXvYqw9kHWtkKGW1ZBg5W9AtnjtbdmquB9PGnF9o4rctn+tzb94O8WDe0jUhvYebEjoiIQlvdAQWw== X-Received: by 2002:adf:f9ce:: with SMTP id w14mr2095803wrr.132.1570010370159; Wed, 02 Oct 2019 02:59:30 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:fa:a50:21e:67ff:fe5b:4283]) by smtp.gmail.com with ESMTPSA id w12sm29621318wrg.47.2019.10.02.02.59.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Oct 2019 02:59:29 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 2 Oct 2019 11:58:51 +0200 Message-Id: <20191002095904.6325-11-m.othacehe@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191002095904.6325-1-m.othacehe@gmail.com> References: <20191002095904.6325-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: , 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 Oct 2 09:58: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: 15565 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 BDA7E1749F; Wed, 2 Oct 2019 11:01: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 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 81F691749D for ; Wed, 2 Oct 2019 11:01:26 +0100 (BST) Received: from localhost ([::1]:53154 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFbRl-0004Z8-2d for patchwork@mira.cbaines.net; Wed, 02 Oct 2019 06:01:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51112) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFbQb-0003n4-UD for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iFbQa-00009C-M2 for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54921) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iFbQa-000093-IB for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:12 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iFbQa-0000a8-Fj for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v4 11/23] gnu: git: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 02 Oct 2019 10:00: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 Cc: Mathieu Othacehe Received: via spool by 36477-submit@debbugs.gnu.org id=B36477.15700103861897 (code B ref 36477); Wed, 02 Oct 2019 10:00:12 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Oct 2019 09:59:46 +0000 Received: from localhost ([127.0.0.1]:35465 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFbQA-0000UR-0i for submit@debbugs.gnu.org; Wed, 02 Oct 2019 05:59:46 -0400 Received: from mail-wr1-f45.google.com ([209.85.221.45]:36240) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFbQ2-0000Sn-7N for 36477@debbugs.gnu.org; Wed, 02 Oct 2019 05:59:38 -0400 Received: by mail-wr1-f45.google.com with SMTP id y19so18915822wrd.3 for <36477@debbugs.gnu.org>; Wed, 02 Oct 2019 02:59: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 :mime-version:content-transfer-encoding; bh=JBAmS30eGz9uKxS+VCM5cx8on0WnEsVZH7Tw8ALKKPg=; b=ZHwVzFAjP8JptVDPu+3zD7AoChgRr+ItzFeaJrBOwn3gy8FsTv4UHoFvIXhP83wvKk q2n1qw6HJLNkWdXcCGRULUl7uqvIWGigYKIAWzrKsxhzIMaCzoxruFX6PrOc/S0YY0vi hmAA3+B791tvz8EC3q1mmjIB+5VDJjS2wf/T+3AhT4z5Vm2TDDHjM+mxUoCrCxgGETWY Xs727l6PnylN3YRqnzyovTlnjYUR1BLT9a9SOnLyBIF5IVhv1qDi/CeZ5bzLS0Pg1Yip +DgzYg6tneUmgBJhxvfK3gfef4gAq9yE066CFm5w+QL7mZ0XOCJzV6X4B6t4+/b4L0gj Lexg== 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=JBAmS30eGz9uKxS+VCM5cx8on0WnEsVZH7Tw8ALKKPg=; b=lWFSoBPQudTMhny6PZ5Va2kveMTfdczdmuWhLkxYYMYzigrzPfCj4COnlMhV3C0Tut n4SPZZGAnm5O9DVrw4G1H6VX+ZvDVSbQl4AiSIy2mWPZsQqxod7Y+ksRNEPTFM7efjBE 8BmKb7dQ8dWSK+WUexewvXE8iCpENUjU0BrUylnv4cunt/G/c1LIFNj/ZcdWrY8K+/e0 Quz/dSJPckpLd4kJjbponbICWYoeSHQLyx074fkYlsOebYkxo0jkAknxtt5cRrFkPhYl FdyoUDwtrxae4ATB09+qVq99sAcgSpingnwHUlERj9E84tv5S2EqKCeyXYrLgU07n5Rq aTPw== X-Gm-Message-State: APjAAAVcDc3fCjfQDJ1JIl7ygT0cy+FUpZJkhKYp8R/WKBVePKfXyQH6 oA6viI7perX0mR8wMl5Xei1Td0Wk X-Google-Smtp-Source: APXvYqwSKdv76qHF1XhuF3TLMrLSWo1CHUd2lDR9iJd0RbE/8FhoiNstxTto864hzcHTUa+mpHyFXQ== X-Received: by 2002:a5d:52c5:: with SMTP id r5mr1991475wrv.160.1570010371394; Wed, 02 Oct 2019 02:59:31 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:fa:a50:21e:67ff:fe5b:4283]) by smtp.gmail.com with ESMTPSA id w12sm29621318wrg.47.2019.10.02.02.59.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Oct 2019 02:59:30 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 2 Oct 2019 11:58:52 +0200 Message-Id: <20191002095904.6325-12-m.othacehe@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191002095904.6325-1-m.othacehe@gmail.com> References: <20191002095904.6325-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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/version-control.scm (git-cross-configure-flags): New variable, (git)[arguments]: add it to configure-flags. Also add cross curl-config script to PATH. (git-minimal): Add previous variable to configure-flags. --- gnu/packages/version-control.scm | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 192fa666d9..947873e6d5 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -141,6 +141,10 @@ changes to project files over time. It supports both a distributed workflow as well as the classic centralized workflow.") (license license:gpl2+))) +(define git-cross-configure-flags + '("ac_cv_fread_reads_directories=yes" + "ac_cv_snprintf_returns_bogus=no")) + (define-public git (package (name "git") @@ -233,7 +237,10 @@ as well as the classic centralized workflow.") ;; absolute file name to 'wish'. #:configure-flags (list (string-append "--with-tcltk=" (assoc-ref %build-inputs "tk") - "/bin/wish8.6")) ; XXX + "/bin/wish8.6") ; XXX + ,@(if (%current-target-system) + git-cross-configure-flags + '())) #:modules ((srfi srfi-1) (srfi srfi-26) @@ -250,6 +257,15 @@ as well as the classic centralized workflow.") (remove (cut string-prefix? bash-full <>) path) ":")) #t))) + ;; Add cross curl-config script to PATH when cross-compiling. + ,@(if (%current-target-system) + '((add-before 'configure 'add-cross-curl-config + (lambda* (#:key inputs #:allow-other-keys) + (setenv "PATH" + (string-append (assoc-ref inputs "curl") "/bin:" + (getenv "PATH"))) + #t))) + '()) (add-after 'configure 'patch-makefiles (lambda _ (substitute* "Makefile" @@ -506,7 +522,10 @@ everything from small to very large projects with speed and efficiency.") (string-append out "/share/gitweb")) #t))))) ((#:configure-flags flags) - ''()) + `(list + ,@(if (%current-target-system) + git-cross-configure-flags + '()))) ((#:disallowed-references lst '()) `(,perl ,@lst)))) (outputs '("out")) From patchwork Wed Oct 2 09:58: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: 15571 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 604551749F; Wed, 2 Oct 2019 11:02: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 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 190191749D for ; Wed, 2 Oct 2019 11:02:12 +0100 (BST) Received: from localhost ([::1]:53168 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFbST-0005As-Iq for patchwork@mira.cbaines.net; Wed, 02 Oct 2019 06:02:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51126) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFbQc-0003nh-N0 for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iFbQb-00009y-8h for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:14 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54922) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iFbQb-00009c-3y for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:13 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iFbQb-0000aG-1T for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:13 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v4 12/23] gnu: doxygen: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 02 Oct 2019 10:00: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 Cc: Mathieu Othacehe Received: via spool by 36477-submit@debbugs.gnu.org id=B36477.15700103871908 (code B ref 36477); Wed, 02 Oct 2019 10:00:12 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Oct 2019 09:59:47 +0000 Received: from localhost ([127.0.0.1]:35468 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFbQA-0000UY-9v for submit@debbugs.gnu.org; Wed, 02 Oct 2019 05:59:46 -0400 Received: from mail-wr1-f50.google.com ([209.85.221.50]:34099) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFbQ3-0000Su-TN for 36477@debbugs.gnu.org; Wed, 02 Oct 2019 05:59:40 -0400 Received: by mail-wr1-f50.google.com with SMTP id a11so18929754wrx.1 for <36477@debbugs.gnu.org>; Wed, 02 Oct 2019 02:59:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=O7WDndBJ1aLxKx6MpzWhA5cZiJAOjz++YxyVIEdRMec=; b=nY71PqnkV5S81dVvIlYoSfPCkOXG5F7Z7gVqUTe/eApwQbl+65hsb0RUAyACuZAkMX 2PNWOE+L38GGH1gnAvWxRYAPmT/Q2O5Va+zFEVkiYyR+BU9TZG97erkmH9xaZOBSU4Yd ER9gc+xtOa6rjSoU+CmkXshmyD3ZPcONQKWLLqSk552lURjiWW3eamKg+Jyw1LvSQ7rz xumpdgmIDy92KZzS3/rNRM8Nf1ha+gf0De4BYXGHwIsIR9SsfZck2782UFAI5bM9Easd fpJICWNMydDM4j4rs9Xf3hL8LxAN3U0v9KUElwRII/9EdBDdpkNqN8nim3MCtFE8pHdr QEzw== 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=O7WDndBJ1aLxKx6MpzWhA5cZiJAOjz++YxyVIEdRMec=; b=V6AIbD6xuCij/YxfAQIPfM3WPRw1S45aBEOAhWxzDu1upeq6yZmQhWq5N4XMLDbG10 2Tu5X1wyMoKc45h94u2B3Q45TY9k2ahPrfPL0YFFn7vLCE1sHoMVknUoY6KLMnvfuHRF 5yM5/6OjnldjRz5Wby3ftI4/9SnUCFNDLSBzQiyr01qSJvQtscu+RLu+knnzmKHbcAiP jth9UP8g8HLtQD+ND5x7EAsyrkY7bjrN6+mfQy6TE7gpu1gyxmVcCEka/wAOi/tvNIbb NVOo0bsEb/SaHwiC0xwC+/47xDwZR4vQCKScI6vrhJfNowolHbAkR6embrdlIr+LN3hv 0hHg== X-Gm-Message-State: APjAAAU7N1Zn+ac+Rx1ztwRqqR1JQKUXLVa0gEOuIx9kqTC8PBUAYikB KtD5a59nl5cMmOgPHnHTAdlOkS9C X-Google-Smtp-Source: APXvYqwojMdDB8mrOeeBv6HIN2t7imkJiSuZZdthLRWP/aESjDQzRq92G5PEkUJQ9F0aJFb85Kyrvg== X-Received: by 2002:adf:f190:: with SMTP id h16mr1332191wro.357.1570010373819; Wed, 02 Oct 2019 02:59:33 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:fa:a50:21e:67ff:fe5b:4283]) by smtp.gmail.com with ESMTPSA id w12sm29621318wrg.47.2019.10.02.02.59.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Oct 2019 02:59:32 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 2 Oct 2019 11:58:53 +0200 Message-Id: <20191002095904.6325-13-m.othacehe@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191002095904.6325-1-m.othacehe@gmail.com> References: <20191002095904.6325-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: , 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 Oct 2 09:58: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: 15572 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 547551749F; Wed, 2 Oct 2019 11:02: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 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 1060B1749D for ; Wed, 2 Oct 2019 11:02:13 +0100 (BST) Received: from localhost ([::1]:53172 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFbSU-0005CQ-Nf for patchwork@mira.cbaines.net; Wed, 02 Oct 2019 06:02:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51141) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFbQd-0003oM-AC for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iFbQb-0000Ad-Qs for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:14 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54923) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iFbQb-0000AS-MN for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:13 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iFbQb-0000aP-JA for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:13 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v4 13/23] gnu: guile-gcrypt: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 02 Oct 2019 10:00: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 Cc: Mathieu Othacehe Received: via spool by 36477-submit@debbugs.gnu.org id=B36477.15700103871914 (code B ref 36477); Wed, 02 Oct 2019 10:00:13 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Oct 2019 09:59:47 +0000 Received: from localhost ([127.0.0.1]:35470 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFbQB-0000Uk-1W for submit@debbugs.gnu.org; Wed, 02 Oct 2019 05:59:47 -0400 Received: from mail-wm1-f49.google.com ([209.85.128.49]:54169) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFbQ7-0000TP-Ls for 36477@debbugs.gnu.org; Wed, 02 Oct 2019 05:59:44 -0400 Received: by mail-wm1-f49.google.com with SMTP id i16so6486021wmd.3 for <36477@debbugs.gnu.org>; Wed, 02 Oct 2019 02:59:43 -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=CovSUVE41W6pB7EhrSzsWrDAGHgc8VxWxwN42Sriczc=; b=rgGTMSXSDmbIUDunwmyp2gT/5R+RXsJFGBJ7Tc6GBgPG1tj1fgu+N+iHWLY+wyl2jt 5k0JTS0qVSgq8DRiIoCCxehvvFZC59G/41NXx5I5yEBOaadLELqTIl1BFH2urigUSrAQ Z14uhq1LtD9tYttoRH4tctucE/2AQ3qQm0AUHEslgOMD6jwFUsmRtAl/fG7qwmFFMOXX GGLH9vYfIXOT/Pz1mvblHDvnGIHzrMfiThHOTM/I9p/7lHDdvFWSyfAP5oAKFa3JoOjA 7naZ28W/ikgOdqAMdguiyf0AAwKLhbQh/1nsI7DRb75e4zeVXcqwFjRWnlPEa99UfekR Kp0Q== 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=CovSUVE41W6pB7EhrSzsWrDAGHgc8VxWxwN42Sriczc=; b=iCe9r12oM1C1pczXniYJxc8rw83tT3n+rAZCCylMrNrZIhCL/SrKqj9O/ubyZylBBl Fi8DvwdPw6ZcQ7zF7rYL6gThgSW8vE/OqvI2ZIgfl/ENHzyj4gpKXOeBvFqHCgVjCdO6 NjG6eWPTyT7Ah8pVbZQkFlwD0OdkMeaEMactD0LRDtorL/dTXnZWlbPbg5S7GnCAwC+f SfrbR9FqiHOhD1B7kfkaa7riPvBE8CFZ8doCxpWyoxtOC3E7gWK3v252LcKllbyI051Z at9+40AIc3S6Ls3vAEmFg0VgngiOrVTPQqF2lalydnSHxyZOilJanTM++NWfPo8cuABs 4F4A== X-Gm-Message-State: APjAAAUgCEZqtSNK7tAf9yVr75MSBCLFMm1cZ9xlQj3u6/pcdhnEUG35 +PVqTQhyKOTZQnhJ5g/yW6I9oHbn X-Google-Smtp-Source: APXvYqyVfqMivvHyt5jXvZdXJVXplqgAQ38ZRdWFvHFayesFA1SxwniNlqb1H5IMV6GFwvsz2OXTtw== X-Received: by 2002:a1c:5f0b:: with SMTP id t11mr2210528wmb.76.1570010377612; Wed, 02 Oct 2019 02:59:37 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:fa:a50:21e:67ff:fe5b:4283]) by smtp.gmail.com with ESMTPSA id w12sm29621318wrg.47.2019.10.02.02.59.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Oct 2019 02:59:34 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 2 Oct 2019 11:58:54 +0200 Message-Id: <20191002095904.6325-14-m.othacehe@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191002095904.6325-1-m.othacehe@gmail.com> References: <20191002095904.6325-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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gnupg.scm (guile-gcrypt) [native-inputs]: Add guile, [arguments]: add libgcrypt-config to PATH when cross-compiling. --- gnu/packages/gnupg.scm | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 4acc434093..9ec51d8201 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -16,6 +16,7 @@ ;;; 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. ;;; @@ -479,11 +480,26 @@ gpgpme starting with version 1.7.") "1mhc5m4xygkfj7x18f8apiqpfdn9mrql0am5sk13cf5xn8x1r63z")) (file-name (string-append name "-" version "-checkout")))) (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))) From patchwork Wed Oct 2 09:58: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: 15566 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 55959174A1; Wed, 2 Oct 2019 11:01:29 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id B281B1749D for ; Wed, 2 Oct 2019 11:01:28 +0100 (BST) Received: from localhost ([::1]:53156 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFbRn-0004ae-IX for patchwork@mira.cbaines.net; Wed, 02 Oct 2019 06:01:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51182) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFbQf-0003r2-Ht for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iFbQd-0000D1-Ll for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:17 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54926) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iFbQd-0000CJ-8u for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:15 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iFbQd-0000ap-6l for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:15 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v4 14/23] gnu: guile-sqlite3: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 02 Oct 2019 10:00: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 Cc: Mathieu Othacehe Received: via spool by 36477-submit@debbugs.gnu.org id=B36477.15700104002003 (code B ref 36477); Wed, 02 Oct 2019 10:00:15 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Oct 2019 10:00:00 +0000 Received: from localhost ([127.0.0.1]:35482 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFbQH-0000Vy-Ha for submit@debbugs.gnu.org; Wed, 02 Oct 2019 05:59:59 -0400 Received: from mail-wm1-f41.google.com ([209.85.128.41]:37846) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFbQ8-0000TW-SS for 36477@debbugs.gnu.org; Wed, 02 Oct 2019 05:59:48 -0400 Received: by mail-wm1-f41.google.com with SMTP id f22so6285409wmc.2 for <36477@debbugs.gnu.org>; Wed, 02 Oct 2019 02:59: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=e3634+YG7dB2lcyKcYhye/xrCCn82c4D6aPHgiYWc+8=; b=j722RnB2soxEUHGQd1lzcz1LePqY/0WNEqKxNBLonEXpmr9bgzIxSj7+o9WJKs7WVI H4+Zy3VSzf16i8U0n7QDhAXHRyUwfbrEdTkx4b8yfB1V+YvM0PBiKEaqB0PpMOFGGgDa xNhksHBXdRwoaarBc3NnKVLu3w2hW93jigR7NYtOUU8zSe5Q5yq1FcUw5SXS/fhHXmKK mNiyTkAqSwDqd2gAje6TlY5eKqinNU03BkfBHwJuDSDBEWXF/vi6J84PLPd/D9OEvKil 7+wQsHawsinAxxsjQjt/BgdcSgtOd1z/gbID/eiLRIP2GppTSQq0Xy/1o1btbL1b/fKW pDkQ== 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=e3634+YG7dB2lcyKcYhye/xrCCn82c4D6aPHgiYWc+8=; b=emHqFuw5+rW27shjMd0CeHgKPRhORPob1xMc90QFB60HSM7vRr95Vgk5gwEv1T7GXD s1t2LrIS7eIaNJiHMRx4q2rqKezoOq+0YrYlhB1ZC2qJr2iv0B8hsUES/lzFMAKWPKEe 3e+VwLFghhaPzLT9A0VIPvm7dSBqVK76NCVKf+vCQHyhoQtw0Fn62eVK9aKrMX6drW4s 7ry01Mp7+O5Sn/q5bvS1VirUmVFpeOQFiBLcE0eYDnNjpXGOJU9cnkG4XPF9+yWmByq1 0xeEAsmpu85dfxigAgt8PEiZAWRRm1URhx7DP2TDBwiCWfS+itP2hNB8mAS9hiWbBgem fmYw== X-Gm-Message-State: APjAAAXO6bB1fLhiC3KMaVcsvN1kRyq+uVT7E6AQe0mST/dgIQweEfJO RzayYMqy9o2sgNWzFnRRzsVq1c9X X-Google-Smtp-Source: APXvYqyonGKmcKtMZPvKartZCvYfB261X1pm+21UUO6XwLf2zfizZVbpPt7q0bDuzSUpuoKdc/GmUQ== X-Received: by 2002:a1c:4846:: with SMTP id v67mr2160149wma.120.1570010378796; Wed, 02 Oct 2019 02:59:38 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:fa:a50:21e:67ff:fe5b:4283]) by smtp.gmail.com with ESMTPSA id w12sm29621318wrg.47.2019.10.02.02.59.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Oct 2019 02:59:37 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 2 Oct 2019 11:58:55 +0200 Message-Id: <20191002095904.6325-15-m.othacehe@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191002095904.6325-1-m.othacehe@gmail.com> References: <20191002095904.6325-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: , 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 2ec5ffe29e..42bc29783b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -935,6 +935,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 478b8faebe..bc57a55052 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 Oct 2 09:58:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15570 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 7631C1749F; Wed, 2 Oct 2019 11:01: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 29D3E1749D for ; Wed, 2 Oct 2019 11:01:49 +0100 (BST) Received: from localhost ([::1]:53166 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFbS8-0004xZ-Ep for patchwork@mira.cbaines.net; Wed, 02 Oct 2019 06:01:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51236) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFbQi-0003v8-0z for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iFbQc-0000BK-Bm for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:19 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54924) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iFbQc-0000BD-7s for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:14 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iFbQc-0000aZ-4Q for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:14 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v4 15/23] gnu: libnl: Move python outputs to separate packages. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 02 Oct 2019 10:00: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 Cc: Mathieu Othacehe Received: via spool by 36477-submit@debbugs.gnu.org id=B36477.15700103911948 (code B ref 36477); Wed, 02 Oct 2019 10:00:14 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Oct 2019 09:59:51 +0000 Received: from localhost ([127.0.0.1]:35473 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFbQC-0000V7-BU for submit@debbugs.gnu.org; Wed, 02 Oct 2019 05:59:48 -0400 Received: from mail-wm1-f54.google.com ([209.85.128.54]:51815) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFbQA-0000TZ-03 for 36477@debbugs.gnu.org; Wed, 02 Oct 2019 05:59:47 -0400 Received: by mail-wm1-f54.google.com with SMTP id 7so6492551wme.1 for <36477@debbugs.gnu.org>; Wed, 02 Oct 2019 02:59: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 :mime-version:content-transfer-encoding; bh=bMZVx5p0lHmdJ0EPD5SDFt3TVr+vXSj9rkCXvPV1yGc=; b=PmhWya3N0X87//IIE7Kg/4neDOjybwCcQDoAVbc3fuAU39MPR9endGGDCJdQ/n6W82 1SWI0InXMBlDlhBIxgtxSuXNb6mujH90/OdQW/t1NmlcLXL7rae5hTGtKKUKhJRf7R+2 DSw6C3zzSGoYcDXi04Bb3VZOkRSJws5F8XJPs4PYkkGmuMQaolD1crneaDZFou76Eqdq zBYPhTtEo2yNilDtCzorhgJg0bmq9czRB9cr3HeQdnfzaU16YpBdcj9Em818EogAZSoi LSGuwnXUFKwwtl7elPRrYfogk18v1cyYtQKCwR+fBqAvQIyKzQ+exgfloOR58ExTJjFb gQyg== 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=bMZVx5p0lHmdJ0EPD5SDFt3TVr+vXSj9rkCXvPV1yGc=; b=d+7aFNoQmQiX3zsWba8pUaEy7i/Wuirx26jtrej1le42Qfsu91vJbx7/cPxTB5Vp69 pG07mlvG7kRUwR8pFhlqSroaP8OdO5Y/qYdeK+jBYngvep+NzKWwCm2jy5v0bmTYrYNx Ej8ZahkzZ/wEUXjARlNHqeBUFeIHR0K9OC0W0ln0GiZxUCoj5hn1GyPnsE+EqvJr+r9w l3HPJWMujGy7yQ89NLh+TQjlnhmOvFRznjeU7OJSL6YRUI3Ld4iXQORNiIltSljksEcM ByW8j6MVajF/1PXHmx/rMTzcVTTp6JWRR5QklBcEROxLQVlnKVdzYXWAz+Ttj3PMH1pu BM6Q== X-Gm-Message-State: APjAAAVFEDRnEX0nFYp3zmfIYPuDXKLo+M3HdUjiDu+lsluFiUuSv5be qj6XIkHHoGHhsX8abVxaUckdZiOX X-Google-Smtp-Source: APXvYqyvr08FuyB6/YN6GMR/cymk4lhli0vlwMLeEhRQemRmM/V7w6JBIqbUd/1fTWagmDAiLBa0Tg== X-Received: by 2002:a1c:3b06:: with SMTP id i6mr2161128wma.6.1570010379913; Wed, 02 Oct 2019 02:59:39 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:fa:a50:21e:67ff:fe5b:4283]) by smtp.gmail.com with ESMTPSA id w12sm29621318wrg.47.2019.10.02.02.59.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Oct 2019 02:59:39 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 2 Oct 2019 11:58:56 +0200 Message-Id: <20191002095904.6325-16-m.othacehe@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191002095904.6325-1-m.othacehe@gmail.com> References: <20191002095904.6325-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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Cross compiling python extensions is currently broken. To allow libnl cross compilation, move its python2 and python3 outputs to separate packages. * gnu/packages/linux.scm (libnl)[outputs]: Remove python2 and python3 and replace by ... (libnl-python-package): ... this new procedure, (libnl-python2, libnl-python3): new variables. --- gnu/packages/linux.scm | 66 +++++++++++++++++++++++++++--------------- 1 file changed, 43 insertions(+), 23 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index c40072a706..8ba3c7d9db 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1953,35 +1953,18 @@ transparently through a bridge.") "/libnl-doc-" version ".tar.gz")) (sha256 (base32 "19p5y8q3cm5wqvamqc4s5syxnnkvzxy3gw8ivxk6fv9ybn8jm35h")))))) - (inputs - `(("python-2" ,python-2) - ("python-3" ,python-3))) - (outputs '("out" "doc" "python2" "python3")) + (outputs `("out" "doc")) (arguments - `(#:modules ((guix build gnu-build-system) - (guix build utils) - (srfi srfi-1)) - #:phases + `(#:phases (modify-phases %standard-phases - (add-after 'install 'install-python - (lambda* (#:key outputs #:allow-other-keys) - (define (python-inst python) - (invoke python "setup.py" "build") - (invoke python "setup.py" "install" - (string-append "--prefix=" - (assoc-ref %outputs python))) - (invoke python "setup.py" "clean")) - (setenv "LDFLAGS" (format #f "-Wl,-rpath=~a/lib" - (assoc-ref %outputs "out"))) - (with-directory-excursion "./python" - (for-each python-inst '("python2" "python3"))) - #t)) (add-after 'install 'install-doc - (lambda* (#:key inputs outputs #:allow-other-keys) + (lambda* (#:key inputs native-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") @@ -1996,6 +1979,43 @@ configuration and monitoring interfaces.") ;; 'nl-addr-add.c'), so the result is GPLv2-only. (license license:gpl2))) +;; libnl python extensions used to be outputs of libnl. However, as +;; cross-compiling python extensions is currently broken, create separate +;; packages for libnl python extensions. +(define (libnl-python-package python) + (let ((name (string-append "libnl-" python))) + (package + (inherit libnl) + (name name) + (inputs `(,@(cond + ((string=? python "python2") + `(("python-2" ,python-2))) + ((string=? python "python3") + `(("python-3" ,python-3)))))) + (propagated-inputs `(("libnl" ,libnl))) + (outputs '("out")) + (arguments + `(#:modules ((guix build gnu-build-system) + (guix build utils) + (srfi srfi-1)) + #:phases + (modify-phases %standard-phases + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + (define (python-inst python) + (invoke python "setup.py" "build") + (invoke python "setup.py" "install" + (string-append "--prefix=" + (assoc-ref %outputs "out"))) + (invoke python "setup.py" "clean")) + (setenv "LDFLAGS" (format #f "-Wl,-rpath=~a/lib" + (assoc-ref inputs "libnl"))) + (with-directory-excursion "./python" (python-inst ,python)) + #t)))))))) + +(define-public libnl-python2 (libnl-python-package "python2")) +(define-public libnl-python3 (libnl-python-package "python3")) + (define-public iw (package (name "iw") From patchwork Wed Oct 2 09:58: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: 15576 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 95D371749F; Wed, 2 Oct 2019 11:02:33 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 4CA121749D for ; Wed, 2 Oct 2019 11:02:33 +0100 (BST) Received: from localhost ([::1]:53188 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFbSq-0005iQ-B9 for patchwork@mira.cbaines.net; Wed, 02 Oct 2019 06:02:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51172) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFbQe-0003py-Sr for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iFbQc-0000Bp-Ua for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:16 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54925) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iFbQc-0000Bb-OZ for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:14 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iFbQc-0000ag-MF for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:14 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v4 16/23] gnu: crda: Fix cross-compilation Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 02 Oct 2019 10:00: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 Cc: Pierre-Moana Levesque Received: via spool by 36477-submit@debbugs.gnu.org id=B36477.15700103921974 (code B ref 36477); Wed, 02 Oct 2019 10:00:14 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Oct 2019 09:59:52 +0000 Received: from localhost ([127.0.0.1]:35478 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFbQF-0000VL-E8 for submit@debbugs.gnu.org; Wed, 02 Oct 2019 05:59:52 -0400 Received: from mail-wr1-f47.google.com ([209.85.221.47]:34114) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFbQB-0000Tf-2y for 36477@debbugs.gnu.org; Wed, 02 Oct 2019 05:59:47 -0400 Received: by mail-wr1-f47.google.com with SMTP id a11so18930192wrx.1 for <36477@debbugs.gnu.org>; Wed, 02 Oct 2019 02:59: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=f9d2DupjaRkm32OV4QRDWYYLU6ZUt74gh28I9p+wHu4=; b=XC54AODPrhYgKHwAP6sm1fRm6mTuOMoIbvwreFtELQb2zGdB5BviUszbyTEj+pMpQ5 U+wLJQk/nCTV29hIFi986iakSdfR5V/dr10JBX67rwrmUaYTMA8O4J/ZfgikrN2eNin1 nG7ZIZIYM5gwm0BQlqX8FnJEnRkeXkYJeYBSBnpDzxW1J8AEL1SEMUTKZSYVQOVJpVNa rjKSo3ieZoRXb/xjOPee6F5B7+JxMFGgLKtpXii4pW2oHDScrkmxJWCfVaWi27++Glei ACAnnlWBiFnxDDgeAcaq0Iv0ef2ZIthRdDrWSQPTTFwk9xYZI+Y4yXPUBuUzE3v+TrnR dARw== 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=f9d2DupjaRkm32OV4QRDWYYLU6ZUt74gh28I9p+wHu4=; b=jXusHAlYIl+wtb8EdEaa8SKTfQW5c1z8JVbbumdAWxG7AvqyCKXkfAKoM7uwUVTYgI VAu0P21LBPDawwbwXLSGfzBLaPFQuSeGt3SbsUADvwKKBt5I+hL0kiEVxGXEId+xATK1 EPx9LXXJvrVBh3Nqtm+U+xh5IrUk9iRqvuWX0nju9qXB/N8UtDoyVrNRF2JO+HF8kexA hAeHm1fmWRB5p1N5JaK23NfaypJsrTE6p+Db+zSv1LiGPUCmip9rc9+pbd4VHyh92Gid shkAg1yvMzIe1Cs0Pz+tVB8elUmFljfeizwxZZ/vX7IX8QID1A7MgaOD76N4Tk9tSgpk 2DjA== X-Gm-Message-State: APjAAAUrbO3OTmgmwEiFwh4nmGt0Pv1vR1r64C1+EPCpPSRXxrlc3v9M 0e3bNoJFYzPmURKDetDa6DkBecxh X-Google-Smtp-Source: APXvYqyuwa4pFCvXz7/MJ0NGZZWjnEMViSHA5GCiBEmmpH4u1IJAWVDfIFD36W9N4FGvhsZ+IY6ZFg== X-Received: by 2002:adf:df91:: with SMTP id z17mr1976739wrl.116.1570010381081; Wed, 02 Oct 2019 02:59:41 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:fa:a50:21e:67ff:fe5b:4283]) by smtp.gmail.com with ESMTPSA id w12sm29621318wrg.47.2019.10.02.02.59.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Oct 2019 02:59:40 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 2 Oct 2019 11:58:57 +0200 Message-Id: <20191002095904.6325-17-m.othacehe@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191002095904.6325-1-m.othacehe@gmail.com> References: <20191002095904.6325-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: , 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 8ba3c7d9db..177c8f44ed 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2810,13 +2810,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 _ @@ -2826,37 +2836,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 Oct 2 09:58:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15573 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 1F0021749F; Wed, 2 Oct 2019 11:02: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 D1FE61749D for ; Wed, 2 Oct 2019 11:02:14 +0100 (BST) Received: from localhost ([::1]:53174 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFbSX-0005IJ-IU for patchwork@mira.cbaines.net; Wed, 02 Oct 2019 06:02:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51185) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFbQf-0003rn-RT for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iFbQe-0000DT-7T for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:17 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54927) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iFbQe-0000DH-2F for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:16 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iFbQd-0000aw-WA for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:16 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v4 17/23] gnu: cmake: Fix cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 02 Oct 2019 10:00: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 Cc: Pierre-Moana Levesque Received: via spool by 36477-submit@debbugs.gnu.org id=B36477.15700104002011 (code B ref 36477); Wed, 02 Oct 2019 10:00:15 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Oct 2019 10:00:00 +0000 Received: from localhost ([127.0.0.1]:35486 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFbQO-0000WG-3D for submit@debbugs.gnu.org; Wed, 02 Oct 2019 06:00:00 -0400 Received: from mail-wr1-f46.google.com ([209.85.221.46]:46317) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFbQC-0000Tj-8V for 36477@debbugs.gnu.org; Wed, 02 Oct 2019 05:59:48 -0400 Received: by mail-wr1-f46.google.com with SMTP id o18so18863254wrv.13 for <36477@debbugs.gnu.org>; Wed, 02 Oct 2019 02:59: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=91OABdlYn72zL0DZFbIX36KhKVOqZA7+Wim8dmBlUUc=; b=iKF+uzBCkupYjg1Ee0j88G4qBwU812wHjN7dx5WKmpuLMn8oDLIR7h/kSovhvV9ocU hsVJqRqYTJ2WCuJgYhhrAKU8m9f3ZcIZ1sj6XrCPbDdpZqELBmzLBIVNspNSPKJB6O0U Lt4QQohSkYLyzAvIA0ryEClN/osqq9WHY0r2bkezk15KP8AHZP5qziBTdMkTF5dMdOHT iDuJmGl6Do6sDy3pEUWldCexAZCLNZOrHdewpUrkLNujG8YHqkvSqHZGezPHxzJnUhIM QJsSnN1QHVipUnB70Vd7nwLOkPHjqXrH8CrZm90VY59dFz/EPEqRsju4i/AuOV92WKhv XwOg== 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=91OABdlYn72zL0DZFbIX36KhKVOqZA7+Wim8dmBlUUc=; b=puRXxjbuTzP9qLHZqsCDfrUn1t4CRzvb0Cxs3XLNR+0wGHeqEJ/CfZpKpnQeKCEkkO 0vWCal8fcf8tkZevB7e6FqvA/RdqsDFatLlwmBOOAvP0l7L5LidvgIJuEu/vL8CMWRk3 iD3oLfUc2ljQCH5qBeDHOPABiqOexXYAqNiSAXh1xax8DMwPyTYVkx9SZ9Hox2AY1U/H K3T/8uKXsr1E1yaOpGJKBOMdryGZGBuBNPG4JvZ1pjbMckMpqJO7A4h/JKadcXl2riCP /0OP1zN4rMZYQvUcJ1qI5Ul08jhnUfoNms4+uenXfK2uXDynCopnLo0/G6fe0q54jZK7 Rt9A== X-Gm-Message-State: APjAAAVhsLDQQi4nY7uOApSxh3pqHrdzqnAL+ydVVjo5o/v5QMaDncu8 pqcxN5R+lUif6AqEUT04s5txJj1C X-Google-Smtp-Source: APXvYqwAMlw8FKfxTgDkgP1fxkWxb4jcA0nUuFS4755DGByAs926Vlk4EM/35OqDUshXmUeHfJ/L+g== X-Received: by 2002:adf:ef0d:: with SMTP id e13mr2083242wro.300.1570010382396; Wed, 02 Oct 2019 02:59:42 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:fa:a50:21e:67ff:fe5b:4283]) by smtp.gmail.com with ESMTPSA id w12sm29621318wrg.47.2019.10.02.02.59.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Oct 2019 02:59:41 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 2 Oct 2019 11:58:58 +0200 Message-Id: <20191002095904.6325-18-m.othacehe@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191002095904.6325-1-m.othacehe@gmail.com> References: <20191002095904.6325-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: , 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 13252a9486..b9ac84ad7e 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 Oct 2 09:58: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: 15569 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 BE9D81749F; Wed, 2 Oct 2019 11:01:46 +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 84BF71749D for ; Wed, 2 Oct 2019 11:01:46 +0100 (BST) Received: from localhost ([::1]:53164 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFbS5-0004wG-72 for patchwork@mira.cbaines.net; Wed, 02 Oct 2019 06:01:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51210) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFbQg-0003tu-Md for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iFbQf-0000Fx-HA for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:18 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54929) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iFbQf-0000FZ-Ce for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:17 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iFbQf-0000bC-90 for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:17 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v4 18/23] gexp: Use cross extensions when cross-compiling. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 02 Oct 2019 10:00: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 Cc: Mathieu Othacehe Received: via spool by 36477-submit@debbugs.gnu.org id=B36477.15700104012025 (code B ref 36477); Wed, 02 Oct 2019 10:00:17 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Oct 2019 10:00:01 +0000 Received: from localhost ([127.0.0.1]:35490 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFbQO-0000WV-WB for submit@debbugs.gnu.org; Wed, 02 Oct 2019 06:00:01 -0400 Received: from mail-wr1-f53.google.com ([209.85.221.53]:35658) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFbQD-0000Tx-G0 for 36477@debbugs.gnu.org; Wed, 02 Oct 2019 05:59:51 -0400 Received: by mail-wr1-f53.google.com with SMTP id v8so18931199wrt.2 for <36477@debbugs.gnu.org>; Wed, 02 Oct 2019 02:59: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=HGGC5cnMC+U7ZmgjSzc08ZtmZFHmQilbx9Zkvxk//Ac=; b=rIeO3fARGTTB6KLwwFxypngGrBdURtNA8EckuphngnKI4XV78ZNeJGuxnVESF4Oxut 1sBhddYd95y2qIhZXm7+gZqqPDfImk5V1PV8YaLy3UXtIkoPSbZTioinEDvrbRSd/4i7 tC8RWFpYIxJf+koKDIPWzpu7q5UMSH6m1ctldyJ/I9rDnwNVC0yPydGjFRoEQnC53A4c CYdNz95QyQfAKH5nVmYvvHf3a3roMIDlZBXfOxO3XxhvC3s+6mHmBbaRI84lmlM9NcQF LsyYVXT4L5GAjKpCPnuwJac0ORBS2JCnlnLaTTbF77rkGgZkxlqOeXy584NjFFGgMEJQ 8jvQ== 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=HGGC5cnMC+U7ZmgjSzc08ZtmZFHmQilbx9Zkvxk//Ac=; b=eNK9oHDsdz9m82ZQucwsVCMlJzxMX0I5RhP3hisYpulfeLb4aN5hIitXcpA9zHWbQs iR6YR99cw0TA1yOssldKMn7lFDXf6YRoMCdcEHeehjve4115RC6N+n/WYhCFBshXKmM8 8zgMSrIvN8HCo9ERWR9UHDwn21PzTRjoEmxGw/oHSglVy42PX1pdDCjkB2FIrmsh+UJg jMGQBCvWwnyIaxvQDiB736VaSE/eQBW3YG907v6IljWWYBmY1Zh85hzzwQi2z3VdmrTy ygkjCaL6upD2OHzw+mUcrqtUY4uosN5WBMtGeKbjDFnYTWQ/3PkrcXpUY9AP8z681IPb XPng== X-Gm-Message-State: APjAAAVIICNW61B5aQ6+ZNB1XXGeZ6bEvJjR/cycRz0G0V2I5Lf3+nFf F1T3VxsWNNLpygD1p+NyF4O34sCh X-Google-Smtp-Source: APXvYqxAzimb8sO9cj3XeD2tGLnuNH8V3ZwUbDUl/NZzERKYp7sjZU0+NgPaTLkuMWnJXD5zsSXv6g== X-Received: by 2002:a5d:428d:: with SMTP id k13mr1974159wrq.305.1570010383492; Wed, 02 Oct 2019 02:59:43 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:fa:a50:21e:67ff:fe5b:4283]) by smtp.gmail.com with ESMTPSA id w12sm29621318wrg.47.2019.10.02.02.59.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Oct 2019 02:59:42 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 2 Oct 2019 11:58:59 +0200 Message-Id: <20191002095904.6325-19-m.othacehe@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191002095904.6325-1-m.othacehe@gmail.com> References: <20191002095904.6325-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: , 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 Oct 2 09:59: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: 15562 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 0AA741749F; Wed, 2 Oct 2019 11:01: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 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 84DB31749E for ; Wed, 2 Oct 2019 11:01:09 +0100 (BST) Received: from localhost ([::1]:53148 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFbRU-0004KK-G6 for patchwork@mira.cbaines.net; Wed, 02 Oct 2019 06:01:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51195) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFbQf-0003sp-V0 for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iFbQe-0000F8-QN for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:17 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54928) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iFbQe-0000EM-MV for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:16 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iFbQe-0000b4-JO for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:16 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v4 19/23] utils: Use target-aarch64? and target-arm? helpers. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 02 Oct 2019 10:00: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 Cc: Mathieu Othacehe Received: via spool by 36477-submit@debbugs.gnu.org id=B36477.15700104012018 (code B ref 36477); Wed, 02 Oct 2019 10:00:16 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Oct 2019 10:00:01 +0000 Received: from localhost ([127.0.0.1]:35488 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFbQO-0000WO-Kg for submit@debbugs.gnu.org; Wed, 02 Oct 2019 06:00:00 -0400 Received: from mail-wr1-f53.google.com ([209.85.221.53]:45909) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFbQE-0000UH-9e for 36477@debbugs.gnu.org; Wed, 02 Oct 2019 05:59:51 -0400 Received: by mail-wr1-f53.google.com with SMTP id r5so18858700wrm.12 for <36477@debbugs.gnu.org>; Wed, 02 Oct 2019 02:59:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Z32VsnVCIp4SlMoUBOL6TJuR/uSgqcuRy8t1NNgMBhc=; b=DRNitoTKngABm8MDI6W63ie2510dL1thh9L7xi3tLkPzDNSktOlE6wB4N2Z03yICAR FTTbSE8witKApY0qucoLoeB8ALNQixqSXv/UYmj+dA3PxlZR87lPC+ynv6zW/71xDs6C 25ax+w0XSA592JhLqTqcLAJAH8XbJVtFRNoh5NsRJ3Udw9YlMr8ASXDvdWZ77cjazJnu KGQOyKVf6irbwPpXJMHEVwbdPOzT7R09BomLQO9pmJNMilyQOQlFd1IrJY2WOsgCsWzt az4710szRi2NeEryvWagxgOOHSwwXvO9xR+C7fo61mMFv1CWWFkSIj928vcjGMBuljfp EfqA== 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=Z32VsnVCIp4SlMoUBOL6TJuR/uSgqcuRy8t1NNgMBhc=; b=PoDBwYdBKFSkJgUcG1t6QF/kO/IppT3REkhwAi7IRGza/Vn6Fuk+g947kg+S9YgrH+ IJfSECIF79dx5W1GCwAyxasHo6c7n3KVLRzwrti3z63V6qxn/KG+gK491AqUmzTPYDSX 3AsAJIhtWXQsHjkfdIewDE7U72tCoVX/8fNp/kQV0iunRR5G1/7+tUOFJHQf1WqUxtHB 6WDZhY/CTPoKA8ej17jDhP3X6XxMOj4EI3l03hsJB/3iOS1pChYONlqRtOfL2KfYKMbf 0i82th0L6xrsOP0a1++lN92klxx/oJgl4L04BGXljUYHKygQyVdq3ehJpht9FiiCj+Y+ ezsA== X-Gm-Message-State: APjAAAWecCawXtwpkS/k12uNGBn9ytFNUqnShTazsokCjz7ZAMEr/9LM nUWSoagrJonhtYSE8Byc6HPP+WUz X-Google-Smtp-Source: APXvYqxXWKq73HoAvMsMoB4mXIzpiRcqaqYUL8dcdKI+HpC/iJXwlLXzxTKqO0fDaxQW8Es9D/eqJw== X-Received: by 2002:a5d:6885:: with SMTP id h5mr2037367wru.92.1570010384403; Wed, 02 Oct 2019 02:59:44 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:fa:a50:21e:67ff:fe5b:4283]) by smtp.gmail.com with ESMTPSA id w12sm29621318wrg.47.2019.10.02.02.59.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Oct 2019 02:59:43 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 2 Oct 2019 11:59:00 +0200 Message-Id: <20191002095904.6325-20-m.othacehe@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191002095904.6325-1-m.othacehe@gmail.com> References: <20191002095904.6325-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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * guix/utils.scm (target-aarch64?, 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 1f99c5b3f5..c9236ad165 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -78,6 +78,8 @@ package-name->name+version target-mingw? target-arm32? + target-aarch64? + target-arm? target-64bit? version-compare version>? @@ -494,6 +496,12 @@ a character other than '@'." (define (target-arm32?) (string-prefix? "arm" (or (%current-target-system) (%current-system)))) +(define (target-aarch64?) + (string-prefix? "aarch64" (or (%current-target-system) (%current-system)))) + +(define (target-arm?) + (or (target-arm32?) (target-aarch64?))) + (define (target-64bit?) (let ((system (or (%current-target-system) (%current-system)))) (any (cut string-prefix? <> system) '("x86_64" "aarch64" "mips64" "ppc64")))) From patchwork Wed Oct 2 09:59:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15574 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 2DA8E1749F; Wed, 2 Oct 2019 11:02: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 E660F1749D for ; Wed, 2 Oct 2019 11:02:20 +0100 (BST) Received: from localhost ([::1]:53176 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFbSd-0005NU-Gt for patchwork@mira.cbaines.net; Wed, 02 Oct 2019 06:02:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51230) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFbQh-0003us-Kt for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iFbQg-0000HC-6G for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:19 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54930) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iFbQg-0000H2-1k for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:18 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iFbQf-0000bJ-U1 for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:17 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v4 20/23] build: vm: Fix arm32 support. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 02 Oct 2019 10:00: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 Cc: Mathieu Othacehe Received: via spool by 36477-submit@debbugs.gnu.org id=B36477.15700104012033 (code B ref 36477); Wed, 02 Oct 2019 10:00:17 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Oct 2019 10:00:01 +0000 Received: from localhost ([127.0.0.1]:35492 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFbQP-0000Wc-8e for submit@debbugs.gnu.org; Wed, 02 Oct 2019 06:00:01 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:38010) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFbQF-0000Ue-Ik for 36477@debbugs.gnu.org; Wed, 02 Oct 2019 05:59:52 -0400 Received: by mail-wr1-f67.google.com with SMTP id w12so18904307wro.5 for <36477@debbugs.gnu.org>; Wed, 02 Oct 2019 02:59:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eunw+BE1POGTlpEUjHEnI30eWh4037FKsWvm0c+d6yg=; b=JS7iozppw6WyVsPXtOatdzHiE4Ko89ubxwl/rBGIDUsN7AZ5B0ckZgyEEgz1Bf41ir omLBW9VbC/vwLrpnqxuQZ/lEax4eyjR5cnRXmkzRGj5qLRDZ+8A4vn9FOShUaCvAgc/N tgOxcCa4rU/eCNwDJ+1Yv/QMrewUPlf61PEKfIGw2yXl8neJzkd0i8JBqEejMSnysQgG hPDY4WW3rndCz8O0YAB2F8rh+tTnycspSGPVeNQi5w3bI8LIfhGHg/a+osYQ7w14KbPQ YXuJW7PBjeE2scQqN30FWTSDt/6RaOZQmYG/6a3jCCfvt92Z9eRRnDUmU4CEoPvEifhk cHyg== 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=eunw+BE1POGTlpEUjHEnI30eWh4037FKsWvm0c+d6yg=; b=H5tbByvVILV4VW52P8yX5PQSru6EB2ioG9cB3k5s+rEuhxkVrAL+W1fhGKYQW6rKOu qYDoKojvvUxIsFtkJZelVn6etM6kYJRM2HY+T35FlBE80KiqMimtzJVtzp751ikS7hIJ CRqzq0/+zt12FyWYXZQZbIW6UJ5zAwVZ7BpWsHxlLi4uPZ9MadCfFnWe85R84mPiz5qY zI/N61kQGsgiaojV5bz79p6AfQRKLp5lcs/lHsmv0J7KhTBj800DxM6wMNSt//0mkjAx SYkSycxSKaNKT4Z/dmErLocrQO7VR1UEEfhkSSBmE4YN8TidLq48zLh4E/AbWf+bbUYB 9N6w== X-Gm-Message-State: APjAAAWPQ1ArvzDa9f3dnAocL7vU+7qd8edKBcfhIKZCfuCIsizKev9b P65eHpzjnP3xqplaKDftQ95elLeh X-Google-Smtp-Source: APXvYqzTXoio/v8O4WwMDjniH4gxmYGm+vh3NjNsksDUEkr/CX99hJZlyIuxQesUXHmIClDr95S4Ng== X-Received: by 2002:a5d:6242:: with SMTP id m2mr1959451wrv.261.1570010385699; Wed, 02 Oct 2019 02:59:45 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:fa:a50:21e:67ff:fe5b:4283]) by smtp.gmail.com with ESMTPSA id w12sm29621318wrg.47.2019.10.02.02.59.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Oct 2019 02:59:44 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 2 Oct 2019 11:59:01 +0200 Message-Id: <20191002095904.6325-21-m.othacehe@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191002095904.6325-1-m.othacehe@gmail.com> References: <20191002095904.6325-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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/build/vm.scm (load-in-linux-vm): Disable qemu highmem support on ARM32 systems. --- gnu/build/vm.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index a5d9fefa62..b85398ed24 100644 --- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -102,6 +102,14 @@ the #:references-graphs parameter of 'derivation'." ;; hardware limits imposed by other machines. ,@(if target-arm32? '("-M" "virt") '()) + ;; On ARM32, if the kernel is built without LPAE support, ECAM conflicts + ;; with VIRT_PCIE_MMIO causing PCI devices not to show up. Disable + ;; explicitely highmem to fix it. + ;; See: https://bugs.launchpad.net/qemu/+bug/1790975. + ,@(if target-arm32? + '("-machine" "highmem=off") + '()) + ;; Only enable kvm if we see /dev/kvm exists. This allows users without ;; hardware virtualization to still use these commands. KVM support is ;; still buggy on some ARM32 boards. Do not use it even if available. From patchwork Wed Oct 2 09:59:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15575 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 029BD1749F; Wed, 2 Oct 2019 11:02:32 +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 A3C8E1749D for ; Wed, 2 Oct 2019 11:02:31 +0100 (BST) Received: from localhost ([::1]:53186 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFbSo-0005gd-8V for patchwork@mira.cbaines.net; Wed, 02 Oct 2019 06:02:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51245) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFbQi-0003vb-Hy for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iFbQg-0000Hq-M7 for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:20 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54931) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iFbQg-0000Hg-I8 for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:18 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iFbQg-0000bR-FH for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:18 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v4 21/23] system: vm: Add arm64 support. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 02 Oct 2019 10:00: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 Cc: Mathieu Othacehe Received: via spool by 36477-submit@debbugs.gnu.org id=B36477.15700104052087 (code B ref 36477); Wed, 02 Oct 2019 10:00:18 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Oct 2019 10:00:05 +0000 Received: from localhost ([127.0.0.1]:35494 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFbQP-0000Wk-O0 for submit@debbugs.gnu.org; Wed, 02 Oct 2019 06:00:02 -0400 Received: from mail-wr1-f44.google.com ([209.85.221.44]:38495) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFbQG-0000Uw-Ni for 36477@debbugs.gnu.org; Wed, 02 Oct 2019 05:59:53 -0400 Received: by mail-wr1-f44.google.com with SMTP id w12so18904367wro.5 for <36477@debbugs.gnu.org>; Wed, 02 Oct 2019 02:59:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=afuyksv9Cdb3+PcqCSw94KVmoYGR3A+lQiujjfQeOWc=; b=hlXxSgqBWXLnedLIX2PilbF41PwGH/WoropHlJg/iJJs5nqqzfH8kadQbgivXSgYIg 0O83bMI1OCcanRlERglXBs9LiO2wvBZ44b39JObuWmQCt2x1y9FvsSvqsJ5qtn4yauvR uwFmmrdd7gYy922vQnORICyUaPJ99W37Cmf0/BqCY73FkeFxDQjSMCrw1LMRE7RRuUBG BLrng3cxD44I2gSM+LPgkDUAlheWt0ee63a7H5NjJYPwcO1lJSKr3mWWVUs1u2yOm2Jm h+V4EUdGYJoloHoDtEWJgP0bRN1MCiuykknh8zWRTY0Tm2t4nKjr/yA1HODuwQ32VuIe WX5w== 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=afuyksv9Cdb3+PcqCSw94KVmoYGR3A+lQiujjfQeOWc=; b=GRwgUS0GH1LEObn3WyXXchzGiu74657CdvktuHsr5Su4Ypxy6j/oPMVZBts2KjCbnt nA+Bi6yWspZsbaNEwpFTUiKiZcIFeu+oMhzVjHgIEKvdWvH8PHecl58p7vmNtAqv6WfB 3Ar8vKwsn1p6GxNc47/+sT9CEKMUm8bJnYKR7g/jDeOWyUDUiYVQl2vA9vCgnrzQVPd4 k1baejpgv4WDXPG8T14CzZI+YMxeSyJeWPKbV+ZoaGIjlYwAjzo+X63S+Kni14M9grOu f3jTYuTDNWNmZliBwAAst7gkAT3xwluIViTOJsDwnTxjBPSCp8W55RlujyVoiY9Lblok kCNw== X-Gm-Message-State: APjAAAXVQMmo+G+S31x+gPhSIEKGWZSV7lm++dEFuFRXHc4vuk1xtJBZ 2p3b+PTAnFENr9d/kvutihpr+pH1 X-Google-Smtp-Source: APXvYqwROISJTi4/lHeyjekLKtHSQN1FgV6TV/RGE1hhU/faFvlKLrQCTk71PbkAHwEKqanwSDWDPQ== X-Received: by 2002:adf:dc43:: with SMTP id m3mr1967958wrj.118.1570010386706; Wed, 02 Oct 2019 02:59:46 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:fa:a50:21e:67ff:fe5b:4283]) by smtp.gmail.com with ESMTPSA id w12sm29621318wrg.47.2019.10.02.02.59.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Oct 2019 02:59:45 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 2 Oct 2019 11:59:02 +0200 Message-Id: <20191002095904.6325-22-m.othacehe@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191002095904.6325-1-m.othacehe@gmail.com> References: <20191002095904.6325-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: , 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 | 19 +++++++++++++------ gnu/system/vm.scm | 15 +++++++++------ 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index b85398ed24..6f920aec9e 100644 --- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -82,6 +82,7 @@ make-disk-image? single-file-output? target-arm32? + target-aarch64? (disk-image-size (* 100 (expt 2 20))) (disk-image-format "qcow2") (references-graphs '())) @@ -97,10 +98,14 @@ access it via /dev/hda. REFERENCES-GRAPHS can specify a list of reference-graph files as produced by the #:references-graphs parameter of 'derivation'." + (define target-arm? (or target-arm32? target-aarch64?)) + (define arch-specific-flags `(;; On ARM, a machine has to be specified. Use "virt" machine to avoid ;; hardware limits imposed by other machines. - ,@(if target-arm32? '("-M" "virt") '()) + ,@(if target-arm? + '("-M" "virt") + '()) ;; On ARM32, if the kernel is built without LPAE support, ECAM conflicts ;; with VIRT_PCIE_MMIO causing PCI devices not to show up. Disable @@ -112,9 +117,9 @@ the #:references-graphs parameter of 'derivation'." ;; Only enable kvm if we see /dev/kvm exists. This allows users without ;; hardware virtualization to still use these commands. KVM support is - ;; still buggy on some ARM32 boards. Do not use it even if available. + ;; still buggy on some ARM boards. Do not use it even if available. ,@(if (and (file-exists? "/dev/kvm") - (not target-arm32?)) + (not target-arm?)) '("-enable-kvm") '()) @@ -125,11 +130,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")))) @@ -153,7 +158,9 @@ the #:references-graphs parameter of 'derivation'." (_ #f)) (apply invoke qemu "-nographic" "-no-reboot" - "-smp" (number->string (parallel-job-count)) + ;; CPU "max" behaves as "host" when KVM is enabled, and like a system + ;; CPU with the maximum possible feature set otherwise. + "-cpu" "max" "-m" (number->string memory-size) "-object" "rng-random,filename=/dev/urandom,id=guixsd-vm-rng" "-device" "virtio-rng-pci,rng=guixsd-vm-rng" diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index ac6e4ded92..de20030848 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-aarch64?’ may not operate on the + ;; right system/target values. Rewrite ;; using ‘let-system’ when available. #:target-arm32? #$(target-arm32?) + #:target-aarch64? #$(target-aarch64?) #: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,11 @@ 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 #$(and (not (target-arm?)) 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 Oct 2 09:59:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 15578 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 027161749F; Wed, 2 Oct 2019 11:02:47 +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 A3EF31749D for ; Wed, 2 Oct 2019 11:02:46 +0100 (BST) Received: from localhost ([::1]:53198 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFbT4-00066L-6T for patchwork@mira.cbaines.net; Wed, 02 Oct 2019 06:02:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51262) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFbQj-0003wr-Kk for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iFbQh-0000JI-GZ for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:21 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54932) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iFbQh-0000IS-8f for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:19 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iFbQh-0000bY-5N for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:19 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v4 22/23] system: vm: Support cross-compilation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 02 Oct 2019 10:00: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 Cc: Mathieu Othacehe Received: via spool by 36477-submit@debbugs.gnu.org id=B36477.15700104062102 (code B ref 36477); Wed, 02 Oct 2019 10:00:19 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Oct 2019 10:00:06 +0000 Received: from localhost ([127.0.0.1]:35496 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFbQT-0000Xc-2W for submit@debbugs.gnu.org; Wed, 02 Oct 2019 06:00:06 -0400 Received: from mail-wr1-f53.google.com ([209.85.221.53]:46337) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFbQH-0000VD-Su for 36477@debbugs.gnu.org; Wed, 02 Oct 2019 05:59:54 -0400 Received: by mail-wr1-f53.google.com with SMTP id o18so18863534wrv.13 for <36477@debbugs.gnu.org>; Wed, 02 Oct 2019 02:59:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bdKkVLt+BVm4Z+Syhu8bkVqQiKe+9G9Ke1m+3w5lg6E=; b=UYQmAcCLMml0HdHFLhuRsBeAz7U0zlqauyl501IIMRo41XTDgwtMFBYAHQ0wGkKKxt 9+IIl3lfacIomDQ4gwUXMuKI1WXQ+aJZGJfVhuDH+CZK5qopLIPEFPDIrfvmGEFwLiGo ptnDITKaiaAHntT40V77Io/JZ//U72KeqgZ6NCtimk98Zcb0652QF2i3eQoRISXDFXUW /wXNs8lANUK675Ba1ZVGz+x/eRz66zbiGssnb5Ja2a3e89LlcHunH7y+v2brjUG0ZLhj gPegSh8agwMBFoDV0vJGB+WPAld4l3Q3lukTQpMSbcaVwOyjMZE3l4Qsma1NBptVRcnR KEqw== 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=bdKkVLt+BVm4Z+Syhu8bkVqQiKe+9G9Ke1m+3w5lg6E=; b=dpnpobDJ64aNsg9hvxo7xt9UzwgELVL7DOen2/YKjdWmpEz9rEZYHPGAa1+JgJPshh uHaD/O3kY2z3jaTCO/cdu4nkGpRrKdNdotXDKEdcM9fyMmJuyZRU1l6Gf90I64IR+9iJ cPbB9A+u69NrQlNeIgHJ0w5FAwPdyu+N1u/xw43Onta5vM8eDJwgnRx+8X+50cMyAhi4 Go4p7k4XQbc5A0SKxHVERhlZeRqAbDnPdQsHRL+6f8iLfWgQ2+q9NZpfMG3gjU4/5RBU J4HyT+nnepKAlE0OkI4MIx8nbdaxCCjbcmyDo5RNPCgw9qO6oADD1+U+P1M2ckxaND/g gwzQ== X-Gm-Message-State: APjAAAUFI2U4oqGZbfbmnoM4wYiBY7GUmotedFGj75nPft9L77xls0Fh ElnIb4LhLWgAG6/Dq5zgkbxTMRtB X-Google-Smtp-Source: APXvYqxUhebwNiuQdlgNOZnpwtyOLjhkM5LdczPt2d+m5/FV5Z0RkNzAwSbf4Bohd73jATtR06VZvQ== X-Received: by 2002:adf:f649:: with SMTP id x9mr1941165wrp.163.1570010387884; Wed, 02 Oct 2019 02:59:47 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:fa:a50:21e:67ff:fe5b:4283]) by smtp.gmail.com with ESMTPSA id w12sm29621318wrg.47.2019.10.02.02.59.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Oct 2019 02:59:46 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 2 Oct 2019 11:59:03 +0200 Message-Id: <20191002095904.6325-23-m.othacehe@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191002095904.6325-1-m.othacehe@gmail.com> References: <20191002095904.6325-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: , 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 and turn inputs into native-inputs. Pass target to qemu-command and gexp->derivation calls. (iso9660-image): Add target argument and pass it to expression->derivation-in-linux-vm. Remove qemu from inputs as it is not necessary. (qemu-image): Add target argument, also remove qemu from inputs. Pass target argument to expression->derivation-in-linux-vm call. --- gnu/system.scm | 15 ++++++++------- gnu/system/vm.scm | 18 +++++++++++++----- 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/gnu/system.scm b/gnu/system.scm index 37573fd153..fcd6203c70 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -447,20 +447,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 de20030848..c900b2d435 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* ((native-inputs + '#+(list qemu (canonical-package coreutils))) (linux (string-append #$linux "/" #$(system-linux-image-file-name))) (initrd #$initrd) @@ -222,16 +223,18 @@ 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") 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 +251,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))) @@ -263,6 +267,7 @@ made available under the /xchg CIFS share." file-system-label file-system-uuid (system (%current-system)) + (target (%current-target-system)) (qemu qemu-minimal) os bootcfg-drv @@ -299,7 +304,7 @@ 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)))) @@ -328,6 +333,7 @@ INPUTS is a list of inputs (as for packages)." #:volume-uuid #$(and=> file-system-uuid uuid-bytevector)))))) #:system system + #:target target ;; Keep a local file system for /tmp so that we can populate it directly as ;; root and have files owned by root. See . @@ -346,6 +352,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,7 +411,7 @@ system." (setlocale LC_ALL "en_US.utf8") (let ((inputs - '#$(append (list qemu parted e2fsprogs dosfstools) + '#$(append (list parted e2fsprogs dosfstools) (map canonical-package (list sed grep coreutils findutils gawk)))) @@ -481,6 +488,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 Oct 2 09:59: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: 15577 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 3527A1749F; Wed, 2 Oct 2019 11:02:35 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id D5CF41749D for ; Wed, 2 Oct 2019 11:02:34 +0100 (BST) Received: from localhost ([::1]:53192 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFbSr-0005mR-Kl for patchwork@mira.cbaines.net; Wed, 02 Oct 2019 06:02:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51266) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFbQj-0003xJ-O4 for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iFbQi-0000Jp-4C for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:21 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54933) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iFbQh-0000Jf-V0 for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:20 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iFbQh-0000bg-SN for guix-patches@gnu.org; Wed, 02 Oct 2019 06:00:19 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v4 23/23] scripts: system: Add --target option. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 02 Oct 2019 10:00: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 Cc: Mathieu Othacehe Received: via spool by 36477-submit@debbugs.gnu.org id=B36477.15700104072113 (code B ref 36477); Wed, 02 Oct 2019 10:00:19 +0000 Received: (at 36477) by debbugs.gnu.org; 2 Oct 2019 10:00:07 +0000 Received: from localhost ([127.0.0.1]:35499 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFbQU-0000Xs-4c for submit@debbugs.gnu.org; Wed, 02 Oct 2019 06:00:06 -0400 Received: from mail-wr1-f51.google.com ([209.85.221.51]:40945) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFbQJ-0000VF-41 for 36477@debbugs.gnu.org; Wed, 02 Oct 2019 05:59:55 -0400 Received: by mail-wr1-f51.google.com with SMTP id l3so18891057wru.7 for <36477@debbugs.gnu.org>; Wed, 02 Oct 2019 02:59:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gGzDC9XINHcELOvZUtkpK4S6cduxok+TUNoEMBeStfA=; b=K0J2gCkydrCEV/VQVoT5a1DRyKlTqVlQN7VmQpMpQCGzXFPiOzkKn1sGqXF619J4mi vmsd86WKvj8ktwkQVBHp/96eSSZ5k9ta6t4hUtE4Wg5WY25uR65Xr+mSZ7szm50n3Y7L shUppMKouSwbV0SPGPvsVV5JNykTKKV2c5j/vamXkl2F6hjmhQXKxsE+JCHI7nOo/VnG 5tM6TWuZXyb6s7UqVfgzgb+ra4Sxj52sGZgxYnBw9lrwrv9Ma5ikSY5WBqJUEen7p4vF LDFInK44p0+ouapN/bgi6gmDiMWIMZ3AnUaMecwmUT5OikV/8X1qjhIL+3mzsK4MTWCY T1Gw== 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=gGzDC9XINHcELOvZUtkpK4S6cduxok+TUNoEMBeStfA=; b=JPXH2d3jQa9x7GpV1gW3EzY1eWIjzFBbNVvQ7GTMqxP7GmTx6ekkv9oGGNof5c/b7C mOWpa5xKO+zEr9Jh6j2zhw9aGFyWVzULTWufelhkoSyFIOG0fjq38zPkpcpp++PYIcy8 57WVScKBIOVQcnH+HuQc2qABMbI22pXZ8VuRk13ErXqoJPPyis0afWZwg+b9jVYzhLGv CTee2s4S5xWplTkKDkN1PzUgmalbI85M1yMYXiwJkpLI0uA0IsnKoK81vJLdYGsOoI4l UlNT57bDlR3z2A/G0g0DFmBTZL1MEAeiqoeEoJphsPVbYN/ABS7E8+kBcitJre3ZlyKp 3SFA== X-Gm-Message-State: APjAAAWjXNhGToyzm8WXBrp4bfDWoAbFR78nIrWPfQQzYd+lZOzX3g2P Z8LKTejwCOw8mGRv1rLrZbqYEEFk X-Google-Smtp-Source: APXvYqx1lVdeanNXIo0u7tBbdI+oAg7CNjPcs1ItOx2M02Ogr23KvRr/QGIpQ5WzaYjG2iMp9NNJPg== X-Received: by 2002:adf:df91:: with SMTP id z17mr1977180wrl.116.1570010389121; Wed, 02 Oct 2019 02:59:49 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:fa:a50:21e:67ff:fe5b:4283]) by smtp.gmail.com with ESMTPSA id w12sm29621318wrg.47.2019.10.02.02.59.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Oct 2019 02:59:48 -0700 (PDT) From: Mathieu Othacehe Date: Wed, 2 Oct 2019 11:59:04 +0200 Message-Id: <20191002095904.6325-24-m.othacehe@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191002095904.6325-1-m.othacehe@gmail.com> References: <20191002095904.6325-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: , 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 27b014db68..d3e10b6dc7 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 ;;; @@ -931,6 +931,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) @@ -1004,6 +1006,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))) @@ -1012,6 +1018,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) @@ -1045,6 +1052,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 @@ -1061,7 +1069,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 @@ -1103,9 +1111,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)))