nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Ludovic Courtès 2019-09-08 23:02:00 +02:00
parent d7303a048d
commit 0b2ea78173
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@ -815,6 +815,7 @@ assert-no-store-file-names:
--exclude=guix-manual.pot --exclude=guix-manual.*.po \ --exclude=guix-manual.pot --exclude=guix-manual.*.po \
--exclude=guix-prettify.el \ --exclude=guix-prettify.el \
--exclude=ChangeLog* \ --exclude=ChangeLog* \
--exclude=binutils-boot-2.20*.patch \
-E "$(storedir)/[a-z0-9]{32}-" $(distdir) ; \ -E "$(storedir)/[a-z0-9]{32}-" $(distdir) ; \
then \ then \
echo "error: store file names embedded in the distribution" >&2 ; \ echo "error: store file names embedded in the distribution" >&2 ; \

2
gnu/packages/commencement.scm
View File

@ -753,7 +753,7 @@ ac_cv_c_float_format='IEEE (little-endian)'
(setenv "CC" (string-append gcc "/bin/gcc " cppflags cflags)) (setenv "CC" (string-append gcc "/bin/gcc " cppflags cflags))
#t))) #t)))
;; glibc-2.2.5 needs a more classic invocation of configure ;; 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 (replace 'configure
(lambda* (#:key configure-flags #:allow-other-keys) (lambda* (#:key configure-flags #:allow-other-keys)
(format (current-error-port) (format (current-error-port)