From: Andreas Enge <andreas@enge.fr>
To: "Ludovic Courtès" <ludo@gnu.org>
Cc: guix-devel@gnu.org
Subject: Re: Run ./nix/sync-with-upstream after pull!
Date: Thu, 19 Dec 2013 00:31:59 +0100 [thread overview]
Message-ID: <20131218233159.GA12553@debian> (raw)
In-Reply-To: <87eh5921yu.fsf@gnu.org>
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
next prev parent reply other threads:[~2013-12-18 23:32 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-18 23:06 Run ./nix/sync-with-upstream after pull! Ludovic Courtès
2013-12-18 23:31 ` Andreas Enge [this message]
2013-12-18 23:43 ` Ludovic Courtès
2013-12-18 23:53 ` Andreas Enge
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20131218233159.GA12553@debian \
--to=andreas@enge.fr \
--cc=guix-devel@gnu.org \
--cc=ludo@gnu.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 external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.