[Top][All Lists]

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

05/08: build-system/meson: Do not inherit the 'bootstrap' phase.

From: guix-commits
Subject: 05/08: build-system/meson: Do not inherit the 'bootstrap' phase.
Date: Sun, 30 Jun 2019 11:09:51 -0400 (EDT)

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

commit 25280065814aecd7ce56baf4866b0c05acf8028b
Author: Marius Bakke <address@hidden>
Date:   Sat Jun 29 19:13:49 2019 +0200

    build-system/meson: Do not inherit the 'bootstrap' phase.
    * guix/build/meson-build-system.scm (%standard-phases): Remove 'bootstrap'.
    * gnu/packages/glib.scm (glib)[arguments]: Adjust accordingly.
 gnu/packages/glib.scm             | 1 -
 guix/build/meson-build-system.scm | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 62543fe..eae8297 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -200,7 +200,6 @@ shared NFS home directories.")
       (modify-phases %standard-phases
-        (delete 'bootstrap)
         (add-before 'build 'pre-build
           (lambda* (#:key inputs outputs #:allow-other-keys)
             ;; For tests/gdatetime.c.
diff --git a/guix/build/meson-build-system.scm 
index d0975fc..8043a84 100644
--- a/guix/build/meson-build-system.scm
+++ b/guix/build/meson-build-system.scm
@@ -108,6 +108,7 @@ for example libraries only needed for the tests."
   ;; from the gnu-build-system.  If the glib-or-gtk? key is #f (the default)
   ;; then the extra phases will be removed again in (guix build-system meson).
   (modify-phases glib-or-gtk:%standard-phases
+    (delete 'bootstrap)
     (replace 'configure configure)
     (replace 'build build)
     (replace 'check check)

reply via email to

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