From 8abb5fdf474424e91a7ed208d301ffa669c28e1a Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Thu, 10 Nov 2016 14:10:33 +0800 Subject: [PATCH 1/2] Remove redundant command --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ce3a66bec..ac4caa6a9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -121,7 +121,6 @@ install: brew update > /dev/null ; brew install colormake ccache ; brew outdated "pkg-config" || brew upgrade "pkg-config" ; - brew outdated "zlib" || brew upgrade "zlib" ; # libtorrent-rasterbar 1.0.9 brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/477d5060fa093883204d70323965375353e03084/Formula/libtorrent-rasterbar.rb ; From f85b97916c6e1f9f050f280b5533bd6ebe30c3ea Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Thu, 10 Nov 2016 14:13:53 +0800 Subject: [PATCH 2/2] Update ax_boost_system.m4 to d48ec2210047bbf17702700811c3f16a5369e06c --- configure | 2 +- m4/ax_boost_system.m4 | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 901f8426f..2c72cb291 100755 --- a/configure +++ b/configure @@ -5101,7 +5101,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu int main () { -boost::system::system_category +boost::system::error_category *a = 0; ; return 0; } diff --git a/m4/ax_boost_system.m4 b/m4/ax_boost_system.m4 index c4c45559d..43570a513 100644 --- a/m4/ax_boost_system.m4 +++ b/m4/ax_boost_system.m4 @@ -31,7 +31,7 @@ # and this notice are preserved. This file is offered as-is, without any # warranty. -#serial 17 +#serial 18 AC_DEFUN([AX_BOOST_SYSTEM], [ @@ -68,9 +68,10 @@ AC_DEFUN([AX_BOOST_SYSTEM], ax_cv_boost_system, [AC_LANG_PUSH([C++]) CXXFLAGS_SAVE=$CXXFLAGS + CXXFLAGS= AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include ]], - [[boost::system::system_category]])], + [[boost::system::error_category *a = 0;]])], ax_cv_boost_system=yes, ax_cv_boost_system=no) CXXFLAGS=$CXXFLAGS_SAVE AC_LANG_POP([C++])