[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
14/70: Revert "bootstrap: mes-minimal: Update to mes-0.21."
From: |
guix-commits |
Subject: |
14/70: Revert "bootstrap: mes-minimal: Update to mes-0.21." |
Date: |
Wed, 11 Dec 2019 13:03:20 -0500 (EST) |
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 2c10149d22011732268a8c4d40629f3de378f003
Author: Jan Nieuwenhuizen <address@hidden>
Date: Mon Dec 9 07:47:10 2019 +0100
Revert "bootstrap: mes-minimal: Update to mes-0.21."
This reverts commit 0c46d250b1aecd1182f165e16647f8a0854584dc.
---
gnu/packages/make-bootstrap.scm | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index 5435043..b8d1b2a 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -643,11 +643,11 @@ for `sh' in $PATH, and without nscd, and with static NSS
modules."
(inputs `(("mescc-tools" ,%mescc-tools-static)))))
;; Two packages: first build static, bare minimum content.
-(define %mes-minimal
+(define-public %mes-minimal
;; A minimal Mes without documentation.
(let ((triplet "i686-unknown-linux-gnu"))
(package
- (inherit mes)
+ (inherit mes-0.19)
(name "mes-minimal")
(native-inputs
`(("guile" ,guile-2.2)))
@@ -661,10 +661,15 @@ for `sh' in $PATH, and without nscd, and with static NSS
modules."
(add-after 'install 'strip-install
(lambda _
(let* ((out (assoc-ref %outputs "out"))
- (lib (string-append out "/lib"))
(share (string-append out "/share")))
- (delete-file-recursively (string-append lib "/guile"))
- (delete-file-recursively (string-append share
"/guile")))))))))))
+ (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)")))))))))))
;; next remove store references.
(define %mes-minimal-stripped
- 07/70: gnu: Remove mescc-tools-0.5.2., (continued)
- 07/70: gnu: Remove mescc-tools-0.5.2., guix-commits, 2019/12/11
- 02/70: gnu: Add gash-core-utils., guix-commits, 2019/12/11
- 03/70: bootstrap: Add janneke's guix package url., guix-commits, 2019/12/11
- 09/70: bootstrap: bootstrap-mes: Update to mes-0.21., guix-commits, 2019/12/11
- 10/70: Revert "bootstrap: bootstrap-mes: Update to mes-0.21.", guix-commits, 2019/12/11
- 11/70: Revert "bootstrap: bootstrap-mescc-tools: Update to mescc-tools-0.6.1.", guix-commits, 2019/12/11
- 15/70: bootstrap: Add %bootstrap-guile+guild., guix-commits, 2019/12/11
- 12/70: Revert "gnu: Remove mescc-tools-0.5.2.", guix-commits, 2019/12/11
- 06/70: bootstrap: mes-minimal: Update to mes-0.21., guix-commits, 2019/12/11
- 13/70: Revert "bootstrap: mescc-tools-static: Update to 0.6.1.", guix-commits, 2019/12/11
- 14/70: Revert "bootstrap: mes-minimal: Update to mes-0.21.",
guix-commits <=
- 18/70: bootstrap: Add %bootstrap-mes-rewired., guix-commits, 2019/12/11
- 17/70: bootstrap: Add gash-core-utils-boot., guix-commits, 2019/12/11
- 23/70: bootstrap: make-mesboot0: Use Gash instead of coreutils&co., guix-commits, 2019/12/11
- 21/70: bootstrap: tcc-boot0: Use Gash instead of coretutils&co., guix-commits, 2019/12/11
- 28/70: bootstrap: Add patch-mesboot., guix-commits, 2019/12/11
- 16/70: bootstrap: Add gash-boot., guix-commits, 2019/12/11
- 22/70: bootstrap: Add gzip-mesboot., guix-commits, 2019/12/11
- 20/70: bootstrap: mes-boot: Install intermediate ASCII cache., guix-commits, 2019/12/11
- 24/70: bootstrap: Add bzip2-mesboot., guix-commits, 2019/12/11
- 27/70: bootstrap: diffuils-mesboot: Use Gash instead of coretutils&co., guix-commits, 2019/12/11