guix-commits
[Top][All Lists]
Advanced

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

29/35: bootstrap: Add patch-mesboot0.


From: guix-commits
Subject: 29/35: bootstrap: Add patch-mesboot0.
Date: Wed, 20 Nov 2019 15:19:41 -0500 (EST)

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

commit 786a55aeb2bcf5ccceb3215576372e1f62dad5d1
Author: Jan Nieuwenhuizen <address@hidden>
Date:   Sun Oct 6 14:57:54 2019 +0200

    bootstrap: Add patch-mesboot0.
    
    * gnu/packages/commencement.scm (patch-mesboot0): New variable.
---
 gnu/packages/commencement.scm | 43 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 191f4d3..2033579 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -783,7 +783,7 @@
      (native-inputs `(("bash" ,bash-mesboot0)
                       ("gash" ,%bootstrap-gash)
                       ("guile" ,%bootstrap-guile)
-                      ("gzip" ,gzip-mesboot)
+                      ("gzip" ,gzip-mesboot0)
                       ("make" ,make-mesboot0)
                       ("tcc" ,tcc-boot)))
      (arguments
@@ -818,6 +818,47 @@
                 (install-file "diff" bin)
                 #t)))))))))
 
+(define patch-mesboot0
+  (package-with-bootstrap-guile
+   (package
+     (inherit patch)
+     (name "patch-mesboot0")
+     (version "2.5.9")
+     (source (origin
+               (method url-fetch)
+               (uri (string-append "mirror://gnu/patch/patch-"
+                                   version ".tar.gz"))
+               (sha256
+                (base32
+                 "12nv7jx3gxfp50y11nxzlnmqqrpicjggw6pcsq0wyavkkm3cddgc"))))
+     (supported-systems '("i686-linux" "x86_64-linux"))
+     (inputs '())
+     (propagated-inputs '())
+     (native-inputs `(
+                      ("bash" ,bash-mesboot0)
+                      ("gash" ,%bootstrap-gash)
+                      ("guile" ,%bootstrap-guile)
+                      ("gzip" ,gzip-mesboot0)
+                      ("make" ,make-mesboot0)
+                      ("mes" ,mes-boot)
+                      ("tcc" ,tcc-boot0)))
+     (arguments
+      `(#:implicit-inputs? #f
+        #:guile ,%bootstrap-guile
+        #:parallel-build? #f
+        #:tests? #f           ; check is naive, also checks non-built PROGRAMS
+        #:strip-binaries? #f  ; no strip yet
+        #:configure-flags '("AR=tcc -ar" "CC=tcc" "LD-tcc")
+        #:phases
+        (modify-phases %standard-phases
+          (add-after 'unpack 'scripted-patch
+            (lambda _
+              ;; avoid another segfault
+              (substitute* "pch.c"
+                (("while [(]p_end >= 0[)]" all)
+                 "p_end = -1;\nwhile (0)"))
+              #t))))))))
+
 (define binutils-mesboot0
   (package-with-bootstrap-guile
    (package



reply via email to

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