guix-commits
[Top][All Lists]
Advanced

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

05/08: gnu: gobject-introspection: Build with Meson.


From: guix-commits
Subject: 05/08: gnu: gobject-introspection: Build with Meson.
Date: Fri, 21 Jun 2019 08:55:39 -0400 (EDT)

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

commit f2a0f03b57b102c7369a787621f5839758d814ef
Author: Marius Bakke <address@hidden>
Date:   Fri Jun 21 14:08:54 2019 +0200

    gnu: gobject-introspection: Build with Meson.
    
    The 1.60.x releases are the last ones to support Autotools.
    
    * gnu/packages/glib.scm (gobject-introspection)[build-system]: Change to
    MESON-BUILD-SYSTEM.
    [arguments]: Remove <#:parallel-build?> and <#:tests?>.
    [native-inputs]: Remove AUTOCONF and AUTOMAKE.
---
 gnu/packages/glib.scm | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index a4ae7b5..d8d339e 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -28,7 +28,6 @@
 
 (define-module (gnu packages glib)
   #:use-module (gnu packages)
-  #:use-module (gnu packages autotools)
   #:use-module (gnu packages backup)
   #:use-module (gnu packages base)
   #:use-module (gnu packages bash)
@@ -361,15 +360,9 @@ dynamic loading, and an object system.")
                        "gobject-introspection-cc.patch"
                        "gobject-introspection-girepository.patch"
                        "gobject-introspection-absolute-shlib-path.patch"))))
-    (build-system gnu-build-system)
+    (build-system meson-build-system)
     (arguments
-     `(;; The build system has at least one race condition involving 
Gio-2.0.gir
-       ;; which causes intermittent failures, as of 1.56.0.
-       #:parallel-build? #f
-       ;; The patch 'gobject-introspection-absolute-shlib-path.patch' causes
-       ;; some tests to fail.
-       #:tests? #f
-       #:phases
+     `(#:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'do-not-use-/usr/bin/env
            (lambda _
@@ -384,9 +377,7 @@ dynamic loading, and an object system.")
        ("python" ,python-wrapper)
        ("zlib" ,zlib)))
     (native-inputs
-     `(("autoconf" ,autoconf)
-       ("automake" ,automake)
-       ("glib" ,glib "bin")
+     `(("glib" ,glib "bin")
        ("pkg-config" ,pkg-config)))
     (propagated-inputs
      `(;; In practice, GIR users will need libffi when using



reply via email to

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