guix-commits
[Top][All Lists]
Advanced

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

116/210: gnu: gcc-mesboot0: Package with bootstrap-guile.


From: Jan Nieuwenhuizen
Subject: 116/210: gnu: gcc-mesboot0: Package with bootstrap-guile.
Date: Sat, 8 Sep 2018 10:36:18 -0400 (EDT)

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

commit 034b6a931ecf80a623065d0c1d286d452e53f9c4
Author: Jan Nieuwenhuizen <address@hidden>
Date:   Fri Jun 29 21:18:51 2018 +0200

    gnu: gcc-mesboot0: Package with bootstrap-guile.
    
    * gnu/packages/mes.scm (gcc-mesboot0): Package with bootstrap-guile.
---
 gnu/packages/mes.scm | 199 ++++++++++++++++++++++++++-------------------------
 1 file changed, 100 insertions(+), 99 deletions(-)

diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 0860ec5..eca2098 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -919,107 +919,108 @@ ac_cv_c_float_format='IEEE (little-endian)'
                (apply system* "./configure" configure-flags))))))))))
 
 (define-public gcc-mesboot0
-  (package
-    (inherit gcc-core-mesboot)
-    (name "gcc-mesboot0")
-    (version "2.95.3")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnu/gcc/gcc-2.95.3/gcc-core-"
-                                  version
-                                  ".tar.gz"))
-              (patches (search-patches "gcc-boot-2.95.3.patch"))
-              (sha256
-               (base32
-                "1xvfy4pqhrd5v2cv8lzf63iqg92k09g6z9n2ah6ndd4h17k1x0an"))))
-    (supported-systems '("i686-linux"))
-    (native-inputs `(("binutils" ,binutils-mesboot0)
-                     ("gcc" ,gcc-core-mesboot)
-                     ("glibc" ,glibc-mesboot)
-                     ("kernel-headers" ,(linux-libre-headers-boot0))))
-    (outputs '("out"))
-    (arguments
-     `(#:tests? #f                      ; runtest: command not found
-       #:parallel-build? #f
-       #:strip-binaries? #f
-       #:make-flags (list "RANLIB=true"
-                          (string-append "LIBGCC2_INCLUDES=-I "
-                                         (assoc-ref %build-inputs "gcc")
-                                         "/include")
-                          "LANGUAGES=c")
-       #:modules ((guix build gnu-build-system)
-                  (guix build utils)
-                  (srfi srfi-1))
-       #:phases
-       (modify-phases %standard-phases
-         (replace 'configure
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (binutils (assoc-ref %build-inputs "binutils"))
-                    (gcc (assoc-ref %build-inputs "gcc"))
-                    (glibc (assoc-ref %build-inputs "glibc"))
-                    (headers (assoc-ref %build-inputs "kernel-headers")))
-               (when #t ;; no info
-                 (delete-file-recursively "texinfo")
-                 (system "touch gcc/cpp.info gcc/gcc.info"))
-
-               (setenv "PATH"
-                       (string-append
-                        (assoc-ref %build-inputs "binutils") "/bin"
-                        ":" (assoc-ref %build-inputs "gcc") "/bin"
-
-                        ;; more bootstrap cheats
-                        ":" (assoc-ref %build-inputs "bash") "/bin"
-                        ":" (assoc-ref %build-inputs "coreutils") "/bin"
-                        ":" (assoc-ref %build-inputs "diffutils") "/bin"
-                        ":" (assoc-ref %build-inputs "grep") "/bin"
-                        ":" (assoc-ref %build-inputs "gzip") "/bin"
-                        ":" (assoc-ref %build-inputs "make") "/bin"
-                        ":" (assoc-ref %build-inputs "sed") "/bin"
-                        ":" (assoc-ref %build-inputs "tar") "/bin"))
-
-               (format (current-error-port) "PATH=~a\n" (getenv "PATH"))
-               (setenv "CONFIG_SHELL" (string-append
-                                       (assoc-ref %build-inputs "bash")
-                                       "/bin/sh"))
-               (setenv "C_INCLUDE_PATH" (string-append
-                                         ;;gcc "/include" this is MES
-                                         ;;":/"
-                                         gcc 
"/lib/gcc-lib/i386-unknown-linux/2.95.3/include"
-                                         ":" headers "/include"
-                                         ":" glibc "/include"))
-               (setenv "LIBRARY_PATH" (string-append glibc "/lib"
-                                                     ":" gcc "/lib"))
-               (format (current-error-port) "C_INCLUDE_PATH=~a\n" (getenv 
"C_INCLUDE_PATH"))
-               (format (current-error-port) "LIBRARY_PATH=~a\n" (getenv 
"LIBRARY_PATH"))
-
-               (setenv "CC" "gcc")
-               (setenv "LD" "gcc")
-               (setenv "CPP" "gcc -E")
-               (setenv "RANLIB" "true")
-               ;;(setenv "LIBS" "-lgcc2 -ltcc1")
-               (with-output-to-file "config.cache"
-                 (lambda _
-                   (display "
+  (package-with-bootstrap-guile
+   (package
+     (inherit gcc-core-mesboot)
+     (name "gcc-mesboot0")
+     (version "2.95.3")
+     (source (origin
+               (method url-fetch)
+               (uri (string-append "mirror://gnu/gcc/gcc-2.95.3/gcc-core-"
+                                   version
+                                   ".tar.gz"))
+               (patches (search-patches "gcc-boot-2.95.3.patch"))
+               (sha256
+                (base32
+                 "1xvfy4pqhrd5v2cv8lzf63iqg92k09g6z9n2ah6ndd4h17k1x0an"))))
+     (supported-systems '("i686-linux"))
+     (native-inputs `(("binutils" ,binutils-mesboot0)
+                      ("gcc" ,gcc-core-mesboot)
+                      ("glibc" ,glibc-mesboot)
+                      ("kernel-headers" ,(linux-libre-headers-boot0))))
+     (outputs '("out"))
+     (arguments
+      `(#:tests? #f                      ; runtest: command not found
+        #:parallel-build? #f
+        #:strip-binaries? #f
+        #:make-flags (list "RANLIB=true"
+                           (string-append "LIBGCC2_INCLUDES=-I "
+                                          (assoc-ref %build-inputs "gcc")
+                                          "/include")
+                           "LANGUAGES=c")
+        #:modules ((guix build gnu-build-system)
+                   (guix build utils)
+                   (srfi srfi-1))
+        #:phases
+        (modify-phases %standard-phases
+          (replace 'configure
+            (lambda* (#:key outputs #:allow-other-keys)
+              (let* ((out (assoc-ref outputs "out"))
+                     (binutils (assoc-ref %build-inputs "binutils"))
+                     (gcc (assoc-ref %build-inputs "gcc"))
+                     (glibc (assoc-ref %build-inputs "glibc"))
+                     (headers (assoc-ref %build-inputs "kernel-headers")))
+                (when #t ;; no info
+                  (delete-file-recursively "texinfo")
+                  (system "touch gcc/cpp.info gcc/gcc.info"))
+
+                (setenv "PATH"
+                        (string-append
+                         (assoc-ref %build-inputs "binutils") "/bin"
+                         ":" (assoc-ref %build-inputs "gcc") "/bin"
+
+                         ;; more bootstrap cheats
+                         ":" (assoc-ref %build-inputs "bash") "/bin"
+                         ":" (assoc-ref %build-inputs "coreutils") "/bin"
+                         ":" (assoc-ref %build-inputs "diffutils") "/bin"
+                         ":" (assoc-ref %build-inputs "grep") "/bin"
+                         ":" (assoc-ref %build-inputs "gzip") "/bin"
+                         ":" (assoc-ref %build-inputs "make") "/bin"
+                         ":" (assoc-ref %build-inputs "sed") "/bin"
+                         ":" (assoc-ref %build-inputs "tar") "/bin"))
+
+                (format (current-error-port) "PATH=~a\n" (getenv "PATH"))
+                (setenv "CONFIG_SHELL" (string-append
+                                        (assoc-ref %build-inputs "bash")
+                                        "/bin/sh"))
+                (setenv "C_INCLUDE_PATH" (string-append
+                                          ;;gcc "/include" this is MES
+                                          ;;":/"
+                                          gcc 
"/lib/gcc-lib/i386-unknown-linux/2.95.3/include"
+                                          ":" headers "/include"
+                                          ":" glibc "/include"))
+                (setenv "LIBRARY_PATH" (string-append glibc "/lib"
+                                                      ":" gcc "/lib"))
+                (format (current-error-port) "C_INCLUDE_PATH=~a\n" (getenv 
"C_INCLUDE_PATH"))
+                (format (current-error-port) "LIBRARY_PATH=~a\n" (getenv 
"LIBRARY_PATH"))
+
+                (setenv "CC" "gcc")
+                (setenv "LD" "gcc")
+                (setenv "CPP" "gcc -E")
+                (setenv "RANLIB" "true")
+                ;;(setenv "LIBS" "-lgcc2 -ltcc1")
+                (with-output-to-file "config.cache"
+                  (lambda _
+                    (display "
 ac_cv_c_float_format='IEEE (little-endian)'
 ")))
-               (and
-                (zero?
-                 (system* "./configure"
-                          "--disable-shared"
-                          "--host=i386-unknown-linux"
-                          "--target=i386-unknown-linux"
-                          (string-append "--prefix=" out)))))))
-         (add-after 'install 'install2
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (gcc-dir (string-append
-                              out "/lib/gcc-lib/i386-unknown-linux/2.95.3")))
-               (and
-                (mkdir-p "tmp")
-                (zero? (system (string-append "set -x; cd tmp && ar x 
../gcc/libgcc2.a")))
-                (zero? (system (string-append "set -x; cd tmp && ar r " 
gcc-dir "/libgcc.a *.o")))
-                (copy-file "gcc/libgcc2.a" (string-append out 
"/lib/libgcc2.a")))))))))))
+                (and
+                 (zero?
+                  (system* "./configure"
+                           "--disable-shared"
+                           "--host=i386-unknown-linux"
+                           "--target=i386-unknown-linux"
+                           (string-append "--prefix=" out)))))))
+          (add-after 'install 'install2
+            (lambda* (#:key outputs #:allow-other-keys)
+              (let* ((out (assoc-ref outputs "out"))
+                     (gcc-dir (string-append
+                               out "/lib/gcc-lib/i386-unknown-linux/2.95.3")))
+                (and
+                 (mkdir-p "tmp")
+                 (zero? (system (string-append "set -x; cd tmp && ar x 
../gcc/libgcc2.a")))
+                 (zero? (system (string-append "set -x; cd tmp && ar r " 
gcc-dir "/libgcc.a *.o")))
+                 (copy-file "gcc/libgcc2.a" (string-append out 
"/lib/libgcc2.a"))))))))))))
 
 
 (define-public binutils-mesboot



reply via email to

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