104/207: gnu: gcc-mesboot: Rename from gcc-boot.

[Jan Nieuwenhuizen]

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

commit c9f900420f93027c0f400bb3d4ec82c7a040938b
Author: Jan Nieuwenhuizen <address@hidden>
Date:   Sat Jun 23 18:33:35 2018 +0200

    gnu: gcc-mesboot: Rename from gcc-boot.
    
    * gnu/packages/mes.scm (gcc-mesboot): Rename from gcc-boot.
---
 gnu/packages/mes.scm                       | 35 +++++++++++++-----------------
 gnu/packages/patches/gcc-boot-2.95.3.patch | 13 -----------
 2 files changed, 15 insertions(+), 33 deletions(-)

diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 08fba27..deb8085 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -949,19 +949,17 @@ ac_cv_c_float_format='IEEE (little-endian)'
              (zero?
               (apply system* "./configure" configure-flags)))))))))
 
-(define-public gcc-boot
+(define-public gcc-mesboot
   (package
-    (name "gcc-boot")
     (inherit gcc-core-mesboot)
+    (name "gcc-mesboot")
     (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-core-boot-2.95.3.patch"
-                                       "gcc-boot-2.95.3.patch"
-                                       ))
+              (patches (search-patches "gcc-boot-2.95.3.patch"))
               (sha256
                (base32
                 "1xvfy4pqhrd5v2cv8lzf63iqg92k09g6z9n2ah6ndd4h17k1x0an"))))
@@ -998,28 +996,15 @@ ac_cv_c_float_format='IEEE (little-endian)'
 
                (setenv "PATH"
                        (string-append
-                        ;;(assoc-ref %build-inputs "flex") "/bin"
-                        ;;":"
-
                         (assoc-ref %build-inputs "binutils") "/bin"
                         ":" (assoc-ref %build-inputs "gcc") "/bin"
 
-                        ;; REMOVE NEW glibc/bin from path
-                        ;; we suddenly get this error: linux/errno.h
-                        ;; via a glibc-2.25 errno.h
-
+                        ;; more bootstrap cheats
                         ":" (assoc-ref %build-inputs "bash") "/bin"
-                        ;; ":" (assoc-ref %build-inputs "bzip2") "/bin"
                         ":" (assoc-ref %build-inputs "coreutils") "/bin"
-                        ;; ":" (assoc-ref %build-inputs "diffutils") "/bin"
-                        ;; ":" (assoc-ref %build-inputs "file") "/bin"
-                        ;; ":" (assoc-ref %build-inputs "findutils") "/bin"
-                        ;; ":" (assoc-ref %build-inputs "gawk") "/bin"
                         ":" (assoc-ref %build-inputs "grep") "/bin"
                         ":" (assoc-ref %build-inputs "gzip") "/bin"
-                        ;; ":" (assoc-ref %build-inputs "m4") "/bin"
                         ":" (assoc-ref %build-inputs "make") "/bin"
-                        ;; ":" (assoc-ref %build-inputs "patch") "/bin"
                         ":" (assoc-ref %build-inputs "sed") "/bin"
                         ":" (assoc-ref %build-inputs "tar") "/bin"))
 
@@ -1054,7 +1039,17 @@ ac_cv_c_float_format='IEEE (little-endian)'
                           "--disable-shared"
                           "--host=i386-unknown-linux"
                           "--target=i386-unknown-linux"
-                          (string-append "--prefix=" out))))))))))))
+                          (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")))))))))))
 
 ;;;
 
diff --git a/gnu/packages/patches/gcc-boot-2.95.3.patch 
b/gnu/packages/patches/gcc-boot-2.95.3.patch
index 36d1f18..b1fe01c 100644
--- a/gnu/packages/patches/gcc-boot-2.95.3.patch
+++ b/gnu/packages/patches/gcc-boot-2.95.3.patch
@@ -1,16 +1,3 @@
-diff -purN -x foo.c -x BOOT -x BOOT-2 -x BOOT-strict -x .git -x Makefile -x 
config.status -x config.h -x BOOT -x BOOT-GCC ../gcc-2.95.3/gcc/cccp.c 
gcc-2.95.3/gcc/cccp.c
---- ../gcc-2.95.3/gcc/cccp.c   2001-01-25 15:03:00.000000000 +0100
-+++ gcc-2.95.3/gcc/cccp.c      2018-06-23 09:14:39.617293047 +0200
-@@ -4448,7 +4448,9 @@ get_filename:
-     if (*fin == '>' && fin + 1 == limit) {
-       angle_brackets = 1;
-       /* If -I-, start with the first -I dir after the -I-.  */
-+#if 1
-       search_start = first_bracket_include;
-+#endif
-       break;
-     }
-     goto fail;
 diff -purN -x foo.c -x BOOT -x BOOT-2 -x BOOT-strict -x .git -x Makefile -x 
config.status -x config.h -x BOOT -x BOOT-GCC ../gcc-2.95.3/gcc/crtstuff.c 
gcc-2.95.3/gcc/crtstuff.c
 --- ../gcc-2.95.3/gcc/crtstuff.c       1999-03-23 01:43:51.000000000 +0100
 +++ gcc-2.95.3/gcc/crtstuff.c  2018-06-19 19:52:06.151175995 +0200