From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.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 kPPKC8L0DmVVLwEA9RJhRA:P1 (envelope-from ) for ; Sat, 23 Sep 2023 16:22:58 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id kPPKC8L0DmVVLwEA9RJhRA (envelope-from ) for ; Sat, 23 Sep 2023 16:22:58 +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 010413E5AE for ; Sat, 23 Sep 2023 16:22:58 +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=1695478978; 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=VhFIN56hl/NUlb/ophY9zs2RaMmTO7D5PEM2B0LEZHw=; b=L7l+zRjBTIiERcvf+ZKYEq1psUlmvpI0FEAniDoOEyBjZLmlzX6COjimS78/5v95rpumfy kcmWnpHmNAYKc+XgR8WfKirtsWwmBTsjTHYhmPUp47gxZ1MMt1weE7YcFEocYFyTP17KNF y0EOMo+xCfp1BYOOTrujJPiwkgeT8VUk30A7sUDJHWdi8+J5Yj9dsvxwDaBQatHB4JVfGs 5S/egMc4R8+gmdCgvVmsPevDA0JFTu4xJiV3Me5gSw/Tb/YiTRcWckmaWpg32oTvwg0LbM mcT0Km81PICFkeMJAYp121UamDHmGhtbF9VSbB1kVHvQkcp+VsL6BQMJJteTYw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1695478978; a=rsa-sha256; cv=none; b=s1kD5Vjl85IZtBsrxxCKdjRnt1eaRnCe7beo18ph9hRAe2lU0U/WFL3NZIeMSt0QaMsgNS DCxS5rzDtlflRsvX42JKXrZURU6uBTQJJchpqZ/YkMoAJUmO/3rlUlRLXH0WHojKK+vVkW krRQ3y/eZiyApJ5ee78M3iNWsJpmYPm+bY9ToAxErkGLdqXYphPBReUdU0+azam9e9Jp2u 0+ZMlmBLEDn36SWaSdCCO54nayZGrUVMzzRTciYah4IvUirA9ckehaGEqXQWoitv2QjK6I pmDOFUErq4T/Qm6sMkKvrETQZnvb1UnxFzOP6Xjge5DwzFOTW4V+LnCPU7/ezg== 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 1qk3X3-0007UW-81; Sat, 23 Sep 2023 10:22:53 -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 1qk3X1-0007TK-KP for guix-patches@gnu.org; Sat, 23 Sep 2023 10:22:51 -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 1qk3X1-0003JA-1C for guix-patches@gnu.org; Sat, 23 Sep 2023 10:22:51 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qk3XC-00087h-7V for guix-patches@gnu.org; Sat, 23 Sep 2023 10:23:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH core-updates v2 11/62] gnu: libxml2: Rewrite using G-Expressions. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 23 Sep 2023 14:23: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.169547895731087 (code B ref 65479); Sat, 23 Sep 2023 14:23:02 +0000 Received: (at 65479) by debbugs.gnu.org; 23 Sep 2023 14:22:37 +0000 Received: from localhost ([127.0.0.1]:40248 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qk3Wm-00085L-Tu for submit@debbugs.gnu.org; Sat, 23 Sep 2023 10:22:37 -0400 Received: from smtpmciv2.myservices.hosting ([185.26.107.238]:60114) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qk3W8-0007zp-8X for 65479@debbugs.gnu.org; Sat, 23 Sep 2023 10:21:57 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv2.myservices.hosting (Postfix) with ESMTP id DFF1C20DF2 for <65479@debbugs.gnu.org>; Sat, 23 Sep 2023 16:21:31 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 44C2180092; Sat, 23 Sep 2023 16:21:21 +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 NeLgdY-CVSlB; Sat, 23 Sep 2023 16:21:20 +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 AAA2680095; Sat, 23 Sep 2023 16:21:18 +0200 (CEST) From: Bruno Victal Date: Sat, 23 Sep 2023 15:19:46 +0100 Message-ID: <6d301ace4eb593026feb0ef1e5bd3b8fedda764b.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: 010413E5AE X-TUID: UbETnOKYw8wo * 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 01e48fda57..c0222f5518 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. ;;; @@ -196,29 +197,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.41.0