01/01: build-system/glib-or-gtk: Build 'in-source' by default.

[Leo Famulari]

lfam pushed a commit to branch master
in repository guix.

commit 68afb9dccf91cc1a58b6db405befa176b191d809
Author: Leo Famulari <address@hidden>
Date:   Thu Oct 4 11:30:23 2018 -0400

    build-system/glib-or-gtk: Build 'in-source' by default.
    
    * guix/build-system/glib-or-gtk.scm (glib-or-gtk-build): Change to
    'out-of-source? #f'.
    * gnu/packages/audio.scm (audacity)[arguments]: Use the default 
'out-of-source?'
    setting.
    * gnu/packages/libreoffice.scm (libreoffice): Likewise.
---
 gnu/packages/audio.scm            | 5 -----
 gnu/packages/libreoffice.scm      | 3 ---
 guix/build-system/glib-or-gtk.scm | 2 +-
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 434efab..17b6363 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -413,11 +413,6 @@ engineers, musicians, soundtrack editors and composers.")
              (substitute* "src/prefs/MidiIOPrefs.cpp"
                (("../../lib-src/portmidi/pm_common/portmidi.h") "portmidi.h"))
              #t)))
-       ;; The translation Makefile generation is performed improperly for
-       ;; out-of-tree builds.
-       ;; XXX This can be removed if the glib-or-gkt-build-system
-       ;; switches to #:out-of-source? #t. See <https://bugs.gnu.org/32887>.
-       #:out-of-source? #f
        ;; The test suite is not "well exercised" according to the developers,
        ;; and fails with various errors.  See
        ;; <http://sourceforge.net/p/audacity/mailman/message/33524292/>.
diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index 881cf20..e5ab5c5 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -1018,9 +1018,6 @@ converting QuarkXPress file format.  It supports versions 
3.1 to 4.1.")
     (arguments
      `(#:tests? #f ; Building the tests already fails.
        #:make-flags '("build-nocheck") ; Do not build unit tests, which fails.
-       ;; XXX Remove this if glib-or-gtk-build-system changes to in-source-tree
-       ;; builds by default.
-       #:out-of-source? #f
        #:phases
          (modify-phases %standard-phases
            (add-before 'configure 'prepare-src
diff --git a/guix/build-system/glib-or-gtk.scm 
b/guix/build-system/glib-or-gtk.scm
index 621e68e..fcd92f2 100644
--- a/guix/build-system/glib-or-gtk.scm
+++ b/guix/build-system/glib-or-gtk.scm
@@ -112,7 +112,7 @@
                             (configure-flags ''())
                             ;; Disable icon theme cache generation.
                             (make-flags ''("gtk_update_icon_cache=true"))
-                            (out-of-source? #t)
+                            (out-of-source? #f)
                             (tests? #t)
                             (test-target "check")
                             (parallel-build? #t)