From 0dc5c85638b49d5aed043420346083935ac51435 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Tue, 3 Dec 2019 10:31:08 +0100 Subject: file-systems: Add support for 'strict-atime' and 'lazy-time' flags. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * guix/build/syscalls.scm (MS_LAZYTIME): New variable. * gnu/build/file-systems.scm (mount-flags->bit-mask): Add match rules for 'strict-atime' and 'lazy-time'. * doc/guix.texi (File Systems): Add 'strict-atime' and 'lazy-time' to the list of supported flags. Signed-off-by: Ludovic Courtès --- guix/build/syscalls.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'guix/build') 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 ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2017 Mathieu Othacehe +;;; Copyright © 2019 Guillaume Le Vaillant ;;; ;;; This file is part of GNU Guix. ;;; @@ -43,6 +44,7 @@ (define-module (guix build syscalls) MS_BIND MS_MOVE MS_STRICTATIME + MS_LAZYTIME MNT_FORCE MNT_DETACH MNT_EXPIRE @@ -451,6 +453,7 @@ (define MS_NOATIME 1024) (define MS_BIND 4096) (define MS_MOVE 8192) (define MS_STRICTATIME 16777216) +(define MS_LAZYTIME 33554432) (define MNT_FORCE 1) (define MNT_DETACH 2) -- cgit v1.2.3 From f69439dff438e59fbd24b76949b8767360f2cd72 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sat, 7 Dec 2019 20:41:24 +0100 Subject: build-system: qt: Fix output missing in wrapped variables. * guix/build/qt-build-system .scm (handle-output): Use directory of output, not its name. --- guix/build/qt-build-system.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'guix/build') 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 @@ (define handle-output (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))))))) -- cgit v1.2.3 From d0105e7f2902359de5e96d268a7e5850dae7dff7 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 8 Dec 2019 07:18:46 +0900 Subject: emacs-build-system: Make the order of the phases more clear. * guix/build/emacs-build-system.scm (%standard-phases): Re-arrange to explicit the ordering of phases. --- guix/build/emacs-build-system.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'guix/build') diff --git a/guix/build/emacs-build-system.scm b/guix/build/emacs-build-system.scm index e2b792d3dc..41a42057fa 100644 --- a/guix/build/emacs-build-system.scm +++ b/guix/build/emacs-build-system.scm @@ -239,15 +239,14 @@ (define %standard-phases (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) -- cgit v1.2.3 From add773c37a10e2c900fcfaff745e095b7fe96fbb Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 8 Dec 2019 11:47:23 +0900 Subject: emacs-build-system: Move the source directory to the start of EMACSLOADPATH. Fixes issue #38479 (see: https://bugs.gnu.org/38479). * guix/build/emacs-build-system.scm (add-source-to-load-path): Move the source directory to the start of the EMACSLOADPATH environment variable. Reported-by: Diego Nicola Barbato --- guix/build/emacs-build-system.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'guix/build') diff --git a/guix/build/emacs-build-system.scm b/guix/build/emacs-build-system.scm index 41a42057fa..52c1ea177e 100644 --- a/guix/build/emacs-build-system.scm +++ b/guix/build/emacs-build-system.scm @@ -76,10 +76,10 @@ (define* (unpack #:key source #:allow-other-keys) (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) -- cgit v1.2.3