unofficial mirror of bug-guix@gnu.org 
 help / color / mirror / Atom feed
* bug#43005: make dist fails: "store file names embedded in the distribution"
@ 2020-08-23 21:46 Vagrant Cascadian
  2020-08-24  6:18 ` Jan Nieuwenhuizen
  0 siblings, 1 reply; 7+ messages in thread
From: Vagrant Cascadian @ 2020-08-23 21:46 UTC (permalink / raw)
  To: 43005


[-- Attachment #1.1: Type: text/plain, Size: 383 bytes --]

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.

live well,
  vagrant


[-- Attachment #1.2: 0001-gnu-commencement-bash-mesboot0-Remove-store-file-nam.patch --]
[-- Type: text/x-diff, Size: 1167 bytes --]

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.

This is a follow-up to commit d9484fba91bc360ad18fe82cb9f4963ccb32c580, and
fixes "make dist".

* gnu/packages/commencement (bash-mesboot0): Remove reference to store item.
---
 gnu/packages/commencement.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
 ")
-- 
2.20.1


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]

^ permalink raw reply	[flat|nested] 7+ messages in thread

* bug#43005: make dist fails: "store file names embedded in the distribution"
  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
  0 siblings, 1 reply; 7+ messages in thread
From: Jan Nieuwenhuizen @ 2020-08-24  6:18 UTC (permalink / raw)
  To: Vagrant Cascadian; +Cc: 43005

Vagrant Cascadian writes:

Hello!

> 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

--8<---------------cut here---------------start------------->8---
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
-")
+"))
                         config.h)
                (close config.h))
              #t))
--8<---------------cut here---------------end--------------->8---

Thanks for catching this!

Greetings,
Janneke

> 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?

-- 
Jan Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.com




^ permalink raw reply	[flat|nested] 7+ messages in thread

* bug#43005: make dist fails: "store file names embedded in the distribution"
  2020-08-24  6:18 ` Jan Nieuwenhuizen
@ 2020-09-16 10:21   ` Ludovic Courtès
  2020-09-16 10:47     ` Jan Nieuwenhuizen
  2020-09-16 18:04     ` Vagrant Cascadian
  0 siblings, 2 replies; 7+ messages in thread
From: Ludovic Courtès @ 2020-09-16 10:21 UTC (permalink / raw)
  To: Jan Nieuwenhuizen; +Cc: Vagrant Cascadian, 43005

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’.




^ permalink raw reply	[flat|nested] 7+ messages in thread

* bug#43005: make dist fails: "store file names embedded in the distribution"
  2020-09-16 10:21   ` Ludovic Courtès
@ 2020-09-16 10:47     ` Jan Nieuwenhuizen
  2020-09-16 11:13       ` zimoun
  2020-09-16 18:04     ` Vagrant Cascadian
  1 sibling, 1 reply; 7+ messages in thread
From: Jan Nieuwenhuizen @ 2020-09-16 10:47 UTC (permalink / raw)
  To: Ludovic Courtès; +Cc: Vagrant Cascadian, 43005

Ludovic Courtès writes:

Hello,

> Jan Nieuwenhuizen <janneke@gnu.org> skribis:
>
>> 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

[..]

> Well done!  Could you push to ‘master’ (with a “Fixes” line in the
> commit log)?

Pushed to master as b85863f7ce99d05205e57358b36ff50656cca08b.

Meanwile we have a duplicate bug: <https://bugs.gnu.org/43435>
(it finally rang a bell on IRC...).

Janneke

-- 
Jan Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.com




^ permalink raw reply	[flat|nested] 7+ messages in thread

* bug#43005: make dist fails: "store file names embedded in the distribution"
  2020-09-16 10:47     ` Jan Nieuwenhuizen
@ 2020-09-16 11:13       ` zimoun
  0 siblings, 0 replies; 7+ messages in thread
From: zimoun @ 2020-09-16 11:13 UTC (permalink / raw)
  To: Jan Nieuwenhuizen; +Cc: Vagrant Cascadian, 43005

On Wed, 16 Sep 2020 at 12:49, Jan Nieuwenhuizen <janneke@gnu.org> wrote:

> Meanwile we have a duplicate bug: <https://bugs.gnu.org/43435>
> (it finally rang a bell on IRC...).

I have closed the duplicate referencing this one.  Sorry for missing this one.

Cheers,
simon




^ permalink raw reply	[flat|nested] 7+ messages in thread

* bug#43005: make dist fails: "store file names embedded in the distribution"
  2020-09-16 10:21   ` Ludovic Courtès
  2020-09-16 10:47     ` Jan Nieuwenhuizen
@ 2020-09-16 18:04     ` Vagrant Cascadian
  2020-09-16 21:44       ` Jan Nieuwenhuizen
  1 sibling, 1 reply; 7+ messages in thread
From: Vagrant Cascadian @ 2020-09-16 18:04 UTC (permalink / raw)
  To: Ludovic Courtès, Jan Nieuwenhuizen; +Cc: 43005

On 2020-09-16, Ludovic Courtès wrote:
> 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?

Not in a good position to push anything for a few days; if someone else
could that would be great!

live well,
  vagrant




^ permalink raw reply	[flat|nested] 7+ messages in thread

* bug#43005: make dist fails: "store file names embedded in the distribution"
  2020-09-16 18:04     ` Vagrant Cascadian
@ 2020-09-16 21:44       ` Jan Nieuwenhuizen
  0 siblings, 0 replies; 7+ messages in thread
From: Jan Nieuwenhuizen @ 2020-09-16 21:44 UTC (permalink / raw)
  To: Vagrant Cascadian; +Cc: 43005-done

Vagrant Cascadian writes:

Hi!

> On 2020-09-16, Ludovic Courtès wrote:
>> Hello!
>>
>> Jan Nieuwenhuizen <janneke@gnu.org> skribis:
>>> 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?
>
> Not in a good position to push anything for a few days; if someone else
> could that would be great!

Sure.  Pushed with minor change (removing encompassing string-append) to
core-updates as 7467f9857dc530861735ebffe2c9376c8dfb80b7

Thanks!
Janneke

-- 
Jan Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.com




^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2020-09-16 21:45 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
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

unofficial mirror of bug-guix@gnu.org 

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://yhetil.org/guix-bugs/0 guix-bugs/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 guix-bugs guix-bugs/ https://yhetil.org/guix-bugs \
		bug-guix@gnu.org
	public-inbox-index guix-bugs

Example config snippet for mirrors.
Newsgroups are available over NNTP:
	nntp://news.yhetil.org/yhetil.gnu.guix.bugs
	nntp://news.gmane.io/gmane.comp.gnu.guix.bugs


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git