[Libreoffice-commits] core.git: external/liborcus

[Stephan Bergmann]

 external/liborcus/liborcus_0.7.0-configure.gcc5.patch.0 |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit a5ec343f6cb522f4d41e097eda48042bf85c4578
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Feb 10 17:25:41 2015 +0100

    How is that supposed to ever work?
    
    Change-Id: Ieb13095abb399662e449fad5a056999343165025

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 a029a27..1827a34 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,29 @@ $as_echo_n "checking for Boost's header
+@@ -16193,17 +16356,28 @@ $as_echo_n "checking for Boost's header
  if ${boost_cv_lib_version+:} false; then :
    $as_echo_n "(cached) " >&6
  else
@@ -315,7 +315,6 @@
 +  grep -v '#' |
    tr -d '\r' |
 -  $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