From: Ondřej Surý <ondrej@sury.org>
Date: Tue, 2 Jul 2019 17:56:32 +0000 (+0200)
Subject: Enable GeoIP2 for all builds and enable old GeoIP only for Debian jessie and Ubuntu... 
X-Git-Tag: v9.15.2~12^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9c509c26840859dd4a09fbc226e1062a97fd19d6;p=thirdparty%2Fbind9.git

Enable GeoIP2 for all builds and enable old GeoIP only for Debian jessie and Ubuntu xenial builds
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8e28b5a30c3..43c939c6a45 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -119,13 +119,28 @@ stages:
     untracked: true
     expire_in: "1 hour"
 
+.configure: &configure |
+    ./configure \
+    --disable-maintainer-mode \
+    --enable-developer \
+    --with-libtool \
+    --disable-static \
+    --with-cmocka \
+    --with-libxml2 \
+    --with-json-c \
+    --with-geoip2 \
+    --prefix=$HOME/.local \
+    --without-make-clean \
+    $EXTRA_CONFIGURE \
+    || cat config.log
+    
 .build: &build_job
   <<: *default_triggering_rules
   stage: build
   before_script:
     - test -w "${CCACHE_DIR}" && export PATH="/usr/lib/ccache:${PATH}"
   script:
-    - ./configure --disable-maintainer-mode --enable-developer --with-libtool --disable-static --with-cmocka  --with-libxml2 --with-json-c --prefix=$HOME/.local --without-make-clean $EXTRA_CONFIGURE || cat config.log
+    - *configure
     - make -j${BUILD_PARALLEL_JOBS:-1} -k all V=1
     - test -z "${RUN_MAKE_INSTALL}" || make install
   dependencies:
@@ -294,7 +309,7 @@ gcc:jessie:amd64:
   variables:
     CC: gcc
     CFLAGS: "-Wall -Wextra -O2 -g"
-    EXTRA_CONFIGURE: "--without-cmocka --with-python"
+    EXTRA_CONFIGURE: "--without-cmocka --with-python --without-geoip2 --with-geoip"
   <<: *debian_jessie_amd64_image
   <<: *build_job
 
@@ -337,7 +352,7 @@ gcc:sid:amd64:
   variables:
     CC: gcc
     CFLAGS: "-Wall -Wextra -O3 -g"
-    EXTRA_CONFIGURE: "--with-libidn2"
+    EXTRA_CONFIGURE: "--with-libidn22"
     RUN_MAKE_INSTALL: 1
   <<: *debian_sid_amd64_image
   <<: *build_job
@@ -404,6 +419,7 @@ gcc:xenial:amd64:
   variables:
     CC: gcc
     CFLAGS: "-Wall -Wextra -O2 -g"
+    EXTRA_CONFIGURE: "--without-geoip2 --with-geoip"
   <<: *ubuntu_xenial_amd64_image
   <<: *build_job