diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-09-08 23:02:00 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-09-08 23:03:43 +0200 |
| commit | 0b2ea78173f05c417a9002e52e2b36b139074124 (patch) | |
| tree | b95e03a993fa5fdb8c51310c9c7a7d6d1803eecc | |
| parent | d7303a048da4d400c203be113235a9fbb9673103 (diff) | |
| download | patches-0b2ea78173f05c417a9002e52e2b36b139074124.tar patches-0b2ea78173f05c417a9002e52e2b36b139074124.tar.gz | |
maint: Placate 'assert-no-store-file-names'.
Reported by Vagrant Cascadian <vagrant@debian.org>.
* 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.
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | gnu/packages/commencement.scm | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 955e2e8c47..eefce7a3ca 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 7f67fa6441..fd98c80dc3 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) |