guix-commits
[Top][All Lists]
Advanced

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

01/01: maint: Placate 'assert-no-store-file-names'.


From: guix-commits
Subject: 01/01: maint: Placate 'assert-no-store-file-names'.
Date: Sun, 8 Sep 2019 17:03:50 -0400 (EDT)

civodul pushed a commit to branch core-updates
in repository guix.

commit 0b2ea78173f05c417a9002e52e2b36b139074124
Author: Ludovic Courtès <address@hidden>
Date:   Sun Sep 8 23:02:00 2019 +0200

    maint: Placate 'assert-no-store-file-names'.
    
    Reported by Vagrant Cascadian <address@hidden>.
    
    * Makefile.am (assert-no-store-file-names): Exclude
    "binutils-boot-2.20.1a.patch" since it contains a store file name as a
    comment.
    * gnu/packages/commencement.scm (glibc-mesboot0): Use an ellipsis
    instead of an actual store file name in comment.
---
 Makefile.am                   | 1 +
 gnu/packages/commencement.scm | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 955e2e8..eefce7a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -815,6 +815,7 @@ assert-no-store-file-names:
                 --exclude=guix-manual.pot --exclude=guix-manual.*.po           
\
             --exclude=guix-prettify.el                                         
\
             --exclude=ChangeLog*                                               
\
+            --exclude=binutils-boot-2.20*.patch                                
\
             -E "$(storedir)/[a-z0-9]{32}-" $(distdir) ;                        
\
        then                                                                    
\
          echo "error: store file names embedded in the distribution" >&2 ;     
\
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 7f67fa6..fd98c80 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -753,7 +753,7 @@ ac_cv_c_float_format='IEEE (little-endian)'
                 (setenv "CC" (string-append gcc "/bin/gcc " cppflags cflags))
                 #t)))
           ;; glibc-2.2.5 needs a more classic invocation of configure
-          ;; configure: warning: 
CONFIG_SHELL=/gnu/store/kpxi8h3669afr9r1bgvaf9ij3y4wdyyn-bash-minimal-4.4.12/bin/bash:
 invalid host type
+          ;; configure: warning: 
CONFIG_SHELL=/gnu/store/…-bash-minimal-4.4.12/bin/bash: invalid host type
           (replace 'configure
             (lambda* (#:key configure-flags #:allow-other-keys)
               (format (current-error-port)



reply via email to

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