[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#50201] [PATCH 16/52] gobject-introspection: Correct library name wh
From: |
Maxime Devos |
Subject: |
[bug#50201] [PATCH 16/52] gobject-introspection: Correct library name when cross-compiling. |
Date: |
Wed, 25 Aug 2021 20:02:56 +0200 |
* gnu/packages/glib.scm
(gobject-introspection)[arguments]<#:phases>{rename-library}:
Correct the name of the python extension when cross-compiling.
---
gnu/packages/glib.scm | 37 ++++++++++++++++++++++++++++---------
1 file changed, 28 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index ac38cd40d2..0c2f548f62 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -411,21 +411,40 @@ functions for strings and common data structures.")
"-Dbuild_introspection_data=false"))
'())
#:phases
+ ,#~
(modify-phases %standard-phases
- ,@(if (%current-target-system)
- ;; 'typelibs' is undefined.
- `((add-after 'unpack 'set-typelibs
- (lambda _
- (substitute* "meson.build"
- (("\\bsources: typelibs\\b")
- "sources: []")))))
- '())
+ #$@(if (%current-target-system)
+ ;; 'typelibs' is undefined.
+ `((add-after 'unpack 'set-typelibs
+ (lambda _
+ (substitute* "meson.build"
+ (("\\bsources: typelibs\\b")
+ "sources: []")))))
+ '())
(add-after 'unpack 'do-not-use-/usr/bin/env
(lambda _
(substitute* "tools/g-ir-tool-template.in"
(("#!@PYTHON_CMD@")
(string-append "#!" (which "python3"))))
- #t)))))
+ #t))
+ #$@(if (%current-target-system)
+ ;; Meson gives python extensions an incorrect name, see
+ ;; <https://github.com/mesonbuild/meson/issues/7049>.
+ #~((add-after 'install 'rename-library
+ (lambda* (#:key build target #:allow-other-keys)
+ (define dir
+ (string-append #$output
+
"/lib/gobject-introspection/giscanner"))
+ ;; python uses strings like 'x86_64-linux-gnu', not
+ ;; 'x86_64-unknown-linux-gnu'.
+ (define (normalise-system system)
+ ((@ (ice-9 string-fun) string-replace-substring)
+ system "-unknown-" "-"))
+ (define (extension system)
+ (string-append dir "/_giscanner.cpython-39-"
+ (normalise-system system) ".so"))
+ (rename-file (extension build) (extension target)))))
+ #~()))))
(native-inputs
`(("glib" ,glib "bin")
("pkg-config" ,pkg-config)
--
2.33.0
- [bug#50201] [PATCH 17/52] gnu: atk: Disable introspection when cross-compiling., (continued)
- [bug#50201] [PATCH 14/52] gnu: gobject-introspection: Don't build introspection data when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 19/52] gnu: graphene: Don't build introspection data when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 23/52] gnu: heimdal: Fix inputs when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 05/52] gnu: perl: Find 'bash' when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 13/52] gnu: polkit: Prevent cross-compilation build error., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 18/52] gnu: bdb: Fix cross-compilation build errors., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 25/52] gnu: heimdal: Refer to cross-compiled bash., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 16/52] gobject-introspection: Correct library name when cross-compiling.,
Maxime Devos <=
- [bug#50201] [PATCH 11/52] build-system/glib-or-gtk: Support cross-compilaton., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 15/52] gobject-introspection: Fix inputs when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 21/52] gnu: gamin: Fix 'configure' script when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 24/52] gnu: heimdal: Fix linking error when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 28/52] gnu: heimdal: Use libcom_err from input when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 26/52] gnu: heimdal: Use the cross-compiled bash in "su"., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 27/52] gnu: heimdal: Find tools when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 30/52] gnu: json-glib: Find docbook inputs when cross-compiling., Maxime Devos, 2021/08/25
- [bug#50201] [PATCH 29/52] gnu: json-glib: Add missing 'bash-minimal' input., Maxime Devos, 2021/08/25