guix-commits
[Top][All Lists]
Advanced

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

151/207: gnu: Add diffutils-mesboot 2.7.


From: Jan Nieuwenhuizen
Subject: 151/207: gnu: Add diffutils-mesboot 2.7.
Date: Sat, 8 Sep 2018 13:26:22 -0400 (EDT)

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

commit ffe2af2bba41a48fc273234fdf04031607a0d8be
Author: Jan Nieuwenhuizen <address@hidden>
Date:   Mon Aug 27 01:30:02 2018 +0200

    gnu: Add diffutils-mesboot 2.7.
    
    * gnu/packages/commencement.scm (diffutils-mesboot): New variable.
---
 gnu/packages/commencement.scm | 49 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 6c21ab8..bbb470c 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -601,6 +601,55 @@
                      (bin (string-append out "/bin")))
                 (install-file "make" bin))))))))))
 
+(define-public diffutils-mesboot
+  (package-with-bootstrap-guile
+   (package
+     (inherit diffutils)
+     (name "diffutils-mesboot")
+     (version "2.7")
+     (source (origin
+               (method url-fetch)
+               (uri (string-append "mirror://gnu/diffutils/diffutils-"
+                                   version ".tar.gz"))
+               (sha256
+                (base32
+                 "1mirn5i825bn5w7rh6mgn0r8aj9xqanav95dwcl1b8sn82f4iwnm"))))
+     (supported-systems '("i686-linux"))
+     (inputs '())
+     (propagated-inputs '())
+     (native-inputs `(("mes" ,mes-boot)
+                      ("tcc" ,tcc-boot)
+
+                      ("bash" ,%bootstrap-coreutils&co)
+                      ("coreutils" ,%bootstrap-coreutils&co)
+                      ("make" ,%bootstrap-make)))
+     (arguments
+      `(#:implicit-inputs? #f
+        #:guile ,%bootstrap-guile
+        ;;FIXME: why doesn't this work?
+        ;;#:make-flags '("PROGRAMS=\"cmp diff\"")
+        #:tests? #f           ; check is naive, also checks non-built PROGRAMS
+        #:phases
+        (modify-phases %standard-phases
+          (add-before 'configure 'remove-diff3-sdiff
+            (lambda* (#:key outputs #:allow-other-keys)
+              (substitute* "Makefile.in"
+                (("PROGRAMS = .*" all) "PROGRAMS = cmp diff"))))
+          (replace 'configure
+            (lambda* (#:key outputs #:allow-other-keys)
+              (let ((out (assoc-ref outputs "out")))
+                (unsetenv "C_INCLUDE_PATH")
+                (unsetenv "LIBRARY_PATH")
+                (setenv "CONFIG_SHELL" (string-append
+                                        (assoc-ref %build-inputs "bash")
+                                        "/bin/sh"))
+                (setenv "CC" "tcc -static")
+                (setenv "CPP" "tcc -E")
+                (zero?
+                 (system* "./configure"
+                          (string-append "--prefix=" out))))))))))))
+
+
 (define-public binutils-mesboot0
   (package-with-bootstrap-guile
    (package/inherit



reply via email to

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