From: "Ludovic Courtès" <ludo@gnu.org>
To: Jan Nieuwenhuizen <janneke@gnu.org>
Cc: Vagrant Cascadian <vagrant@debian.org>, 43005@debbugs.gnu.org
Subject: bug#43005: make dist fails: "store file names embedded in the distribution"
Date: Wed, 16 Sep 2020 12:21:09 +0200 [thread overview]
Message-ID: <87o8m6nht6.fsf@gnu.org> (raw)
In-Reply-To: <871rjwsh1y.fsf@gnu.org> (Jan Nieuwenhuizen's message of "Mon, 24 Aug 2020 08:18:17 +0200")
Hello!
Jan Nieuwenhuizen <janneke@gnu.org> skribis:
>> When I tried to run make dist, it fails:
>>
>> guix-1.0.1.21330-a8c8f-dirty/gnu/packages/commencement.scm:
>> // /gnu/store/cq0cmv35s9dhilx14zaghlc08gpc0hwr-tcc-boot0-0.9.26-6.c004e9a/lib/libc.a: error: 'sigprocmask' defined t
>> error: store file names embedded in the distribution
>>
>> The attached patch triggers pretty extensive rebuilds, but should fix
>> the problem.
>
> Oops; your patch is fine (see nit-pick) for core-updates; but as you
> noticed, on master we need to add an indirection to avoid rebuilds.
> What about something like
>
> diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
> index aa30e3fa18..48f9a47c6b 100644
> --- a/gnu/packages/commencement.scm
> +++ b/gnu/packages/commencement.scm
> @@ -788,14 +788,16 @@ $MES -e '(mescc)' module/mescc.scm -- \"$@\"
> (substitute* "config.h"
> (("#define GETCWD_BROKEN 1") "#undef GETCWD_BROKEN"))
> (let ((config.h (open-file "config.h" "a")))
> - (display (string-append "
> + ;; TODO: remove ,(string-append hack in next rebuild cycle
> + ;; together with store file name
> + (display (string-append ,(string-append "
> // tcc: error: undefined symbol 'enable_hostname_completion'
> #define enable_hostname_completion(on_or_off) 0
>
> -// /gnu/store/cq0cmv35s9dhilx14zaghlc08gpc0hwr-tcc-boot0-0.9.26-6.c004e9a/lib/libc.a: error: 'sigprocmask' defined twice
> +// /gnu/store/" "cq0cmv35s9dhilx14zaghlc08gpc0hwr-tcc-boot0-0.9.26-6.c004e9a/lib/libc.a: error: 'sigprocmask' defined twice
> #define HAVE_POSIX_SIGNALS 1
> #define endpwent(x) 0
> -")
> +"))
Well done! Could you push to ‘master’ (with a “Fixes” line in the
commit log)?
>> From 6e77f342c0deca73fa608365bbceb14aaf675b21 Mon Sep 17 00:00:00 2001
>> From: Vagrant Cascadian <vagrant@debian.org>
>> Date: Sun, 23 Aug 2020 14:10:57 -0700
>> Subject: [PATCH] gnu: commencement: bash-mesboot0: Remove store file name.
>
> [..]
>
>> diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
>> index aa30e3fa18..617a12016f 100644
>> --- a/gnu/packages/commencement.scm
>> +++ b/gnu/packages/commencement.scm
>> @@ -792,7 +792,7 @@ $MES -e '(mescc)' module/mescc.scm -- \"$@\"
>> // tcc: error: undefined symbol 'enable_hostname_completion'
>> #define enable_hostname_completion(on_or_off) 0
>>
>> -// /gnu/store/cq0cmv35s9dhilx14zaghlc08gpc0hwr-tcc-boot0-0.9.26-6.c004e9a/lib/libc.a: error: 'sigprocmask' defined twice
>> +// /gnu/store/…-tcc-boot0-0.9.26-6.c004e9a/lib/libc.a: error: 'sigprocmask' defined twice
>> #define HAVE_POSIX_SIGNALS 1
>> #define endpwent(x) 0
>> ")
> ^
>
> This is the closing parenthesis of a string-append that has only this
> one big string; what about removing that string-append altogether?
Agreed.
Vagrant, could you push it to core-updates with this change?
Thanks,
Ludo’.
next prev parent reply other threads:[~2020-09-16 10:22 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-23 21:46 bug#43005: make dist fails: "store file names embedded in the distribution" Vagrant Cascadian
2020-08-24 6:18 ` Jan Nieuwenhuizen
2020-09-16 10:21 ` Ludovic Courtès [this message]
2020-09-16 10:47 ` Jan Nieuwenhuizen
2020-09-16 11:13 ` zimoun
2020-09-16 18:04 ` Vagrant Cascadian
2020-09-16 21:44 ` Jan Nieuwenhuizen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87o8m6nht6.fsf@gnu.org \
--to=ludo@gnu.org \
--cc=43005@debbugs.gnu.org \
--cc=janneke@gnu.org \
--cc=vagrant@debian.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).