guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

169/176: gnu: file-boot0: Do not strip binaries or validate-runpath.


From: Jan Nieuwenhuizen
Subject: 169/176: gnu: file-boot0: Do not strip binaries or validate-runpath.
Date: Fri, 31 Aug 2018 11:20:34 -0400 (EDT)

janneke pushed a commit to branch wip-bootstrap
in repository guix.

commit 40d657a841a0fddc26841a3ffa2a3235e0324893
Author: Jan Nieuwenhuizen <address@hidden>
Date:   Fri Aug 31 14:45:36 2018 +0200

    gnu: file-boot0: Do not strip binaries or validate-runpath.
    
    libtool: finish: 
PATH="/gnu/store/8c3q88v30c79kb2j0k4917r551p0l63a-make-boot0-4.2.1/bin:/gnu/store/s06s4r2vz285dp20w5h7clssdbz2biin-binutils-mesboot-2.20.1a/bin:/gnu/store/pv3wp1yfn0bv7zljdjanmm9rmc04v5s3-gcc-mesboot-wrapper-4.7.4/bin:/gnu/store/7swwdnq02lqk4xkd8740fxdj1h4va38l-bootstrap-binaries-0/bin:/sbin"
 ldconfig -n /gnu/store/j6qq0pzwx9abpjpd0xly5fp0gkqlx0k4-file-boot0-5.32/lib
    /tmp/guix-build-file-boot0-5.32.drv-0/file-5.32/libtool: line 1086: 
ldconfig: command not found
    ----------------------------------------------------------------------
    
    validating RUNPATH of 1 binaries in 
"/gnu/store/j6qq0pzwx9abpjpd0xly5fp0gkqlx0k4-file-boot0-5.32/bin"...
    /gnu/store/j6qq0pzwx9abpjpd0xly5fp0gkqlx0k4-file-boot0-5.32/bin/file: 
error: depends on 'libmagic.so.1', which cannot be found in RUNPATH ()
    
    * gnu/packages/commencement.scm (file-boot0): Do not strip binaries or
    validate-runpath.
---
 gnu/packages/commencement.scm | 34 +++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 2c9651a..a434264 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1742,13 +1742,33 @@ exec " gcc "/bin/gcc"
 
 (define-public file-boot0
   (package-with-bootstrap-guile
-   (package-with-explicit-inputs (package
-                                   (inherit file)
-                                   (name "file-boot0"))
-                                 `(("make" ,gnu-make-boot0)
-                                   ,@%bootstrap-inputs+toolchain)
-                                 (current-source-location)
-                                 #:guile %bootstrap-guile)))
+   (let ((p (package-with-explicit-inputs file
+                                          `(("make" ,gnu-make-boot0)
+                                            ,@%bootstrap-inputs+toolchain)
+                                          #:guile %bootstrap-guile)))
+     (package
+       (inherit p)
+       (name "file-boot0")
+       (arguments `(#:strip-binaries?
+                    ,(match (%current-system)
+                                        ;strip: supported targets: elf32-i386 
a.out-i386-linux pei-i386
+                                        ;elf32-little elf32-big srec 
symbolsrec verilog tekhex binary ihex
+                                        ;trad-core
+                       ("i686-linux" #f)
+                       (_ #t))          ; attempt to change nothing
+                    #:validate-runpath?
+                    ,(match (%current-system)
+                                        ; validating RUNPATH of 1
+                                        ; binaries in
+                                        ; 
"/gnu/store/j6qq0pzwx9abpjpd0xly5fp0gkqlx0k4-file-boot0-5.32/bin"...
+                                        ; 
/gnu/store/j6qq0pzwx9abpjpd0xly5fp0gkqlx0k4-file-boot0-5.32/bin/file:
+                                        ; error: depends on
+                                        ; 'libmagic.so.1', which
+                                        ; cannot be found in RUNPATH
+                                        ; ()
+                       ("i686-linux" #f)
+                       (_ #t))
+                    ,@(package-arguments p)))))))
 
 
 (define %boot0-inputs



reply via email to

[Prev in Thread] Current Thread [Next in Thread]