This is an automated email from the ASF dual-hosted git repository.

petko pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 191ab58  Remove the -Werror option from debug builds
     new 2ff367b  Merge pull request #133 from ardovm/graphite_werror
191ab58 is described below

commit 191ab5831ad5935e7e044360bb7e6fa9dc3032dc
Author: Arrigo Marchiori <ard...@yahoo.it>
AuthorDate: Sat Jun 19 15:27:42 2021 +0200

    Remove the -Werror option from debug builds
    
    The flag is set by default by the graphite configure script, but it
    lets the compilation fail with gcc 7.5
---
 main/graphite/graphite-2.3.1_debug.patch | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/main/graphite/graphite-2.3.1_debug.patch 
b/main/graphite/graphite-2.3.1_debug.patch
index 583fac7..61e02e4 100644
--- a/main/graphite/graphite-2.3.1_debug.patch
+++ b/main/graphite/graphite-2.3.1_debug.patch
@@ -11,3 +11,14 @@
                                                                                
                                // in the case of a non-contiguous list
        return m_pseg->m_prgginf[(*m_vit) - m_pseg->m_isloutGinf0];
  }
+--- misc/silgraphite-2.3.1/engine/configure    2021-06-19 15:17:20.741894267 
+0200
++++ misc/build/silgraphite-2.3.1/engine/configure      2021-06-19 
15:18:16.359429854 +0200
+@@ -16877,7 +16877,7 @@
+ # (note: the flags here are gcc-specific and may fail with other compilers)
+ build_flags=""
+ if test "$enable_debug" = yes; then
+-  build_flags="$build_flags -O0 -g -Wall -Wno-unknown-pragmas -Wparentheses 
-Werror"
++  build_flags="$build_flags -O0 -g -Wall -Wno-unknown-pragmas -Wparentheses"
+ elif test "$enable_strict" = yes; then
+   build_flags="$build_flags -DNDEBUG -Wall -Wno-unknown-pragmas -Wparentheses 
-Werror"
+ else

Reply via email to