janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 9428daa5de5ebc801342482cd07d70e9394ec56c
Author: Jan Nieuwenhuizen <[email protected]>
Date: Tue Aug 28 01:06:07 2018 +0200
gnu: make-mesboot: Update to 3.80.
* gnu/packages/commencement.scm (make-mesboot): Update to 3.80.
---
gnu/packages/commencement.scm | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index bbb470c..f48c039 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -551,14 +551,14 @@
(package
(inherit gnu-make)
(name "make-mesboot")
- (version "3.79")
+ (version "3.80")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/make/make-"
version ".tar.gz"))
(sha256
(base32
- "1hkss2hajbigk61fppfkvmw242zbkh6wfzg9ksbpqbhyszwy1gg4"))))
+ "1pb7fb7fqf9wz9najm85qdma1xhxzf1rhj5gwrlzdsz2zm0hpcv4"))))
(supported-systems '("i686-linux"))
(inputs '())
(propagated-inputs '())
@@ -573,10 +573,6 @@
#:strip-binaries? #f ; binutil's strip b0rkes MesCC/M1/hex2 binaries
#:phases
(modify-phases %standard-phases
- (add-before 'configure 'remove-lseek-prototype
- (lambda* (#:key outputs #:allow-other-keys)
- (substitute* "make.h"
- (("^extern long int lseek.*" all) (string-append "// " all)))))
(replace 'configure
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
@@ -585,12 +581,21 @@
(setenv "CONFIG_SHELL" (string-append
(assoc-ref %build-inputs "bash")
"/bin/sh"))
- (setenv "CC" "tcc -g -static")
- (setenv "CPP" "tcc -E")
+ (setenv "CC" "tcc -g -static -DO_RDONLY=0")
+ (setenv "LD" "tcc -g -static")
(format (current-error-port) "PATH=~a\n" (getenv "PATH"))
(zero?
(system* "./configure"
- (string-append "--prefix=" out))))))
+ (string-append "--prefix=" out)
+ "--disable-nls")))))
+ (add-after 'configure 'configure-fixup
+ (lambda _
+ (substitute* "build.sh"
+ (("^REMOTE=.*") "REMOTE=stub\n")
+ (("^extras=.*") "extras=getloadavg.c\n"))
+ (substitute* "make.h"
+ (("^extern long int lseek.*" all) (string-append "// " all)))
+ #t))
(delete 'patch-generated-file-shebangs) ; no perl
(replace 'build
(lambda _
