From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.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 IOBRJoGK5mQcKgEASxT56A (envelope-from ) for ; Thu, 24 Aug 2023 00:38:57 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id iGneJYGK5mSaXAEAauVa8A (envelope-from ) for ; Thu, 24 Aug 2023 00:38:57 +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 4895045BD9 for ; Thu, 24 Aug 2023 00:38:57 +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=1692830337; 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=nXdlBxB6NcQhkQTfXQyl0B1TAybJcE3jwb5DU3UYCPY=; b=gkvcVuIr2I+n6GQkP2rNEUm/Nq7Aqs1xE1SjfmHUnR4CHeeDdZwxpigqQ1FWN7kbpba+NL OijHf91M6D0+ohH+a328RdbhBYVBEZoVScE5NdS7zZgt2wgIExG55UmKikm0SQvCTzfK19 WytPdHU+cLIPcrtnCIwUw/r2Ab2oAUlh/Gjz6JMHVvsRj0DzWh/KRy+apuFL8GSqeh/qbe NlY5gTvImEVjAOK0N6tvbxc6jEMkKMQbIapBd8+N7y9ZaChePO30FX05OmrydH6/godejR 5c3Evoxf89fe+PMmI7oh/PMH7ueOBQf/8bZIIXwJ0lR1uuerbSKR2RcBRNHA2w== 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 ARC-Seal: i=1; s=key1; d=yhetil.org; t=1692830337; a=rsa-sha256; cv=none; b=MdlAtvVrWpuuDgMQqA6z5gBYriVJWubGGqH0LwY6qvB2Tg6UUDd09nsLuiyCbXOZT4B9RO k7tTr+F27ylpqPXC9sMTdS31NJrdhD5gYiBSw0AfPbQqRY5dSDSs9ojHJDTG0DOW6IZ2eC B3XtQvcDKtR+DZ7ipzBHKclYD/UXj3OBHruE55H+QZmObDdjp/GOEyImCKcf8XzBXD+yIB ujAoXS2MJTlKxP1m+vZITvALzIzgxSe6Ccb6gvnkLjDbjpizthUkLvJsOq/Gnck3tXAqTs hlsHRUmHtpVq7buQGdByb+Nc1ctC3Ksffh8BD347PkQ6vboQqvtsNd+05mJA5g== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qYwTL-0007pP-NC; Wed, 23 Aug 2023 18:37:07 -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 1qYwTF-0007mR-VN for guix-patches@gnu.org; Wed, 23 Aug 2023 18:37:01 -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 1qYwTF-0004vt-N4 for guix-patches@gnu.org; Wed, 23 Aug 2023 18:37:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qYwTJ-0004AZ-9m for guix-patches@gnu.org; Wed, 23 Aug 2023 18:37:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH core-updates 11/61] gnu: libxml2: Rewrite using G-Expressions. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 23 Aug 2023 22:37:05 +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.169283018915575 (code B ref 65479); Wed, 23 Aug 2023 22:37:05 +0000 Received: (at 65479) by debbugs.gnu.org; 23 Aug 2023 22:36:29 +0000 Received: from localhost ([127.0.0.1]:35347 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qYwSi-000432-QR for submit@debbugs.gnu.org; Wed, 23 Aug 2023 18:36:29 -0400 Received: from smtpm2.myservices.hosting ([185.26.105.233]:37312) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qYwSZ-00041U-5O for 65479@debbugs.gnu.org; Wed, 23 Aug 2023 18:36:20 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm2.myservices.hosting (Postfix) with ESMTP id D387920E5E for <65479@debbugs.gnu.org>; Thu, 24 Aug 2023 00:36:09 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 3940B80098; Thu, 24 Aug 2023 00:36:09 +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 6kjc5XRln_nD; Thu, 24 Aug 2023 00:36:08 +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 EC34880092; Thu, 24 Aug 2023 00:36:07 +0200 (CEST) From: Bruno Victal Date: Wed, 23 Aug 2023 23:35:03 +0100 Message-Id: X-Mailer: git-send-email 2.40.1 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-Migadu-Scanner: mx2.migadu.com X-Migadu-Spam-Score: -5.21 X-Spam-Score: -5.21 X-Migadu-Queue-Id: 4895045BD9 X-TUID: mXFlek/hG2F1 * gnu/packages/xml.scm (libxml2): Use G-Expressions. --- gnu/packages/xml.scm | 47 ++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 555f0ab624..d5c3c75cb9 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -33,6 +33,7 @@ ;;; Copyright © 2021 Guillaume Le Vaillant ;;; Copyright © 2021 David Larsson ;;; Copyright © 2021 Matthew James Kraai +;;; Copyright © 2023 Bruno Victal ;;; ;;; This file is part of GNU Guix. ;;; @@ -194,29 +195,29 @@ (define-public libxml2 (build-system gnu-build-system) (outputs '("out" "static" "doc")) (arguments - `(#:phases (modify-phases %standard-phases - (add-after 'install 'use-other-outputs - (lambda* (#:key outputs #:allow-other-keys) - (let ((src (assoc-ref outputs "out")) - (doc (string-append (assoc-ref outputs "doc") "/share")) - (dst (string-append (assoc-ref outputs "static") - "/lib"))) - (mkdir-p doc) - (mkdir-p dst) - (for-each (lambda (dir) - (rename-file (string-append src "/share/" dir) - (string-append doc "/" dir))) - '("gtk-doc")) - (for-each (lambda (ar) - (rename-file ar (string-append dst "/" - (basename ar)))) - (find-files (string-append src "/lib") "\\.a$")) - - ;; Remove reference to the static library from the .la - ;; file such that Libtool does the right thing when both - ;; the shared and static variants are available. - (substitute* (string-append src "/lib/libxml2.la") - (("^old_library='libxml2.a'") "old_library=''")))))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'use-other-outputs + (lambda _ + (let ((doc (string-append #$output:doc "/share/")) + (static (string-append #$output:static "/lib/"))) + (for-each mkdir-p (list doc static)) + + (rename-file (string-append #$output "/share/gtk-doc") + (string-append doc "/gtk-doc")) + + (for-each + (lambda (ar) + (rename-file ar + (string-append static (basename ar)))) + (find-files (string-append #$output "/lib") "\\.a$")) + + ;; Remove reference to the static library from the .la + ;; file such that Libtool does the right thing when both + ;; the shared and static variants are available. + (substitute* (string-append #$output "/lib/libxml2.la") + (("^old_library='libxml2.a'") "old_library=''")))))))) (home-page "http://www.xmlsoft.org/") (synopsis "C parser for XML") (inputs (list xz)) -- 2.40.1