[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#65479] [PATCH core-updates v2 11/62] gnu: libxml2: Rewrite using G-
From: |
Bruno Victal |
Subject: |
[bug#65479] [PATCH core-updates v2 11/62] gnu: libxml2: Rewrite using G-Expressions. |
Date: |
Sat, 23 Sep 2023 15:19:46 +0100 |
* 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 <glv@posteo.net>
;;; Copyright © 2021 David Larsson <david.larsson@selfhosted.xyz>
;;; Copyright © 2021 Matthew James Kraai <kraai@ftbfs.org>
+;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
;;;
;;; 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
- [bug#65479] [PATCH core-updates v2 28/62] gnu: udisks: Rewrite using G-Expressions., (continued)
- [bug#65479] [PATCH core-updates v2 28/62] gnu: udisks: Rewrite using G-Expressions., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 23/62] gnu: gtk-doc: Add libxslt native-search-paths to its own., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 08/62] gnu: docbook2x: Import patches from debian., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 05/62] gnu: docbook-xsl: Add rewrite entries for http., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 31/62] gnu: criu: Drop xmlto workaround., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 06/62] gnu: docbook: Remove leftovers., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 18/62] gnu: dblatex: Fix missing texlive binaries., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 12/62] search-paths: Add $XML_CATALOG_FILES and $SGML_CATALOG_FILES., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 11/62] gnu: libxml2: Rewrite using G-Expressions.,
Bruno Victal <=
- [bug#65479] [PATCH core-updates v2 21/62] gnu: xmlto: Rewrite with G-Expressions., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 24/62] gnu: docbook2x: Drop docbook-xml workarounds., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 07/62] gnu: docbook-utils: Import patches from debian., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 14/62] gnu: libxslt: Set search-paths for XML and SGML catalogs., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 25/62] gnu: secilc: Drop xmlto workaround., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 26/62] gnu: xdg-utils: Drop docbook workarounds., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 15/62] gnu: dblatex: Add libxslt native-search-paths to its own., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 02/62] gnu: Add docbook-xml-5.0.1., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 27/62] gnu: xdg-user-dirs: Drop docbook workaround., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 29/62] gnu: udisks: Drop docbook workaround., Bruno Victal, 2023/09/23