From 2ccef2e85d2e77b95ce4aa1e8b4dbde6d0ea7d1b Mon Sep 17 00:00:00 2001 From: Shivani Bhardwaj Date: Thu, 4 Jul 2019 14:27:27 +0530 Subject: [PATCH] appveyor: Remove enable-geoip from build script There is no GeoIP2 package for cygwin and the legacy format GeoIP has been discontinued. This patch prevents appveyor to fail because of unavailability of libmaxminddb GeoIP2 library. References: - https://support.maxmind.com/geolite-legacy-discontinuation-notice/ - https://cygwin.com/cgi-bin2/package-grep.cgi?grep=geoip&arch=x86_64 --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 3419d1c98e..9d6b25c46a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -31,7 +31,7 @@ init: install: - ps: 'Start-FileDownload "http://cygwin.com/$env:CYG_SETUP" -FileName "$env:CYG_SETUP"' - '%CYG_SETUP% -gqnNdO --quiet-mode --no-shortcuts --only-site --root "%CYG_ROOT%" --site "%CYG_MIRROR%" --local-package-dir "%CYG_CACHE%" > NUL 2>&1' - - '%CYG_SETUP% --quiet-mode --no-shortcuts --only-site --root "%CYG_ROOT%" --site "%CYG_MIRROR%" --local-package-dir "%CYG_CACHE%" --packages automake,bison,gcc-core,libtool,make,gettext-devel,gettext,intltool,pkg-config,clang,llvm,libpcre-devel,file-devel,wget,zlib-devel,libnss-devel,libnspr-devel,libGeoIP-devel,libyaml-devel,luajit-devel,unzip,libiconv,libiconv-devel > NUL 2>&1' + - '%CYG_SETUP% --quiet-mode --no-shortcuts --only-site --root "%CYG_ROOT%" --site "%CYG_MIRROR%" --local-package-dir "%CYG_CACHE%" --packages automake,bison,gcc-core,libtool,make,gettext-devel,gettext,intltool,pkg-config,clang,llvm,libpcre-devel,file-devel,wget,zlib-devel,libnss-devel,libnspr-devel,libyaml-devel,luajit-devel,unzip,libiconv,libiconv-devel > NUL 2>&1' - '%CYG_BASH% -lc "cygcheck -dc cygwin"' - '%CYG_BASH% -lc "wget https://www.winpcap.org/install/bin/WpdPack_4_1_2.zip && ls && unzip WpdPack_4_1_2.zip"' - '%CYG_BASH% -lc "cp WpdPack/Lib/libpacket.a /usr/lib/"' @@ -47,7 +47,7 @@ build_script: - 'echo building...' - '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER; bash ./qa/travis-libhtp.sh"' - '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER; ./autogen.sh"' - - '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER; ./configure --enable-unittests --disable-shared --disable-gccmarch-native --enable-luajit --enable-geoip"' + - '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER; ./configure --enable-unittests --disable-shared --disable-gccmarch-native --enable-luajit"' - '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0