summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitlab-ci.yml9
-rw-r--r--README.md1
-rw-r--r--bootstrap.conf7
3 files changed, 10 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a14cebb9d0..5c8a297ead 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -41,8 +41,7 @@ doc-dist.Fedora:
stage: stage1-testing
image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
script:
- - git submodule update --init --no-fetch
- - ./bootstrap
+ - SUBMODULE_NOFETCH=1 ./bootstrap
- CFLAGS="-std=c99 -O2 -g" dash ./configure --disable-gcc-warnings --cache-file cache/config.cache --prefix=/usr --libdir=/usr/lib64 --disable-cxx --disable-non-suiteb-curves --enable-gtk-doc --disable-maintainer-mode
- make -C doc stamp-vti && make -C doc stamp-1 && make -j$(nproc)
- make -C doc gnutls.html
@@ -59,8 +58,7 @@ abi/coverage.Debian:
stage: stage1-testing
image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$DEBIAN_BUILD
script:
- - git submodule update --init --no-fetch
- - ./bootstrap
+ - SUBMODULE_NOFETCH=1 ./bootstrap
- CFLAGS="-g -Og" dash ./configure --disable-gcc-warnings --cache-file cache/config.cache --prefix=/usr --libdir=/usr/lib64 --enable-code-coverage --disable-maintainer-mode --disable-doc
- make -j$(nproc)
- make abi-check
@@ -189,8 +187,7 @@ asan.Fedora.x86_64:
stage: stage1-testing
image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD
script:
- - git submodule update --init --no-fetch
- - ./bootstrap
+ - SUBMODULE_NOFETCH=1 ./bootstrap
- CFLAGS="-fsanitize=address -g -O2" CXXFLAGS=$CFLAGS LDFLAGS="-static-libasan"
dash ./configure --disable-gcc-warnings --disable-doc --cache-file cache/config.cache --disable-non-suiteb-curves --disable-guile
- make -j$(nproc)
diff --git a/README.md b/README.md
index 34660e2876..7c70f40f1c 100644
--- a/README.md
+++ b/README.md
@@ -100,7 +100,6 @@ To download the version controlled sources:
```
$ git clone https://gitlab.com/gnutls/gnutls.git
$ cd gnutls
-$ git submodule update --init
```
The next step is to bootstrap and ./configure:
diff --git a/bootstrap.conf b/bootstrap.conf
index 836f1a6f8a..87bf4d5866 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -59,6 +59,13 @@ else
$GTKDOCIZE
fi
+# update git submodules
+git_options=
+if test -n "$SUBMODULE_NOFETCH"; then
+ git_options="--no-fetch"
+fi
+git submodule update --init $git_options
+
bootstrap_post_import_hook ()
{
# we re-use malloc-posix from the original gnulib