From 1957bcaa99f7fe1f4b48517e6ce1244d1bed3c62 Mon Sep 17 00:00:00 2001 From: Evan Hunt Date: Tue, 2 Jul 2019 16:33:00 -0700 Subject: [PATCH] remove --with-geoip and change --without-geoip2 to --disable-geoip in CI --- .gitlab-ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 470385f4fa..b66abf5c81 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -134,7 +134,6 @@ stages: --with-cmocka \ --with-libxml2 \ --with-json-c \ - --with-geoip2 \ --prefix=$HOME/.local \ --without-make-clean \ $EXTRA_CONFIGURE \ @@ -321,7 +320,7 @@ gcc:jessie:amd64: variables: CC: gcc CFLAGS: "-Wall -Wextra -O2 -g" - EXTRA_CONFIGURE: "--without-cmocka --with-python --without-geoip2 --with-geoip" + EXTRA_CONFIGURE: "--without-cmocka --with-python --disable-geoip" <<: *debian_jessie_amd64_image <<: *build_job @@ -431,7 +430,7 @@ gcc:xenial:amd64: variables: CC: gcc CFLAGS: "-Wall -Wextra -O2 -g" - EXTRA_CONFIGURE: "--without-geoip2 --with-geoip" + EXTRA_CONFIGURE: "--disable-geoip" <<: *ubuntu_xenial_amd64_image <<: *build_job