You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ji...@apache.org on 2018/08/31 17:11:58 UTC

svn commit: r1839776 - in /openoffice/branches/AOO416/main/libxml2: libxml2-centos5.patch makefile.mk

Author: jim
Date: Fri Aug 31 17:11:58 2018
New Revision: 1839776

URL: http://svn.apache.org/viewvc?rev=1839776&view=rev
Log:
The gcc on CentOS5 (4.1.2) does not support Wno-array-bounds
so disable it for all LINUX at present...

TODO: Just disable for this compiler and not for all Linux

Added:
    openoffice/branches/AOO416/main/libxml2/libxml2-centos5.patch
Modified:
    openoffice/branches/AOO416/main/libxml2/makefile.mk

Added: openoffice/branches/AOO416/main/libxml2/libxml2-centos5.patch
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/libxml2/libxml2-centos5.patch?rev=1839776&view=auto
==============================================================================
--- openoffice/branches/AOO416/main/libxml2/libxml2-centos5.patch (added)
+++ openoffice/branches/AOO416/main/libxml2/libxml2-centos5.patch Fri Aug 31 17:11:58 2018
@@ -0,0 +1,11 @@
+--- misc/libxml2-2.9.8/configure.old	2018-08-31 13:00:24.000000000 -0400
++++ misc/build/libxml2-2.9.8/configure	2018-08-31 13:00:49.000000000 -0400
+@@ -15000,7 +15000,7 @@
+     # warnings we'd like to see
+     EXTRA_CFLAGS="${EXTRA_CFLAGS} -pedantic -Wall -Wextra -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline -Wredundant-decls"
+     # warnings we'd like to supress
+-    EXTRA_CFLAGS="${EXTRA_CFLAGS} -Wno-long-long -Wno-format-extra-args -Wno-array-bounds"
++    EXTRA_CFLAGS="${EXTRA_CFLAGS} -Wno-long-long -Wno-format-extra-args"
+     case "${host}" in
+           alpha*-*-linux* )
+ 	       EXTRA_CFLAGS="${EXTRA_CFLAGS} -mieee"

Modified: openoffice/branches/AOO416/main/libxml2/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/libxml2/makefile.mk?rev=1839776&r1=1839775&r2=1839776&view=diff
==============================================================================
--- openoffice/branches/AOO416/main/libxml2/makefile.mk (original)
+++ openoffice/branches/AOO416/main/libxml2/makefile.mk Fri Aug 31 17:11:58 2018
@@ -52,6 +52,10 @@ PATCH_FILES=libxml2-configure.patch
 PATCH_FILES+= libxml2-nan-inf-fix.patch
 .ENDIF
 
+.IF "$(OS)" == "LINUX"
+PATCH_FILES+= libxml2-centos5.patch
+.ENDIF
+
 # This is only for UNX environment now
 
 .IF "$(OS)"=="WNT"