From 11c12e30bbdb1a10fd56dc9d5c14548e49b63c12 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 21 Jul 2019 11:40:54 +0200 Subject: [PATCH 1/4] bootstrap: mescc-tools-static-stripped: Remove store references. * gnu/packages/make-bootstrap.scm (%mescc-tools-static-stripped): Rename from %mescc-tools-static; update users. Remove store references. --- gnu/packages/make-bootstrap.scm | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 2163b646f6..8cc4eef430 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -585,16 +585,27 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." #t)))) (inputs `(("gcc" ,%gcc-static))))) -(define %mescc-tools-static - ;; A statically linked MesCC Tools for bootstrap. +(define %mescc-tools-static-stripped + ;; A statically linked Mescc Tools with store references removed, for + ;; bootstrap. (package (inherit mescc-tools) - (name "mescc-tools-static") + (name "mescc-tools-static-stripped") (arguments - `(#:system "i686-linux" - ,@(substitute-keyword-arguments (package-arguments mescc-tools) - ((#:make-flags flags) - `(cons "CC=gcc -static" ,flags))))))) + `(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) + "CC=gcc -static") + #:test-target "test" + #:phases (modify-phases %standard-phases + (delete 'configure) + (add-after 'install 'strip-store-references + (lambda _ + (let* ((out (assoc-ref %outputs "out")) + (bin (string-append out "/bin"))) + (for-each (lambda (file) + (let ((target (string-append bin "/" file))) + (format #t "strippingg `~a'...~%" target) + (remove-store-references target))) + '( "M1" "blood-elf" "hex2")))))))))) (define-public %mes-minimal-stripped ;; A minimal Mes without documentation dependencies, for bootstrap. @@ -791,7 +802,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (define %mescc-tools-bootstrap-tarball ;; A tarball with MesCC binary seed. - (tarball-package %mescc-tools-static)) + (tarball-package %mescc-tools-static-stripped)) (define %mes-bootstrap-tarball ;; A tarball with Mes ASCII Seed and binary Mes C Library. -- 2.21.0