From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Mon, 7 May 2018 06:12:12 +0000 (+0200)
Subject: Makefile.am: optimized the abi-check configure step
X-Git-Tag: gnutls_3_6_3~143
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ccb03b58d36f279fa7cc71d2b81af4dfbfb3d513;p=thirdparty%2Fgnutls.git

Makefile.am: optimized the abi-check configure step

Also ensured that the same build flags are applied in both builds
for ABI checking.

Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 841cab3557..d78167324b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,7 +7,7 @@ stages:
 # name to allow expiration of old caches.
 
 cache:
-  key: "$CI_JOB_NAME-ver3"
+  key: "$CI_JOB_NAME-ver4"
   paths:
     - cache/
 
@@ -61,7 +61,7 @@ abi-coverage.Fedora:
   script:
   - git submodule update --init --no-fetch
   - make autoreconf
-  - CFLAGS="-std=c99 -g -Og" dash ./configure --disable-gcc-warnings --cache-file cache/config.cache  --prefix=/usr --libdir=/usr/lib64 --enable-code-coverage --disable-non-suiteb-curves --disable-maintainer-mode --disable-doc
+  - CFLAGS="-g -Og" dash ./configure --disable-gcc-warnings --cache-file cache/config.cache  --prefix=/usr --libdir=/usr/lib64 --enable-code-coverage --disable-non-suiteb-curves --disable-maintainer-mode --disable-doc
     && make -j$(nproc)
   - make abi-check
   - make pic-check
diff --git a/Makefile.am b/Makefile.am
index 2269637acd..8638bd8501 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -76,8 +76,11 @@ ABIVER=$(shell git for-each-ref --sort=taggerdate --format '%(refname)' refs/tag
 	@echo "Creating ABI for $(ABIVER)"
 	cd $(ABI_TMPCLONEDIR) && \
 	  git checkout $(ABIREF) && \
-	  make autoreconf && CFLAGS="-g -Og" ./configure --disable-doc && \
-	  $(MAKE) -j$$(nproc) -C gl && $(MAKE) -j$$(nproc) -C lib && $(MAKE) -j$$(nproc) -C libdane
+	  make autoreconf && if test -f ../cache/config.cache;then\
+	    CFLAGS="-g -Og" ./configure --disable-doc --cache-file ../cache/config.cache;\
+	  else\
+	    CFLAGS="-g -Og" ./configure --disable-doc;\
+	  fi && $(MAKE) -j$$(nproc) -C gl && $(MAKE) -j$$(nproc) -C lib && $(MAKE) -j$$(nproc) -C libdane
 	touch $@
 
 abi-check: .prev-tag-abi.stamp