You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jo...@apache.org on 2019/11/12 09:02:32 UTC
svn commit: r1869684 - in /httpd/httpd/trunk: .travis.yml configure.in
Author: jorton
Date: Tue Nov 12 09:02:31 2019
New Revision: 1869684
URL: http://svn.apache.org/viewvc?rev=1869684&view=rev
Log:
Update APR version requirement to 1.6 or later per rough consensus on
dev@ (see list thread from msgid <20...@redhat.com>).
* configure.in: Fail with APR < 1.6.
* .travis.yml: Build on Bionic by default, only build w/APR 1.5.x for
the 2.4.x branch.
Modified:
httpd/httpd/trunk/.travis.yml
httpd/httpd/trunk/configure.in
Modified: httpd/httpd/trunk/.travis.yml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/.travis.yml?rev=1869684&r1=1869683&r2=1869684&view=diff
==============================================================================
--- httpd/httpd/trunk/.travis.yml (original)
+++ httpd/httpd/trunk/.travis.yml Tue Nov 12 09:02:31 2019
@@ -1,6 +1,8 @@
language: c
os:
- linux
+dist:
+ - bionic
cache:
directories:
- /home/travis/perl5
@@ -35,14 +37,8 @@ matrix:
- name: Linux Ubuntu, Shared MPMs, all-modules
env: CONFIG="--enable-mods-shared=reallyall --enable-mpms-shared=all"
# -------------------------------------------------------------------------
- - name: Linux Ubuntu Bionic, all-modules
+ - name: Linux Ubuntu, GCC 7 maintainer-mode w/-Werror
os: linux
- dist: bionic
- env: CONFIG="--enable-mods-shared=reallyall"
- # -------------------------------------------------------------------------
- - name: Linux Ubuntu Bionic, GCC 7 maintainer-mode w/-Werror
- os: linux
- dist: bionic
env: CONFIG="--enable-mods-shared=reallyall --enable-maintainer-mode NOTEST_CFLAGS=-Werror CC=gcc-7"
SKIP_TESTING=1
# -------------------------------------------------------------------------
@@ -66,11 +62,17 @@ matrix:
- libnghttp2-dev
- libjansson-dev
# -------------------------------------------------------------------------
- - if: branch = trunk
+ - if: branch != 2.4.x
name: Linux Ubuntu, APR trunk
env: APR_VERSION=trunk APR_CONFIG="--with-crypto"
CONFIG="--enable-mods-shared=reallyall"
# -------------------------------------------------------------------------
+ - if: branch = 2.4.x
+ name: Linux Ubuntu Xenial, all-modules
+ os: linux
+ dist: xenial
+ env: CONFIG="--enable-mods-shared=reallyall"
+ # -------------------------------------------------------------------------
- name: Linux Ubuntu, APR 1.7.0, APR-util 1.6.1
env: APR_VERSION=1.7.0 APU_VERSION=1.6.1
CONFIG="--enable-mods-shared=reallyall"
@@ -82,7 +84,8 @@ matrix:
APU_CONFIG="--with-crypto"
CONFIG="--enable-mods-shared=reallyall"
# -------------------------------------------------------------------------
- - name: Linux Ubuntu, APR 1.5.1, APR-util 1.5.4
+ - if: branch = 2.4.x
+ name: Linux Ubuntu, APR 1.5.1, APR-util 1.5.4
env: APR_VERSION=1.5.1 APU_VERSION=1.5.4
CONFIG="--enable-mods-shared=reallyall"
# -------------------------------------------------------------------------
Modified: httpd/httpd/trunk/configure.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/configure.in?rev=1869684&r1=1869683&r2=1869684&view=diff
==============================================================================
--- httpd/httpd/trunk/configure.in (original)
+++ httpd/httpd/trunk/configure.in Tue Nov 12 09:02:31 2019
@@ -96,8 +96,8 @@ else
APR_FIND_APR("$srcdir/srclib/apr", "./srclib/apr", 1, 1 2, [
version=`$apr_config --version`
case x${version} in
- x1.[[0-3]].*)
- AC_MSG_WARN([APR version 1.4.0 or later is required, found $version])
+ x1.[[0-5]].*)
+ AC_MSG_WARN([APR version 1.6.0 or later is required, found $version])
apr_acceptable=no
;;
esac