Merge remote-tracking branch 'origin/master' into core-updates

3 files changed, 11 insertions, 9 deletions

diff --git a/guix/build/emacs-build-system.scm b/guix/build/emacs-build-system.scm
index e2b792d3dc..52c1ea177e 100644
--- a/guix/build/emacs-build-system.scm
+++ b/guix/build/emacs-build-system.scm
@@ -76,10 +76,10 @@ archive, a directory, or an Emacs Lisp file."
 (define* (add-source-to-load-path #:key dummy #:allow-other-keys)
   "Augment the EMACSLOADPATH environment variable with the source directory."
   (let* ((source-directory (getcwd))
-         (emacs-load-path-value (string-append (getenv "EMACSLOADPATH") ":"
-                                               source-directory)))
+         (emacs-load-path-value (string-append source-directory ":"
+                                               (getenv "EMACSLOADPATH"))))
     (setenv "EMACSLOADPATH" emacs-load-path-value)
-    (format #t "source directory ~s appended to the `EMACSLOADPATH' \
+    (format #t "source directory ~s prepended to the `EMACSLOADPATH' \
 environment variable\n" source-directory)))
 
 (define* (build #:key outputs inputs #:allow-other-keys)
@@ -239,15 +239,14 @@ second hyphen.  This corresponds to 'name-version' as used in ELPA packages."
     (add-after 'unpack 'add-source-to-load-path add-source-to-load-path)
     (delete 'bootstrap)
     (delete 'configure)
-    ;; Move the build phase after install: the .el files are byte compiled
-    ;; directly in the store.
     (delete 'build)
     (replace 'check check)
     (replace 'install install)
-    (add-after 'install 'build build)
     (add-after 'install 'make-autoloads make-autoloads)
     (add-after 'make-autoloads 'patch-el-files patch-el-files)
-    (add-after 'make-autoloads 'move-doc move-doc)))
+    ;; The .el files are byte compiled directly in the store.
+    (add-after 'patch-el-files 'build build)
+    (add-after 'build 'move-doc move-doc)))
 
 (define* (emacs-build #:key inputs (phases %standard-phases)
                       #:allow-other-keys #:rest args)
diff --git a/guix/build/qt-build-system.scm b/guix/build/qt-build-system.scm
index 46fcad7848..be2b808901 100644
--- a/guix/build/qt-build-system.scm
+++ b/guix/build/qt-build-system.scm
@@ -90,8 +90,8 @@ add a dependency of that output on Qt."
       (unless (member output qt-wrap-excluded-outputs)
         (let ((bin-list     (find-files-to-wrap directory))
               (vars-to-wrap (variables-for-wrapping
-                             (append (list output)
-                                         input-directories))))
+                             (append (list directory)
+                                     input-directories))))
           (when (not (null? vars-to-wrap))
             (for-each (cut apply wrap-program <> vars-to-wrap)
                       bin-list)))))))
diff --git a/guix/build/syscalls.scm b/guix/build/syscalls.scm
index ce7999b433..248d6761fc 100644
--- a/guix/build/syscalls.scm
+++ b/guix/build/syscalls.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2015 David Thompson <davet@gnu.org>
 ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
+;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -43,6 +44,7 @@
             MS_BIND
             MS_MOVE
             MS_STRICTATIME
+            MS_LAZYTIME
             MNT_FORCE
             MNT_DETACH
             MNT_EXPIRE
@@ -451,6 +453,7 @@ the returned procedure is called."
 (define MS_BIND            4096)
 (define MS_MOVE            8192)
 (define MS_STRICTATIME 16777216)
+(define MS_LAZYTIME    33554432)
 
 (define MNT_FORCE       1)
 (define MNT_DETACH      2)