guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

14/52: gnu: gobject-introspection: Don't build introspection data when c


From: guix-commits
Subject: 14/52: gnu: gobject-introspection: Don't build introspection data when cross-compiling.
Date: Mon, 20 Sep 2021 07:19:30 -0400 (EDT)

mothacehe pushed a commit to branch core-updates-frozen
in repository guix.

commit c185e5ad6720aa5196fec849e1145cc492f0ed27
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Tue Aug 24 12:26:36 2021 +0200

    gnu: gobject-introspection: Don't build introspection data when 
cross-compiling.
    
    * gnu/packages/glib.scm
      (gobject-introspection)[arguments]<#:configure-flags>: Set
      gi_cross_use_prebuilt_gi to 'true'.
      (gobject-introspection)[arguments]<#:phases>{set-typelibs}: New phase,
      avoid undefined variable in "meson.build".
---
 gnu/packages/glib.scm | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index cf54b31..829ef32 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -410,8 +410,26 @@ functions for strings and common data structures.")
                        "gobject-introspection-absolute-shlib-path.patch"))))
     (build-system meson-build-system)
     (arguments
-     `(#:phases
+     `(,@(if (%current-target-system)
+             `(#:configure-flags
+               '("-Dgi_cross_use_prebuilt_gi=true"
+                 ;; Building introspection data requires running binaries
+                 ;; for ‘host’ on ‘build’, so don't do that.
+                 ;;
+                 ;; TODO: it would be nice to have introspection data anyways
+                 ;; as discussed here: https://issues.guix.gnu.org/50201#60.
+                 "-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: []")))))
+               '())
          (add-after 'unpack 'do-not-use-/usr/bin/env
            (lambda _
              (substitute* "tools/g-ir-tool-template.in"



reply via email to

[Prev in Thread] Current Thread [Next in Thread]