[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - configure.ac

Stephan Bergmann sbergman at redhat.com
Tue Jul 7 13:33:11 PDT 2015


 configure.ac |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c2b8500e5418e267c612862e944247bed7ea3b08
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Jun 10 17:53:45 2015 +0200

    syntax errors, still
    
    (cherry picked from commit bee2423eff85ebc5f0255596bcf7bec2596307a9)
    
    syntax errors, still
    
    (i.e., parentheses do need to be quoted in BERs, but do not forget to escape
    brakets in configure.ac m4)
    
    (cherry picked from commit d0b7be0fa509394dca054246b00b62ea7df77934)
    
    Change-Id: I0f78d99d80252874006b51fff4e8089df8d08f1d
    Reviewed-on: https://gerrit.libreoffice.org/16828
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/configure.ac b/configure.ac
index 25fc69d..275974f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11290,8 +11290,8 @@ int main(int argc, char **argv) {
             #               ^~~~~~~~~~~~~~~~~~~~~~~
             #               vptr for 'QObjectPrivate'
             save_CXX=$CXX
-            CXX=$(printf %s "$CXX"
-                | sed -e s/-fno-sanitize-recover\(=[0-9A-Za-z,_-]*\)*//)
+            CXX=$(printf %s "$CXX" \
+                | sed -e 's/-fno-sanitize-recover\(=[[0-9A-Za-z,_-]]*\)*//')
             save_CXXFLAGS=$CXXFLAGS
             CXXFLAGS="$CXXFLAGS $KDE4_CFLAGS"
             save_LIBS=$LIBS


More information about the Libreoffice-commits mailing list