From 066cb9bab262ce2ed70b265477a91bbe2325254e Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 29 Sep 2019 10:36:46 +0200 Subject: bootstrap: mescc-tools: Use mescc-tools-0.5.2, mescc-tools. * gnu/packages/mes.scm (mescc-tools-0.5.2): New variable; rename from mescc-tools. (mescc-tools): Rename from mescc-tools-0.6.1. Fix build. * gnu/packages/make-bootstrap.scm (%mescc-tools-static): Inherit fixed mescc-tools-0.5.2. --- gnu/packages/make-bootstrap.scm | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) (limited to 'gnu/packages/make-bootstrap.scm') diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 4594e2fe36..8db551b3a7 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -594,34 +594,11 @@ (define %gcc-stripped #t)))) (inputs `(("gcc" ,%gcc-static))))) -;; One package: build + remove store references -;; (define %mescc-tools-static-stripped -;; ;; A statically linked Mescc Tools with store references removed, for -;; ;; bootstrap. -;; (package -;; (inherit mescc-tools) -;; (name "mescc-tools-static-stripped") -;; (arguments -;; `(#: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")))))))))) - ;; Two packages: first build static, bare minimum content. (define %mescc-tools-static ;; A statically linked MesCC Tools. (package - (inherit mescc-tools) + (inherit mescc-tools-0.5.2) (name "mescc-tools-static") (arguments `(#:system "i686-linux" -- cgit v1.2.3