summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-02-10 17:57:48 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-02-10 17:58:18 +0100
commitcdd8ab7e0caa5b6845581afd5fc69bc69b5589df (patch)
treefe05cbf7a3914c41d45f4d98cbb5881c5f774b16
parent4f405d8c1ff84a0db35c9a771776d170f628df57 (diff)
...next attempt at getting this through both GCC 5 and MSVC
Change-Id: Id367dee6c4fe55fe039ebf28603c883014194832
-rw-r--r--external/liborcus/liborcus_0.7.0-configure.gcc5.patch.06
1 files changed, 4 insertions, 2 deletions
diff --git a/external/liborcus/liborcus_0.7.0-configure.gcc5.patch.0 b/external/liborcus/liborcus_0.7.0-configure.gcc5.patch.0
index 1827a343c96d..79d372cce6f7 100644
--- a/external/liborcus/liborcus_0.7.0-configure.gcc5.patch.0
+++ b/external/liborcus/liborcus_0.7.0-configure.gcc5.patch.0
@@ -296,7 +296,7 @@
boost_save_IFS=$IFS
boost_version_req=1.36
IFS=.
-@@ -16193,17 +16356,28 @@ $as_echo_n "checking for Boost's header
+@@ -16193,17 +16356,30 @@ $as_echo_n "checking for Boost's header
if ${boost_cv_lib_version+:} false; then :
$as_echo_n "(cached) " >&6
else
@@ -313,9 +313,11 @@
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ grep -v '#' |
++ grep -Ev '^(conftest.cpp| *command-line arguments :)' |
tr -d '\r' |
- $SED -n -e "/^boost-lib-version = /{s///;s/\"//g;p;q;}" >conftest.i 2>&1; then :
-+ $SED -n -e "/^boost-lib-version = /{s///;s/[\" ]//g;p;q;}" >conftest.i 2>&1; then :
++ tr -s '\n' ' ' |
++ $SED -n -e "/^ *boost-lib-version = /{s///;s/[\" ]//g;p;q;}" >conftest.i 2>&1; then :
boost_cv_lib_version=`cat conftest.i`
fi
rm -rf conftest*