From 4403030b7de2485dbeb6ee54c56551a2bd2b5244 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 15 Mar 2018 16:41:02 +0100 Subject: gnu: acl: Fix build failure. * gnu/packages/acl.scm (acl)[arguments]: Add phase "ensure-no-mtimes-pre-1980". --- gnu/packages/acl.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'gnu/packages/acl.scm') diff --git a/gnu/packages/acl.scm b/gnu/packages/acl.scm index 7880e533da..ee17c94262 100644 --- a/gnu/packages/acl.scm +++ b/gnu/packages/acl.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2014 Mark H Weaver ;;; Copyright © 2014 Andreas Enge ;;; Copyright © 2017 Efraim Flashner +;;; Copyright © 2018 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -47,8 +48,20 @@ (build-system gnu-build-system) (arguments `(#:test-target "tests" + #:modules ((ice-9 ftw) + ,@%gnu-build-system-modules) #:phases (modify-phases %standard-phases + ;; XXX After repacking the sources the timestamps are reset to the + ;; epoch, which leads to a failure in gzipping the CHANGES file. + (add-after 'unpack 'ensure-no-mtimes-pre-1980 + (lambda _ + (let ((early-1980 315619200)) ; 1980-01-02 UTC + (ftw "." (lambda (file stat flag) + (unless (<= early-1980 (stat:mtime stat)) + (utime file early-1980 early-1980)) + #t)) + #t))) (add-after 'build 'patch-exec-bin-sh (lambda _ (substitute* "test/run" -- cgit 1.4.1 From c0d56bb227799537f9715668be793cd9cfe3d251 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 16 Mar 2018 06:24:54 -0400 Subject: gnu: acl: Use invoke instead of system*. * gnu/packages/acl.scm (acl)[arguments]: Use invoke. All phases return #t. --- gnu/packages/acl.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages/acl.scm') diff --git a/gnu/packages/acl.scm b/gnu/packages/acl.scm index ee17c94262..8d5f0117f5 100644 --- a/gnu/packages/acl.scm +++ b/gnu/packages/acl.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012 Nikita Karetnikov -;;; Copyright © 2014 Mark H Weaver +;;; Copyright © 2014, 2018 Mark H Weaver ;;; Copyright © 2014 Andreas Enge ;;; Copyright © 2017 Efraim Flashner ;;; Copyright © 2018 Ricardo Wurmus @@ -77,10 +77,11 @@ ;; this user does not exist within Guix's build environment. (for-each (lambda (file) (delete-file (string-append "test/" file))) - '("setfacl-X.test" "cp.test" "misc.test")))) + '("setfacl-X.test" "cp.test" "misc.test")) + #t)) (replace 'install (lambda _ - (zero? (system* "make" "install" "install-lib" "install-dev"))))))) + (invoke "make" "install" "install-lib" "install-dev")))))) (inputs `(("attr" ,attr))) (native-inputs `(("gettext" ,gettext-minimal) -- cgit 1.4.1