]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
Do not test "make depend" for out-of-tree builds
authorMichał Kępień <michal@isc.org>
Fri, 30 Oct 2020 07:49:16 +0000 (08:49 +0100)
committerMichał Kępień <michal@isc.org>
Fri, 30 Oct 2020 07:49:16 +0000 (08:49 +0100)
The make/mkdep script does not understand the concept of generated
source files (like lib/dns/dnstap.pb-c.c), which prevents it from
working correctly for out-of-tree builds.  As "make depend" is not
required for building BIND and the "depend" make target was removed
altogether in the development branch, just prevent the "make depend"
check from being performed for out-of-tree builds in GitLab CI instead
of trying to add support for handling generated source files to
make/mkdep.

.gitlab-ci.yml

index 36b364316ca26b160b42dfa99aa6a6d8348b0200..3f99567896c6e541134be84c851ef00bb858ab73 100644 (file)
@@ -222,8 +222,8 @@ stages:
     - test -n "${OOT_BUILD_WORKSPACE}" && mkdir "${OOT_BUILD_WORKSPACE}" && cd "${OOT_BUILD_WORKSPACE}"
   script:
     - *configure
-    - make -j${BUILD_PARALLEL_JOBS:-1} depend 2>&1 | tee make-depend.log
-    - grep -F "error:" make-depend.log && exit 1
+    - test -n "${SKIP_MAKE_DEPEND}" || make -j${BUILD_PARALLEL_JOBS:-1} depend 2>&1 | tee make-depend.log
+    - test -n "${SKIP_MAKE_DEPEND}" || ( ! grep -F "error:" make-depend.log )
     - make -j${BUILD_PARALLEL_JOBS:-1} -k all V=1
     - test -z "${RUN_MAKE_INSTALL}" || make install
     - test -z "${RUN_MAKE_INSTALL}" || sh util/check-make-install
@@ -767,6 +767,7 @@ gcc:out-of-tree:
     CFLAGS: "${CFLAGS_COMMON} -Og"
     CONFIGURE: ../configure
     EXTRA_CONFIGURE: "--enable-dnstap --with-libidn2 --with-lmdb"
+    SKIP_MAKE_DEPEND: 1
     RUN_MAKE_INSTALL: 1
     OOT_BUILD_WORKSPACE: workspace
   <<: *base_image