From patchwork Mon Oct 9 20:06:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 54690 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 9E9F927BBE9; Mon, 9 Oct 2023 22:19:25 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9C64027BBEA for ; Mon, 9 Oct 2023 22:19:24 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qpxeN-0007Xp-AD; Mon, 09 Oct 2023 17:18:51 -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 1qpxeI-0007Ui-BO for guix-patches@gnu.org; Mon, 09 Oct 2023 17:18:46 -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 1qpxeH-0006y9-TH for guix-patches@gnu.org; Mon, 09 Oct 2023 17:18:46 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qpxec-0007f3-KL for guix-patches@gnu.org; Mon, 09 Oct 2023 17:19:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH core-updates v3 57/63] gnu: libstdc++-doc: Rewrite with G-Expressions. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 09 Oct 2023 21:19:06 +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.169688632129287 (code B ref 65479); Mon, 09 Oct 2023 21:19:06 +0000 Received: (at 65479) by debbugs.gnu.org; 9 Oct 2023 21:18:41 +0000 Received: from localhost ([127.0.0.1]:33536 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpxeC-0007cF-KN for submit@debbugs.gnu.org; Mon, 09 Oct 2023 17:18:40 -0400 Received: from smtpmciv1.myservices.hosting ([185.26.107.237]:57100) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpxeA-0007c3-Ps for 65479@debbugs.gnu.org; Mon, 09 Oct 2023 17:18:39 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv1.myservices.hosting (Postfix) with ESMTP id 89EF120C19 for <65479@debbugs.gnu.org>; Mon, 9 Oct 2023 23:17:42 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 03BC88009F; Mon, 9 Oct 2023 23:17:42 +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 CYHF1nPUoUiL; Mon, 9 Oct 2023 23:17:41 +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 C44368009B; Mon, 9 Oct 2023 23:17:40 +0200 (CEST) From: Bruno Victal Date: Mon, 9 Oct 2023 21:06:45 +0100 Message-ID: <741edfc153734699a3c61c479244703515bdec68.1696881354.git.mirai@makinata.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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 5c6ef8ccbf..2bb76c0a02 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 ;;; Copyright © 2023 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. @@ -1328,36 +1329,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