ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-11 21:59:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: make: Update to 4.1.

Browse source 
* gnu/packages/base.scm (make): Update to 4.1.  Adapt 'default_shell'
  substitution to new code.
* gnu/packages/commencement.scm (gnu-make-boot0): Remove code that
  manually removed guile.c from list of things to build.
This commit is contained in:
Mark H Weaver 2014-10-23 20:36:50 -04:00
parent f9e687b51a
commit 6178ae9cb7
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gnu/packages/base.scm
View file

@ -273,14 +273,14 @@ (define-public coreutils
(define-public gnu-make (define-public gnu-make
(package (package
(name "make") (name "make")
(version "4.0") (version "4.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/make/make-" version (uri (string-append "mirror://gnu/make/make-" version
".tar.bz2")) ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"1nyvn8mknw0mf7727lprva3lisl1y0n03lvar342rrpdmz3qc1p6")) "19gwwhik3wdwn0r42b7xcihkbxvjl9r2bdal8nifc3k5i4rn3iqb"))
(patches (list (search-patch "make-impure-dirs.patch"))))) (patches (list (search-patch "make-impure-dirs.patch")))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("pkg-config", pkg-config))) ; to detect Guile (native-inputs `(("pkg-config", pkg-config))) ; to detect Guile
@ -293,8 +293,8 @@ (define-public gnu-make
;; Change the default shell from /bin/sh. ;; Change the default shell from /bin/sh.
(let ((bash (assoc-ref inputs "bash"))) (let ((bash (assoc-ref inputs "bash")))
(substitute* "job.c" (substitute* "job.c"
(("default_shell\\[\\] =.*$") (("default_shell =.*$")
(format #f "default_shell[] = \"~a/bin/bash\";\n" (format #f "default_shell = \"~a/bin/bash\";\n"
bash))))) bash)))))
%standard-phases))) %standard-phases)))
(synopsis "Remake files automatically") (synopsis "Remake files automatically")

4
gnu/packages/commencement.scm
View file

@ -74,10 +74,6 @@ (define gnu-make-boot0
((#:phases phases) ((#:phases phases)
`(alist-replace `(alist-replace
'build (lambda _ 'build (lambda _
;; Don't attempt to build 'guile.c' since we don't
;; have Guile here.
(substitute* "build.sh"
(("guile\\.\\$\\{OBJEXT\\}") ""))
(zero? (system* "./build.sh"))) (zero? (system* "./build.sh")))
(alist-replace (alist-replace
'install (lambda* (#:key outputs #:allow-other-keys) 'install (lambda* (#:key outputs #:allow-other-keys)