Run ./nix/sync-with-upstream after pull!

Run ./nix/sync-with-upstream after pull!

[Ludovic Courtès]

Hi!

After pulling commit 0c5028f, you’ll should get an error like this when
building:

--8<---------------cut here---------------start------------->8---
nix/libutil/hash.cc:244:13: error: member ‘guix_hash_context nix::Ctx::md5’ with constructor not allowed in union
     MD5_CTX md5;
             ^
nix/libutil/hash.cc:244:13: note: unrestricted unions only available with -std=c++11 or -std=gnu++11
--8<---------------cut here---------------end--------------->8---

Make sure to run ./nix/sync-with-upstream to fix that (this script has
an additional patch rule to fix that.)

Thanks,
Ludo’.

Re: Run ./nix/sync-with-upstream after pull!

[Andreas Enge]

On Thu, Dec 19, 2013 at 12:06:49AM +0100, Ludovic Courtès wrote:
> Make sure to run ./nix/sync-with-upstream to fix that (this script has
> an additional patch rule to fix that.)

When doing this, I get:

sync-with-upstream: `..' is not the valid top-level source directory


When I do "cd nix; ./sync-with-upstream", I get:

(lots of messages)
`./libstore/pathlocks.hh' -> `../../nix/./libstore/pathlocks.hh'
removed `../nix/libstore/schema.sql.hh'
`../nix-upstream/COPYING' -> `../nix/COPYING'
`../nix-upstream/AUTHORS' -> `../nix/AUTHORS'
sed: can't read ../nix/libutil/hash.{cc,hh}: No such file or directory

The files ../nix/libutil/hash.cc and ../nix/libutil/hash.hh exist, but
apparently the command looks for a single file with { and } in its name.

The following modification solves the problem:
diff --git a/nix/sync-with-upstream b/nix/sync-with-upstream
index bb3a68b..dc7a7e3 100755
--- a/nix/sync-with-upstream
+++ b/nix/sync-with-upstream
@@ -76,5 +76,7 @@ sed -i "$top_srcdir/nix/libstore/gc.cc"                               
 # context is expected to truly copy the underlying hash context.  The copy
 # constructor cannot be used in 'Ctx' if that's a union, so turn it into a
 # structure (we can afford to two wasted words.)
-sed -i "$top_srcdir/nix/libutil/hash".{cc,hh}  \
+sed -i "$top_srcdir/nix/libutil/hash".cc       \
+    -e 's|union Ctx|struct Ctx|g'
+sed -i "$top_srcdir/nix/libutil/hash".hh       \
     -e 's|union Ctx|struct Ctx|g'

Andreas

Re: Run ./nix/sync-with-upstream after pull!

[Ludovic Courtès]

Andreas Enge <andreas@enge.fr> skribis:

> On Thu, Dec 19, 2013 at 12:06:49AM +0100, Ludovic Courtès wrote:
>> Make sure to run ./nix/sync-with-upstream to fix that (this script has
>> an additional patch rule to fix that.)
>
> When doing this, I get:
>
> sync-with-upstream: `..' is not the valid top-level source directory
>
>
> When I do "cd nix; ./sync-with-upstream",

Right, that’s actually the right command.  :-)

> I get:
>
> (lots of messages)
> `./libstore/pathlocks.hh' -> `../../nix/./libstore/pathlocks.hh'
> removed `../nix/libstore/schema.sql.hh'
> `../nix-upstream/COPYING' -> `../nix/COPYING'
> `../nix-upstream/AUTHORS' -> `../nix/AUTHORS'
> sed: can't read ../nix/libutil/hash.{cc,hh}: No such file or directory
>
> The files ../nix/libutil/hash.cc and ../nix/libutil/hash.hh exist, but
> apparently the command looks for a single file with { and } in its name.

What does ‘/bin/sh --version’ report?  I bet it’s dash instead of Bash.

> The following modification solves the problem:
> diff --git a/nix/sync-with-upstream b/nix/sync-with-upstream
> index bb3a68b..dc7a7e3 100755
> --- a/nix/sync-with-upstream
> +++ b/nix/sync-with-upstream
> @@ -76,5 +76,7 @@ sed -i "$top_srcdir/nix/libstore/gc.cc"                               
>  # context is expected to truly copy the underlying hash context.  The copy
>  # constructor cannot be used in 'Ctx' if that's a union, so turn it into a
>  # structure (we can afford to two wasted words.)
> -sed -i "$top_srcdir/nix/libutil/hash".{cc,hh}  \
> +sed -i "$top_srcdir/nix/libutil/hash".cc       \
> +    -e 's|union Ctx|struct Ctx|g'
> +sed -i "$top_srcdir/nix/libutil/hash".hh       \
>      -e 's|union Ctx|struct Ctx|g'

I’ve applied something similar.

Thanks,
Ludo’.

Re: Run ./nix/sync-with-upstream after pull!

[Andreas Enge]

On Thu, Dec 19, 2013 at 12:43:25AM +0100, Ludovic Courtès wrote:
> What does ‘/bin/sh --version’ report?  I bet it’s dash instead of Bash.

"Illegal option --"  ;-)

But I confirm it is dash in debian. And that your fix works.

Andreas