[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/06: gnu: glibc-mesboot: Package with bootstrap-guile.
|
From: |
Jan Nieuwenhuizen |
|
Subject: |
05/06: gnu: glibc-mesboot: Package with bootstrap-guile. |
|
Date: |
Mon, 9 Jul 2018 16:29:57 -0400 (EDT) |
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 972cfca11d7e11c29fa72b965a8f12f03eb96f38
Author: Jan Nieuwenhuizen <address@hidden>
Date: Fri Jun 29 21:18:05 2018 +0200
gnu: glibc-mesboot: Package with bootstrap-guile.
* gnu/packages/mes.scm (glibc-mesboot): Package with bootstrap-guile.
---
gnu/packages/mes.scm | 157 ++++++++++++++++++++++++++-------------------------
1 file changed, 79 insertions(+), 78 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 65faac6..eaea55b 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -830,87 +830,88 @@ ac_cv_c_float_format='IEEE (little-endian)'
(string-append out "/include"))))))))))))
(define-public glibc-mesboot
- (package
- (inherit glibc)
- (name "glibc-mesboot")
- (version "2.2.5")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnu/glibc/glibc-"
- version
- ".tar.gz"))
- (patches (search-patches "glibc-boot-2.2.5.patch"))
- (sha256
- (base32
- "1vl48i16gx6h68whjyhgnn1s57vqq32f9ygfa2fls7pdkbsqvp2q"))))
- (supported-systems '("i686-linux"))
- (native-inputs `(("binutils" ,binutils-mesboot0)
- ("gcc" ,gcc-core-mesboot)
- ("kernel-headers" ,(linux-libre-headers-boot0))))
- (outputs '("out"))
- (arguments
- `(#:tests? #f
- #:strip-binaries? #f
- #:parallel-build? #f ; gcc-2.95.3 ICEs on massively parallel builds
- #:configure-flags
- (let ((out (assoc-ref %outputs "out"))
- (headers (assoc-ref %build-inputs "kernel-headers")))
- #:configure-flags
- (list
- "--disable-shared"
- "--enable-static"
- "--disable-sanity-checks"
- "--host=i386-unknown-linux"
- "--target=i386-unknown-linux"
- (string-append "--with-headers=" headers "/include")
- "--enable-static-nss"
- "--without-__thread"
- "--without-cvs"
- "--without-gd"
- "--without-tls"
- (string-append "--prefix=" out)))
- #:phases
- (modify-phases %standard-phases
- (add-before 'configure 'setenv
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (headers (assoc-ref %build-inputs "kernel-headers"))
- (gcc (assoc-ref %build-inputs "gcc"))
- (cppflags (string-append
- " -D __STDC__=1"
- " -D MES_BOOTSTRAP=1"
- " -D BOOTSTRAP_GLIBC=1"))
- (cflags (string-append " -L " (getcwd))))
- (setenv "CONFIG_SHELL" (string-append
- (assoc-ref %build-inputs "bash")
- "/bin/sh"))
+ (package-with-bootstrap-guile
+ (package
+ (inherit glibc)
+ (name "glibc-mesboot")
+ (version "2.2.5")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnu/glibc/glibc-"
+ version
+ ".tar.gz"))
+ (patches (search-patches "glibc-boot-2.2.5.patch"))
+ (sha256
+ (base32
+ "1vl48i16gx6h68whjyhgnn1s57vqq32f9ygfa2fls7pdkbsqvp2q"))))
+ (supported-systems '("i686-linux"))
+ (native-inputs `(("binutils" ,binutils-mesboot0)
+ ("gcc" ,gcc-core-mesboot)
+ ("kernel-headers" ,(linux-libre-headers-boot0))))
+ (outputs '("out"))
+ (arguments
+ `(#:tests? #f
+ #:strip-binaries? #f
+ #:parallel-build? #f ; gcc-2.95.3 ICEs on massively parallel builds
+ #:configure-flags
+ (let ((out (assoc-ref %outputs "out"))
+ (headers (assoc-ref %build-inputs "kernel-headers")))
+ #:configure-flags
+ (list
+ "--disable-shared"
+ "--enable-static"
+ "--disable-sanity-checks"
+ "--host=i386-unknown-linux"
+ "--target=i386-unknown-linux"
+ (string-append "--with-headers=" headers "/include")
+ "--enable-static-nss"
+ "--without-__thread"
+ "--without-cvs"
+ "--without-gd"
+ "--without-tls"
+ (string-append "--prefix=" out)))
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'configure 'setenv
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (headers (assoc-ref %build-inputs "kernel-headers"))
+ (gcc (assoc-ref %build-inputs "gcc"))
+ (cppflags (string-append
+ " -D __STDC__=1"
+ " -D MES_BOOTSTRAP=1"
+ " -D BOOTSTRAP_GLIBC=1"))
+ (cflags (string-append " -L " (getcwd))))
+ (setenv "CONFIG_SHELL" (string-append
+ (assoc-ref %build-inputs "bash")
+ "/bin/sh"))
- (setenv "PATH"
- (string-append
- (assoc-ref %build-inputs "binutils") "/bin"
- ":" (assoc-ref %build-inputs "gcc") "/bin"
+ (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 "gawk") "/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"))
+ ;; 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 "gawk") "/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"))
- (setenv "CPP" (string-append gcc "/bin/gcc -E " cppflags))
- (setenv "CC" (string-append gcc "/bin/gcc " cppflags cflags))
- (unsetenv "C_INCLUDE_PATH")
- (unsetenv "LIBRARY_PATH"))))
- ;; glibc-2.2.5 needs a slightly more classical invocation of configure
- ;; configure: warning:
CONFIG_SHELL=/gnu/store/kpxi8h3669afr9r1bgvaf9ij3y4wdyyn-bash-minimal-4.4.12/bin/bash:
invalid host type
- (replace 'configure
- (lambda* (#:key configure-flags #:allow-other-keys)
- (zero?
- (apply system* "./configure" configure-flags)))))))))
+ (setenv "CPP" (string-append gcc "/bin/gcc -E " cppflags))
+ (setenv "CC" (string-append gcc "/bin/gcc " cppflags cflags))
+ (unsetenv "C_INCLUDE_PATH")
+ (unsetenv "LIBRARY_PATH"))))
+ ;; glibc-2.2.5 needs a slightly more classical invocation of
configure
+ ;; configure: warning:
CONFIG_SHELL=/gnu/store/kpxi8h3669afr9r1bgvaf9ij3y4wdyyn-bash-minimal-4.4.12/bin/bash:
invalid host type
+ (replace 'configure
+ (lambda* (#:key configure-flags #:allow-other-keys)
+ (zero?
+ (apply system* "./configure" configure-flags))))))))))
(define-public gcc-mesboot0
(package
- branch wip-bootstrap updated (0f46768 -> 8dc6d21), Jan Nieuwenhuizen, 2018/07/09
- 01/06: gnu: m4-mesboot: Package with boostrap-guile., Jan Nieuwenhuizen, 2018/07/09
- 03/06: gnu: binutils-mesboot0: Package with bootstrap-guile., Jan Nieuwenhuizen, 2018/07/09
- 02/06: gnu: tcc-boot: Package with bootstrap-guile., Jan Nieuwenhuizen, 2018/07/09
- 04/06: gnu: gcc-core-mesboot: Package with bootstrap-guile., Jan Nieuwenhuizen, 2018/07/09
- 06/06: gnu: gcc-mesboot0: Package with bootstrap-guile., Jan Nieuwenhuizen, 2018/07/09
- 05/06: gnu: glibc-mesboot: Package with bootstrap-guile.,
Jan Nieuwenhuizen <=