guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: make-mesboot: fixup for make-mesboot0 patch


From: guix-commits
Subject: 01/01: make-mesboot: fixup for make-mesboot0 patch
Date: Thu, 6 Dec 2018 01:24:39 -0500 (EST)

janneke pushed a commit to branch wip-bootstrap
in repository guix.

commit e11aa31d622a5b53ff85a9242809aa117f4deb8a
Author: Jan Nieuwenhuizen <address@hidden>
Date:   Thu Dec 6 07:22:22 2018 +0100

    make-mesboot: fixup for make-mesboot0 patch
---
 gnu/packages/commencement.scm | 37 ++++++++++++++++++++++++++-----------
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 93ce0d4..dde7b34 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1170,7 +1170,7 @@ ac_cv_c_float_format='IEEE (little-endian)'
 (define make-mesboot
   (package-with-bootstrap-guile
    (package
-     (inherit make-mesboot0)
+     (inherit gnu-make)
      (name "make-mesboot")
      (version "3.82")
      (source (origin
@@ -1188,17 +1188,32 @@ ac_cv_c_float_format='IEEE (little-endian)'
                       ("bash" ,%bootstrap-coreutils&co)
                       ("coreutils" ,%bootstrap-coreutils&co)
                       ("kernel-headers" ,%bootstrap-linux-libre-headers)))
+     (supported-systems '("i686-linux" "x86_64-linux"))
+     (inputs '())
+     (propagated-inputs '())
      (arguments
-      (substitute-keyword-arguments (package-arguments make-mesboot0)
-        ((#:configure-flags configure-flags)
-         `(let ((out (assoc-ref %outputs "out")))
-            `(,(string-append "--prefix=" out))))
-        ((#:phases phases)
-         `(modify-phases ,phases
-            (delete 'configure-fixup)
-            (add-before 'configure 'setenv
-              (lambda _
-                (setenv "LIBS" "-lc -lnss_files -lnss_dns -lresolv")
+      `(#:implicit-inputs? #f
+        #:parallel-build? #f
+        #:guile ,%bootstrap-guile
+        #:modules ((guix build gnu-build-system)
+                   (guix build utils)
+                   (srfi srfi-1)
+                   (srfi srfi-26))
+        #:strip-binaries? #f            ; no strip yet
+        #:phases
+        (modify-phases %standard-phases
+          (add-before 'configure 'setenv
+            (lambda _
+              (setenv "LIBS" "-lc -lnss_files -lnss_dns -lresolv")
+              #t))
+          (replace 'check
+            (lambda _
+              (invoke "./make" "--version")))
+          (replace 'install
+            (lambda* (#:key outputs #:allow-other-keys)
+              (let* ((out (assoc-ref outputs "out"))
+                     (bin (string-append out "/bin")))
+                (install-file "make" bin)
                 #t)))))))))
 
 (define gmp-boot



reply via email to

[Prev in Thread] Current Thread [Next in Thread]