nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: gettext, attr, acl: Disable `check' phase twiddling when cross building. 

* gnu/packages/gettext.scm (gettext)[arguments]: Disable `check' phase
  manipulations when (%current-target-system) is true.
* gnu/packages/attr.scm (attr)[arguments]: Likewise.
* gnu/packages/acl.scm (acl)[arguments]: Likewise.
This commit is contained in:
Ludovic Courtès 2013-05-25 16:19:06 +02:00
parent a7dc055bb5
commit 2a552f1177
3 changed files with 67 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gnu/packages/acl.scm
View File

@ -45,18 +45,30 @@
'configure 'patch-makefile-SHELL 'configure 'patch-makefile-SHELL
(lambda _ (lambda _
(patch-makefile-SHELL "include/buildmacros")) (patch-makefile-SHELL "include/buildmacros"))
(alist-replace ,(if (%current-target-system)
'check '%standard-cross-phases
(lambda _ '(alist-replace 'check
(system* "make" "tests" "-C" "test") (lambda _
(system* "make" "tests" "-C" "test")
;; XXX: Ignore the test result since this is ;; XXX: Ignore the test result since this is
;; dependent on the underlying file system. ;; dependent on the underlying file system.
#t) #t)
%standard-phases)))) %standard-phases)))))
(inputs `(("attr" ,attr) (inputs `(("attr" ,attr)
("gettext" ,guix:gettext)
("perl" ,perl))) ;; Perl is needed to run tests; remove it from cross builds.
,@(if (%current-target-system)
'()
`(("gettext" ,guix:gettext)
("perl" ,perl)))))
(native-inputs
;; FIXME: Upon next core-updates, make gettext a native input
;; unconditionally.
(if (%current-target-system)
`(("gettext" ,guix:gettext))
'()))
(home-page (home-page
"http://savannah.nongnu.org/projects/acl") "http://savannah.nongnu.org/projects/acl")
(synopsis (synopsis

47
gnu/packages/attr.scm
View File

@ -52,26 +52,37 @@
"install" "install"
"install-lib" "install-lib"
"install-dev"))) "install-dev")))
(alist-replace
'check
(lambda _
;; Use the right shell.
(substitute* "test/run"
(("/bin/sh")
(which "bash")))
(system* "make" "tests" "-C" "test") ;; When building natively, adjust the test cases.
,(if (%current-target-system)
'%standard-cross-phases
'(alist-replace 'check
(lambda _
;; Use the right shell.
(substitute* "test/run"
(("/bin/sh")
(which "bash")))
;; XXX: Ignore the test result since this is dependent on the (system* "make" "tests" "-C" "test")
;; underlying file system.
#t) ;; XXX: Ignore the test result since this is
%standard-phases))))) ;; dependent on the underlying file system.
(inputs `(("perl" ,perl) #t)
("gettext" ,guix:gettext))) %standard-phases))))))
(home-page (inputs `(;; Perl is needed to run tests; remove it from cross builds.
"http://savannah.nongnu.org/projects/attr/") ,@(if (%current-target-system)
(synopsis '()
"Library and tools for manipulating extended attributes") `(("perl" ,perl)
("gettext" ,guix:gettext)))))
(native-inputs
;; FIXME: Upon next core-updates, make gettext a native input
;; unconditionally.
(if (%current-target-system)
`(("gettext" ,guix:gettext))
'()))
(home-page "http://savannah.nongnu.org/projects/attr/")
(synopsis "Library and tools for manipulating extended attributes")
(description (description
"Portable library and tools for manipulating extended attributes.") "Portable library and tools for manipulating extended attributes.")
(license (list gpl2+ lgpl2.1+)))) (license (list gpl2+ lgpl2.1+))))

29
gnu/packages/gettext.scm
View File

@ -38,19 +38,22 @@
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:patches (list (assoc-ref %build-inputs "patch/gets")) `(#:patches (list (assoc-ref %build-inputs "patch/gets"))
#:phases (alist-cons-before #:phases ,(if (%current-target-system)
'check 'patch-tests '%standard-cross-phases
(lambda* (#:key inputs #:allow-other-keys) '(alist-cons-before
(let ((bash (assoc-ref inputs "bash"))) 'check 'patch-tests
(substitute* (find-files "gettext-tools/tests" (lambda* (#:key inputs #:allow-other-keys)
"^msgexec-[0-9]") ;; TODO: Use (which "sh").
(("#![[:blank:]]/bin/sh") (let ((bash (assoc-ref inputs "bash")))
(format #f "#!~a/bin/sh" bash))) (substitute* (find-files "gettext-tools/tests"
(substitute* (find-files "gettext-tools/gnulib-tests" "^msgexec-[0-9]")
"posix_spawn") (("#![[:blank:]]/bin/sh")
(("/bin/sh") (format #f "#!~a/bin/sh" bash)))
(format #f "~a/bin/bash" bash))))) (substitute* (find-files "gettext-tools/gnulib-tests"
%standard-phases))) "posix_spawn")
(("/bin/sh")
(format #f "~a/bin/bash" bash)))))
%standard-phases))))
(inputs (inputs
`(("patch/gets" `(("patch/gets"
,(search-patch "gettext-gets-undeclared.patch")))) ,(search-patch "gettext-gets-undeclared.patch"))))