[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
08/13: bootstrap: Merge mes-minimal into mes-minimal-stripped.
From: |
guix-commits |
Subject: |
08/13: bootstrap: Merge mes-minimal into mes-minimal-stripped. |
Date: |
Thu, 20 Dec 2018 06:22:49 -0500 (EST) |
janneke pushed a commit to branch core-updates
in repository guix.
commit 20dd94b82fc60918d9fdabb609e30ed4414aba95
Author: Jan Nieuwenhuizen <address@hidden>
Date: Sat Dec 15 09:01:53 2018 +0100
bootstrap: Merge mes-minimal into mes-minimal-stripped.
* gnu/packages/make-bootstrap.scm (%mes-minimal): Remove.
(%mes-minimal-stripped): Configure using --mes. Strip installation.
---
gnu/packages/make-bootstrap.scm | 50 +++++++++++------------------------------
1 file changed, 13 insertions(+), 37 deletions(-)
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index 7ce05fe..ff0523b 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -548,55 +548,31 @@ for `sh' in $PATH, and without nscd, and with static NSS
modules."
((#:make-flags flags)
`(cons "CC=gcc -static" ,flags)))))))
-(define %mes-minimal
+(define-public %mes-minimal-stripped
;; A minimal Mes without documentation dependencies, for bootstrap.
(let ((triplet "i686-unknown-linux-gnu"))
(package
(inherit mes)
- (name "mes-minimal")
+ (name "mes-minimal-stripped")
(native-inputs
`(("guile" ,guile-2.2)))
(arguments
`(#:system "i686-linux"
#:strip-binaries? #f
+ #:configure-flags '("--mes")
#:phases
(modify-phases %standard-phases
- (add-before 'configure 'optional-dot
+ (add-after 'install 'strip-install
(lambda _
- (substitute* "configure"
- (("#:version-option \"-V\"" all)
- (string-append all "#:optional? #t")))))))))))
-
-(define-public %mes-minimal-stripped
- ;; The subset of Mes files needed for bootstrap.
- (package
- (inherit %mes-minimal)
- (name "mes-minimal-stripped")
- (build-system trivial-build-system)
- (source #f)
- (arguments
- `(#:modules ((guix build utils))
- #:builder
- (begin
- (use-modules (srfi srfi-1)
- (srfi srfi-26)
- (guix build utils))
-
- (setvbuf (current-output-port) _IOLBF)
- (let* ((out (assoc-ref %outputs "out"))
- (bindir (string-append out "/bin"))
- (libdir (string-append out "/lib"))
- (mes (assoc-ref %build-inputs "mes")))
-
- (copy-recursively (string-append mes "/bin") bindir)
- (copy-recursively (string-append mes "/lib") libdir)
- (copy-recursively (string-append mes "/share/mes/lib") libdir)
- (for-each remove-store-references
- (remove (lambda (file) (or (string-suffix? ".h" file)
- (string-suffix? ".c" file)))
- (find-files out ".*")))
- #t))))
- (inputs `(("mes" ,%mes-minimal)))))
+ (let* ((out (assoc-ref %outputs "out"))
+ (share (string-append out "/share")))
+ (delete-file-recursively (string-append out "/lib/guile"))
+ (delete-file-recursively (string-append share "/guile"))
+ (delete-file-recursively (string-append share
"/mes/scaffold"))
+ (for-each
+ delete-file
+ (find-files (string-append share "/mes/lib")
+ "\\.(h|c)")))))))))))
(define %guile-static
;; A statically-linked Guile that is relocatable--i.e., it can search
- branch core-updates updated (fafa789 -> 03a45a4), guix-commits, 2018/12/20
- 01/13: bootstrap: mes-minimal-stripped: Do not strip bin., guix-commits, 2018/12/20
- 02/13: gnu: mes: Update to a155a0a9a2d941b15c1b98e5cce787de40a8dacd., guix-commits, 2018/12/20
- 03/13: bootstrap: bootstrap-mes: Update., guix-commits, 2018/12/20
- 06/13: bootstrap: Remove development hacks., guix-commits, 2018/12/20
- 08/13: bootstrap: Merge mes-minimal into mes-minimal-stripped.,
guix-commits <=
- 10/13: bootstrap: bootstrap-mes: Update., guix-commits, 2018/12/20
- 04/13: bootstrap: Do not fake, use Mes instead of Guile., guix-commits, 2018/12/20
- 11/13: bootstrap: mes-boot: Update for mes 0.19., guix-commits, 2018/12/20
- 07/13: gnu: mes: Update to 0.19., guix-commits, 2018/12/20
- 12/13: bootstrap: tcc-boot0: Update for mes 0.19., guix-commits, 2018/12/20
- 05/13: doc: Update mesboot graph without bootstrap-guile., guix-commits, 2018/12/20
- 09/13: bootstrap: Add mes-boot0; decouple mes-boot from Mes., guix-commits, 2018/12/20
- 13/13: bootstrap: srfi-43: Remove., guix-commits, 2018/12/20