[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Errors when building from source
From: |
Akim Demaille |
Subject: |
Re: Errors when building from source |
Date: |
Fri, 4 Jan 2019 18:23:00 +0100 |
Hi Wouter,
> Le 28 déc. 2018 à 08:17, Akim Demaille <address@hidden> a écrit :
>
> I can reproduce this error: somewhere inside ./bootstrap,
> symlinks to nonexistent files are removed. And m4/m4.m4 is
> a symlink inside submodule/autoconf: if you run ./bootstrap
> before submodule update --init, it will kill this symlink.
>
> I'll see if I can do something about it.
This was addressed in gnulib. It should be the last time some encounters this
problem. Cheers!
commit d6245ddc802b52bd6f38a491d5bb026e1649824d
Author: Akim Demaille <address@hidden>
Date: Fri Jan 4 18:19:17 2019 +0100
gnulib: update
In particular, report uninitialized submodules instead of breaking
symlinks.
For reports, see
https://lists.gnu.org/archive/html/bug-bison/2011-05/msg00012.html
https://lists.gnu.org/archive/html/help-bison/2018-12/msg00034.html
For a fix, see
https://lists.gnu.org/archive/html/bug-gnulib/2019-01/msg00024.html
diff --git a/gnulib b/gnulib
index 95c96b6d..ce6b5cfa 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 95c96b6dddd31f3676f72ed044d0c493ab5642d8
+Subproject commit ce6b5cfac8dc60297d433bc868d32469dc06c36d
In gnulib:
commit ce6b5cfac8dc60297d433bc868d32469dc06c36d
Author: Akim Demaille <address@hidden>
Date: Mon Dec 31 19:20:46 2018 +0100
bootstrap: die when some submodules are not initialized
* build-aux/bootstrap: Make sure all submodules are initialized.
diff --git a/ChangeLog b/ChangeLog
index f520d5e72..6aa873cf7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2019-01-04 Akim Demaille <address@hidden>
+
+ bootstrap: die when some submodules are not initialized
+ * build-aux/bootstrap: Make sure all submodules are initialized.
+
2019-01-04 Bruno Haible <address@hidden>
bitsetv: Fix module dependencies.
diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index c13b486c5..5b08e7e2d 100755
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -1,6 +1,6 @@
#! /bin/sh
# Print a version string.
-scriptversion=2018-10-13.05; # UTC
+scriptversion=2019-01-04.17; # UTC
# Bootstrap this package from checked-out sources.
@@ -963,6 +963,16 @@ fi
bootstrap_post_import_hook \
|| die "bootstrap_post_import_hook failed"
+# Don't proceed if there are uninitialized submodules. In particular,
+# the next step will remove dangling links, which might be links into
+# uninitialized submodules.
+#
+# Uninitialized submodules are listed with an initial dash.
+if $use_git && git submodule | grep '^-' >/dev/null; then
+ die "some git submodules are not initialized. " \
+ "Run 'git submodule init' and bootstrap again."
+fi
+
# Remove any dangling symlink matching "*.m4" or "*.[ch]" in some
# gnulib-populated directories. Such .m4 files would cause aclocal to fail.
# The following requires GNU find 4.2.3 or newer. Considering the usual
- Re: Errors when building from source,
Akim Demaille <=