From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id UH9cOHMFD2Vi4AAAauVa8A:P1 (envelope-from ) for ; Sat, 23 Sep 2023 17:34:12 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id UH9cOHMFD2Vi4AAAauVa8A (envelope-from ) for ; Sat, 23 Sep 2023 17:34:12 +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 BAABD459FC for ; Sat, 23 Sep 2023 17:34:11 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=none; 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=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1695483251; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: 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; bh=lE0vTtZ1hXPHuWgJI6bd1OuyCwwm5J8dS83Hg3z61yI=; b=l8saDAgfooK/jeOYcZBMSRhQndr22dIrCAf56QFWE7C+mimwjfUU56nl9dDBaQH0sSdSil coqhXyMfHs2MxKNJi86zsWrbmHxo0hUqWBOS7MlgySv0IrLrBXEtWwsYXMs7axhKrH095M usOSMpdmR/9jtZr4dJuy0C5fihZLmsOVNUOJkHjYus8j7hgw9WPzgX8VNyyesPAoazA79I 6sQeKVY9dxJdQWzfNqOhrVns5mriR4FQjwfMnxELclR1kgLBURRuj2N4FXVmvaXRSODChU tf2NVYC9lzH1zEUKeqxw6/nFz5ByElpBy8WcQLg9gwOaRsZq2wy61jG+zCYFrw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1695483251; a=rsa-sha256; cv=none; b=jICgbJyVxqZfzGklVoODLEdTCo5H8MN+11kiM4VJPXC5ibTx+yFUIkKtUnTCRvbP8Dl91P ZFqfblpzOd77z1xyqQgxRJ7DVv+ylnl/TjS8ndeMYZvxd30TVH42sSP4rl5frymqryfdGJ 7AnZmQeP2kpAnBpF0+oHgVYmibaAxmgQdXq2So98VtUkDiabThYi+afK07O9tI1QOuiBWV xJ4JNfO5644l2FI9dDZV2ChGwdcatEXnMhdJo+6FLzyi0xKBUlZ10P/ZgLJpK57akS8GGR jUGJZYJ+LKbvNXy2CIlq64AzwO6mLiseye5fzcHu/n/4dMOrCPXh+VJr+vcvzw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; 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=none Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qk4do-0005GA-LA; Sat, 23 Sep 2023 11:33:56 -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 1qk4dj-00055t-9K for guix-patches@gnu.org; Sat, 23 Sep 2023 11:33:52 -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 1qk4dj-0001Sr-1I for guix-patches@gnu.org; Sat, 23 Sep 2023 11:33:51 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qk4du-0004OV-8W for guix-patches@gnu.org; Sat, 23 Sep 2023 11:34:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH core-updates v2 56/62] gnu: libstdc++-doc: Rewrite with G-Expressions. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 23 Sep 2023 15:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65479 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65479@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 65479-submit@debbugs.gnu.org id=B65479.169548320316801 (code B ref 65479); Sat, 23 Sep 2023 15:34:02 +0000 Received: (at 65479) by debbugs.gnu.org; 23 Sep 2023 15:33:23 +0000 Received: from localhost ([127.0.0.1]:40446 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qk4dG-0004Mo-GM for submit@debbugs.gnu.org; Sat, 23 Sep 2023 11:33:23 -0400 Received: from smtpmciv3.myservices.hosting ([185.26.107.239]:43496) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qk4ci-0004I9-EY for 65479@debbugs.gnu.org; Sat, 23 Sep 2023 11:32:49 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv3.myservices.hosting (Postfix) with ESMTP id AB3342079D for <65479@debbugs.gnu.org>; Sat, 23 Sep 2023 17:31:52 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 25E4680097; Sat, 23 Sep 2023 17:31:52 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id PIjlfiqPsC_Y; Sat, 23 Sep 2023 17:31:51 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id B3F1480060; Sat, 23 Sep 2023 17:31:50 +0200 (CEST) From: Bruno Victal Date: Sat, 23 Sep 2023 15:20:31 +0100 Message-ID: <8847ac8e6bbebe8519289192affb0c708765ff2b.1695478390.git.mirai@makinata.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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-Country: US X-Migadu-Flow: FLOW_IN X-Spam-Score: -5.27 X-Migadu-Spam-Score: -5.27 X-Migadu-Scanner: mx1.migadu.com X-Migadu-Queue-Id: BAABD459FC X-TUID: LhwZPKAJFpkx * gnu/packages/gcc.scm (make-libstdc++-doc): Rewrite arguments with G-Expressions. --- gnu/packages/gcc.scm | 61 ++++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index bad96759f0..9b469c5d5c 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2021 Chris Marusich ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2022 Greg Hogan +;;; Copyright © 2023 Bruno Victal ;;; ;;; This file is part of GNU Guix. ;;; @@ -1330,36 +1331,36 @@ (define (make-libstdc++-doc gcc) (inputs '()) (propagated-inputs '()) (arguments - '(#:out-of-source? #t - #:tests? #f ;it's just documentation - #:phases (modify-phases %standard-phases - (add-before 'configure 'chdir - (lambda _ - (chdir "libstdc++-v3"))) - (add-before 'configure 'set-xsl-directory - (lambda* (#:key inputs #:allow-other-keys) - (let ((docbook (assoc-ref inputs "docbook-xsl"))) - (substitute* (find-files "doc" - "^Makefile\\.in$") - (("@XSL_STYLE_DIR@") - (string-append - docbook "/xml/xsl/" - (strip-store-file-name docbook))))))) - (replace 'build - (lambda _ - ;; XXX: There's also a 'doc-info' target, but it - ;; relies on docbook2X, which itself relies on - ;; DocBook 4.1.2, which is not really usable - ;; (lacks a catalog.xml.) - (invoke "make" - "doc-html" - "doc-man"))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (invoke "make" - "doc-install-html" - "doc-install-man"))))))) + (list + #:out-of-source? #t + #:tests? #f ;it's just documentation + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'chdir + (lambda _ + (chdir "libstdc++-v3"))) + (add-before 'configure 'set-xsl-directory + (lambda _ + (substitute* (find-files "doc" + "^Makefile\\.in$") + (("@XSL_STYLE_DIR@") + (string-append #$(this-package-native-input "docbook-xsl") + "/xml/xsl/" + (strip-store-file-name docbook)))))) + (replace 'build + (lambda _ + ;; XXX: There's also a 'doc-info' target, but it + ;; relies on docbook2X, which itself relies on + ;; DocBook 4.1.2, which is not really usable + ;; (lacks a catalog.xml.) + (invoke "make" + "doc-html" + "doc-man"))) + (replace 'install + (lambda _ + (invoke "make" + "doc-install-html" + "doc-install-man")))))) (properties (alist-delete 'hidden? (package-properties gcc))))) (define-public libstdc++-doc-5 -- 2.41.0