From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id 0AMGDV2rHGU13wAAG6o9tA:P1 (envelope-from ) for ; Wed, 04 Oct 2023 02:01:33 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id 0AMGDV2rHGU13wAAG6o9tA (envelope-from ) for ; Wed, 04 Oct 2023 02:01:33 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id EC64155930 for ; Wed, 4 Oct 2023 02:01:32 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=systemreboot.net header.s=default header.b="EI7bW/5z"; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=systemreboot.net (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1696377693; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=U/Fz33LhtLk4isXUvjyb0Fso8mIeh/PCkJIy4RuC6iQ=; b=WgRvXMZ11sKPCttJj9pJBqzFMZeAMm7mKfR4ZmWeq6SjZ1HGJWE9IjtyQmxnhAtK+xw0uJ 50E3QXLUQGh2b0/JTgxFexqbMsfxXEvY/FCeJI53zmhDzeBk3A2E1jwPPBEn8OIMQqDXFX 16g5dFVP0o72tcUxW1sEZF1p3dDzmfWqRtrxW1sIfr8/Hw+0+iJ4VjW9FOLTdVJe7vmhqc 00yNLudyVxYsZcQB63iOeLpbPOu6qKTDfoh2s51pP+RFXsQjL+6WwczQAU8He/4315wL30 M48dT+p7db3o/1ml9hIDEIqn26nwrCmpzo5Uaji4RQdjZdsCOu7j8OyaIiIXOQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=systemreboot.net header.s=default header.b="EI7bW/5z"; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=systemreboot.net (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1696377693; a=rsa-sha256; cv=none; b=Q8Knu3tNasUwQLU8ikvYyXfxhXkRPEMmrKo6/NVP8ytXdUx9r8ORp6PCG0Dv93B4iFmAJ1 U/FLzygFn3fAniISiqSgPQRIKgHQZr8ykHk/GU5iaSzROcbKVpiDL84YOIJ1G+gOqjbd5p OtU+FZnSHfeV75lQyC8SIcbobA6jL1/I8Rdke6sJhv/2/xDLKVqDwr2KzsHu4baAnMUuSY sihfCiVvq8j7WLhtj/6Mghb7nIV475gzMkfYxrjD9Lpc8Y6O/CKXF4kwA3vunIBhGtFXmN QfEmLPA/vyaVAHBQZmhIXF6ilEUnraVNlqrEEDQdaCnFL0Zo6S8GISI0+i0SnA== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qnpJu-0008B4-Vv; Tue, 03 Oct 2023 20:00:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qnpJm-00088y-7V for guix-patches@gnu.org; Tue, 03 Oct 2023 20:00:48 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qnpJl-0006sZ-RW for guix-patches@gnu.org; Tue, 03 Oct 2023 20:00:45 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qnpK2-0004x1-14; Tue, 03 Oct 2023 20:01:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65351] [PATCH v3 2/3] gnu: cgit: Fix cross compilation. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: arunisaac@systemreboot.net, liliana.prikler@gmail.com, , guix-patches@gnu.org Resent-Date: Wed, 04 Oct 2023 00:01:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65351 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65351@debbugs.gnu.org Cc: Arun Isaac , Arun Isaac , Liliana Marie Prikler , ( X-Debbugs-Original-Xcc: Arun Isaac , Liliana Marie Prikler , ( Received: via spool by 65351-submit@debbugs.gnu.org id=B65351.169637760918934 (code B ref 65351); Wed, 04 Oct 2023 00:01:01 +0000 Received: (at 65351) by debbugs.gnu.org; 4 Oct 2023 00:00:09 +0000 Received: from localhost ([127.0.0.1]:40931 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qnpJA-0004vI-Md for submit@debbugs.gnu.org; Tue, 03 Oct 2023 20:00:09 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:50590) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qnpJ7-0004ty-WF for 65351@debbugs.gnu.org; Tue, 03 Oct 2023 20:00:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=U/Fz33LhtLk4isXUvjyb0Fso8mIeh/PCkJIy4RuC6iQ=; b=EI7bW/5z3mYcoxuvpz0BCl0mQC fmeqCscYlh1tkJpc9eDFxUxc/+d9kcM5tfXFGLN5sZekedlgDGAnThHw8YtewEbPZZLjDvk+qob90 dEuEhKy0Vg885KEXQ5q5qJDelsESklPUxq+/SAezFkuIL+ECz7us6v+DnNUZjX8uud68/X1O7nS3P BuyS4PNBqlz45wha5AtROEvZue69MDKVrdp0G10pFpNDDtTv7cFsi7yyWCZ2CibP2zf9+pzgf16g4 Mct67m7zrWmHkV7IHPbWJW9lJYaFj3D2wg6QUDfyFsSX0Njlei+oWH5Tc24TRx/ZIXlTv6LR4DLqC IkhPek9w==; Received: from [192.168.2.1] (port=49584 helo=localhost.localdomain) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1qnpIm-0002bg-2q; Wed, 04 Oct 2023 00:59:45 +0100 From: Arun Isaac Date: Wed, 4 Oct 2023 00:59:28 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: <4ad543017994ac442e12a6943356ec4358938ae9.1696375547.git.arunisaac@systemreboot.net> References: <4ad543017994ac442e12a6943356ec4358938ae9.1696375547.git.arunisaac@systemreboot.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -2.09 X-Migadu-Scanner: mx2.migadu.com X-Migadu-Queue-Id: EC64155930 X-Spam-Score: -2.09 X-TUID: tWJt9v8pqH4j * gnu/packages/version-control.scm (cgit)[native-inputs]: Move bzip2, gzip and xz to ... [inputs]: ... here. Add bash-minimal. [arguments]: Use cc-for-target. --- gnu/packages/version-control.scm | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 53c476d607..f504fe9831 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1043,7 +1043,8 @@ (define-public cgit (list #:tests? #f ; XXX: fail to build the in-source git. #:test-target "test" - #:make-flags '("CC=gcc" "SHELL_PATH=sh") + #:make-flags #~(list (string-append "CC=" #$(cc-for-target)) + "SHELL_PATH=sh") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'unpack-git @@ -1103,7 +1104,7 @@ (define-public cgit "html-converters/md2html"))))))) (native-inputs ;; For building manpage. - (list asciidoc gzip bzip2 xz)) + (list asciidoc)) (inputs `(;; Building cgit requires a Git source tree. ("git-source" @@ -1114,13 +1115,20 @@ (define-public cgit (uri "mirror://kernel.org/software/scm/git/git-2.25.4.tar.xz") (sha256 (base32 "11am6s46wmn1yll5614smjhzlghbqq6gysgcs64igjr9y5wzpdxq")))) + ("bash-minimal" ,bash-minimal) ("openssl" ,openssl) - ("groff" ,groff) ("python" ,python) ("python-docutils" ,python-docutils) ("python-markdown" ,python-markdown) ("python-pygments" ,python-pygments) - ("zlib" ,zlib))) + ("zlib" ,zlib) + ;; bzip2, groff, gzip and xz are inputs (not native inputs) + ;; since they are actually substituted into cgit source and + ;; referenced by the built package output. + ("bzip2" ,bzip2) + ("groff" ,groff) + ("gzip" ,gzip) + ("xz" ,xz))) (home-page "https://git.zx2c4.com/cgit/") (synopsis "Web frontend for git repositories") (description -- 2.41.0