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

build-system/{gnu,cmake}: Remove #:patches and #:patch-flags parameters. 

* guix/build/gnu-build-system.scm (patch): Remove.
  (%standard-phases): Remove 'patch'.
* guix/build-system/gnu.scm (gnu-build, gnu-cross-build): Remove
  #:patches and #:patch-flags parameters.
* guix/build-system/cmake.scm (cmake-build): Likewise.
* guix/build-system/python.scm (package-with-explicit-python): Update
  comment.
This commit is contained in:
Ludovic Courtès 2013-10-10 23:15:57 +02:00
parent de80b5045b
commit 7e2b10a53f
4 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
guix/build-system/cmake.scm
View File

@ -47,7 +47,6 @@
(outputs '("out")) (configure-flags ''()) (outputs '("out")) (configure-flags ''())
(search-paths '()) (search-paths '())
(make-flags ''()) (make-flags ''())
(patches ''()) (patch-flags ''("--batch" "-p1"))
(cmake (default-cmake)) (cmake (default-cmake))
(out-of-source? #f) (out-of-source? #f)
(tests? #t) (tests? #t)
@ -81,8 +80,6 @@ provides a 'CMakeLists.txt' file as its build system."
#:search-paths ',(map search-path-specification->sexp #:search-paths ',(map search-path-specification->sexp
(append search-paths (append search-paths
(standard-search-paths))) (standard-search-paths)))
#:patches ,patches
#:patch-flags ,patch-flags
#:phases ,phases #:phases ,phases
#:configure-flags ,configure-flags #:configure-flags ,configure-flags
#:make-flags ,make-flags #:make-flags ,make-flags

6
guix/build-system/gnu.scm
View File

@ -252,7 +252,6 @@ System: GCC, GNU Make, Bash, Coreutils, etc."
(search-paths '()) (search-paths '())
(configure-flags ''()) (configure-flags ''())
(make-flags ''()) (make-flags ''())
(patches ''()) (patch-flags ''("--batch" "-p1"))
(out-of-source? #f) (out-of-source? #f)
(tests? #t) (tests? #t)
(test-target "check") (test-target "check")
@ -300,8 +299,6 @@ which could lead to gratuitous input divergence."
#:search-paths ',(map search-path-specification->sexp #:search-paths ',(map search-path-specification->sexp
(append implicit-search-paths (append implicit-search-paths
search-paths)) search-paths))
#:patches ,patches
#:patch-flags ,patch-flags
#:phases ,phases #:phases ,phases
#:configure-flags ,configure-flags #:configure-flags ,configure-flags
#:make-flags ,make-flags #:make-flags ,make-flags
@ -390,7 +387,6 @@ inputs."
(configure-flags ''()) (configure-flags ''())
(make-flags ''()) (make-flags ''())
(patches ''()) (patch-flags ''("--batch" "-p1"))
(out-of-source? #f) (out-of-source? #f)
(tests? #f) ; nothing can be done (tests? #f) ; nothing can be done
(test-target "check") (test-target "check")
@ -473,8 +469,6 @@ platform."
search-path-specification->sexp search-path-specification->sexp
(append implicit-host-search-paths (append implicit-host-search-paths
native-search-paths)) native-search-paths))
#:patches ,patches
#:patch-flags ,patch-flags
#:phases ,phases #:phases ,phases
#:configure-flags ,configure-flags #:configure-flags ,configure-flags
#:make-flags ,make-flags #:make-flags ,make-flags

5
guix/build-system/python.scm
View File

@ -58,9 +58,8 @@ prepended to the name."
(let* ((build-system (package-build-system p)) (let* ((build-system (package-build-system p))
(rewrite-if-package (rewrite-if-package
(lambda (content) (lambda (content)
;; CONTENT may be a string (e.g., for patches), in which case it ;; CONTENT may be a file name, in which case it is returned, or a
;; is returned, or a package, which is rewritten with the new ;; package, which is rewritten with the new PYTHON and NEW-PREFIX.
;; PYTHON and NEW-PREFIX.
(if (package? content) (if (package? content)
(package-with-explicit-python content python (package-with-explicit-python content python
old-prefix new-prefix) old-prefix new-prefix)

10
guix/build/gnu-build-system.scm
View File

@ -115,14 +115,6 @@ makefiles."
;; Patch `SHELL' in generated makefiles. ;; Patch `SHELL' in generated makefiles.
(for-each patch-makefile-SHELL (find-files "." "^(GNU)?[mM]akefile$"))) (for-each patch-makefile-SHELL (find-files "." "^(GNU)?[mM]akefile$")))
(define* (patch #:key (patches '()) (patch-flags '("--batch" "-p1"))
#:allow-other-keys)
(every (lambda (p)
(format #t "applying patch `~a'~%" p)
(zero? (apply system* "patch"
(append patch-flags (list "--input" p)))))
patches))
(define* (configure #:key target native-inputs inputs outputs (define* (configure #:key target native-inputs inputs outputs
(configure-flags '()) out-of-source? (configure-flags '()) out-of-source?
#:allow-other-keys) #:allow-other-keys)
@ -344,7 +336,7 @@ makefiles."
;; Standard build phases, as a list of symbol/procedure pairs. ;; Standard build phases, as a list of symbol/procedure pairs.
(let-syntax ((phases (syntax-rules () (let-syntax ((phases (syntax-rules ()
((_ p ...) `((p . ,p) ...))))) ((_ p ...) `((p . ,p) ...)))))
(phases set-paths unpack patch (phases set-paths unpack
patch-source-shebangs configure patch-generated-file-shebangs patch-source-shebangs configure patch-generated-file-shebangs
build check install build check install
patch-shebangs strip))) patch-shebangs strip)))