Re: [PATCH] build: allow ./bootstrap --srcdir=... to work with a git submodule
Jim Meyering wrote: When using git-bisect to see exactly when pr -oN broke, I was dismayed to see that I couldn't easily build some older versions from git due to their dependency on older versions of gnulib. Of course, this isn't at all surprising, once you think about it, and I've been remiss for not doing this sooner... So I'm about to make gnulib a git submodule of coreutils. However, first, there's a small portability problem in the bootstrap script that makes --scrdir=... fail to run module init with versions of git newer than the one mentioned in the log below. I confess I haven't tried this with an older version of git (I don't even have an old enough version installed), so if someone can confirm bootstrap --srcdir=... succeeds and a subsequent git submodule status prints something, I'd appreciate it. Works fine here... $ git --version git version 1.5.3.6 $ ./bootstrap --gnulib-srcdir=/home/padraig/git/gnulib $ git submodule status 8a4dc70a0d4efd5f53abb1f7a1c24fe67915f96b gnulib (v0.0-1958-g8a4dc70) cheers, Pádraig. ___ Bug-coreutils mailing list Bug-coreutils@gnu.org http://lists.gnu.org/mailman/listinfo/bug-coreutils
[PATCH] build: allow ./bootstrap --srcdir=... to work with a git submodule
When using git-bisect to see exactly when pr -oN broke,
I was dismayed to see that I couldn't easily build some older
versions from git due to their dependency on older versions
of gnulib. Of course, this isn't at all surprising, once you
think about it, and I've been remiss for not doing this sooner...
So I'm about to make gnulib a git submodule of coreutils.
However, first, there's a small portability problem in the bootstrap
script that makes --scrdir=... fail to run module init with versions
of git newer than the one mentioned in the log below.
I confess I haven't tried this with an older version of git (I don't
even have an old enough version installed), so if someone can confirm
bootstrap --srcdir=... succeeds and a subsequent git submodule status
prints something, I'd appreciate it.
From 51b88670cb0434d34ee6d605edc4205629c3d51c Mon Sep 17 00:00:00 2001
From: Jim Meyering meyer...@redhat.com
Date: Sat, 7 Mar 2009 16:11:54 +0100
Subject: [PATCH] build: allow ./bootstrap --srcdir=... to work with a git
submodule
* bootstrap (git_modules_config): Use GIT_CONFIG, not GIT_CONFIG_LOCAL.
The latter was removed in v1.5.6.1-109-gdc87183.
---
bootstrap |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/bootstrap b/bootstrap
index 3264171..27e4ec2 100755
--- a/bootstrap
+++ b/bootstrap
@@ -2,7 +2,7 @@
# Bootstrap this package from checked-out sources.
-# Copyright (C) 2003-2008 Free Software Foundation, Inc.
+# Copyright (C) 2003-2009 Free Software Foundation, Inc.
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -342,7 +342,7 @@ cleanup_gnulib() {
}
git_modules_config () {
- GIT_CONFIG_LOCAL=.gitmodules git config $@
+ GIT_CONFIG=.gitmodules git config $@
}
# Get gnulib files.
--
1.6.2.rc1.285.gc5f54
___
Bug-coreutils mailing list
Bug-coreutils@gnu.org
http://lists.gnu.org/mailman/listinfo/bug-coreutils
Re: [PATCH] build: allow ./bootstrap --srcdir=... to work with a git submodule
On Sat, Mar 7, 2009 at 5:19 PM, Jim Meyering j...@meyering.net wrote: When using git-bisect to see exactly when pr -oN broke, I was dismayed to see that I couldn't easily build some older versions from git due to their dependency on older versions of gnulib. Of course, this isn't at all surprising, once you think about it, and I've been remiss for not doing this sooner... So I'm about to make gnulib a git submodule of coreutils. FWIW, I approached this for findutils by recording the appropriate gnulib version in import-gnulib.config so that the correct version of gnulib is checked out during the bootstrap process. James. ___ Bug-coreutils mailing list Bug-coreutils@gnu.org http://lists.gnu.org/mailman/listinfo/bug-coreutils
