This is an automated email from the ASF dual-hosted git repository.
truckman 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 190cb14 Upgrade bundled expat to 2.2.9.
190cb14 is described below
commit 190cb14849237ec7207449ab78b1e9f4cddb3d32
Author: Don Lewis <truck...@apache.org>
AuthorDate: Wed Oct 2 10:07:37 2019 -0700
Upgrade bundled expat to 2.2.9.
Delete expat-winapi.patch which was needed to get linkage on Windows
to work with the expat static libraries. Instead add -DXML_STATIC
to the compiler flags when building the modules that link to the
expat static libraries to accomplish the same thing, but in a
supported way.
Don't build the expat man pages since we don't have the necessary
build dependencies and we don't need them anyway.
---
main/expat/{expat-2.2.3.patch => expat-2.2.9.patch} | 14 +++++++-------
main/expat/expat-winapi.patch | 14 --------------
main/expat/makefile.mk | 9 ++++-----
main/expat/prj/d.lst | 4 ++--
main/external_deps.lst | 6 +++---
main/solenv/gbuild/gbuild.mk | 5 +++++
main/solenv/inc/settings.mk | 5 +++++
7 files changed, 26 insertions(+), 31 deletions(-)
diff --git a/main/expat/expat-2.2.3.patch b/main/expat/expat-2.2.9.patch
similarity index 92%
rename from main/expat/expat-2.2.3.patch
rename to main/expat/expat-2.2.9.patch
index 2453518..96e23a5 100644
--- a/main/expat/expat-2.2.3.patch
+++ b/main/expat/expat-2.2.9.patch
@@ -1,5 +1,5 @@
---- misc/expat-2.2.3/lib/makefile.mk Wed Aug 20 14:33:55 2008
-+++ misc/build/expat-2.2.3/lib/makefile.mk Wed Aug 20 14:26:42 2008
+--- misc/expat-2.2.9/lib/makefile.mk Wed Aug 20 14:33:55 2008
++++ misc/build/expat-2.2.9/lib/makefile.mk Wed Aug 20 14:26:42 2008
@@ -1 +1,91 @@
-dummy
+#**************************************************************
@@ -49,11 +49,11 @@
+UNICODE_SLOFILES=$(SLO)$/xmlparse.obj
+UNICODECDEFS+=-DXML_UNICODE
+
-+.IF "$(OS)"=="WNT"
-+ LOADLIBOBJFILE=$(SLO)/loadlibrary.obj
-+.ELSE
-+ LOADLIBOBJFILE=
-+.ENDIF
++#.IF "$(OS)"=="WNT"
++# LOADLIBOBJFILE=$(SLO)/loadlibrary.obj
++#.ELSE
++# LOADLIBOBJFILE=
++#.ENDIF
+
+LIB1ARCHIV=$(LB)$/libascii_$(TARGET)_xmlparse.a
+LIB1TARGET=$(SLB)$/ascii_$(TARGET)_xmlparse.lib
diff --git a/main/expat/expat-winapi.patch b/main/expat/expat-winapi.patch
deleted file mode 100644
index 17667ac..0000000
--- a/main/expat/expat-winapi.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur misc/expat-2.2.3/lib/expat_external.h
misc/build/expat-2.2.3/lib/expat_external.h
---- misc/expat-2.2.3/lib/expat_external.h 2016-06-21 05:58:38.000000000
-0700
-+++ misc/build/expat-2.2.3/lib/expat_external.h 2016-07-31
17:10:53.551556000 -0700
-@@ -7,10 +7,6 @@
-
- /* External API definitions */
-
--#if defined(_MSC_EXTENSIONS) && !defined(__BEOS__) && !defined(__CYGWIN__)
--#define XML_USE_MSC_EXTENSIONS 1
--#endif
--
- /* Expat tries very hard to make the API boundary very specifically
- defined. There are two macros defined to control this boundary;
- each of these can be defined before including this header to
diff --git a/main/expat/makefile.mk b/main/expat/makefile.mk
index 6a96d92..4d19604 100644
--- a/main/expat/makefile.mk
+++ b/main/expat/makefile.mk
@@ -38,17 +38,16 @@ all:
# --- Files --------------------------------------------------------
-TARFILE_NAME=expat-2.2.3
-TARFILE_MD5=f053af63ef5f39bd9b78d01fbc203334
+TARFILE_NAME=expat-2.2.9
+TARFILE_MD5=875a2c2ff3e8eb9e5a5cd62db2033ab5
ADDITIONAL_FILES=lib$/makefile.mk
-PATCH_FILES=$(TARFILE_NAME).patch \
- expat-winapi.patch
+PATCH_FILES=$(TARFILE_NAME).patch
CONFIGURE_DIR=
.IF "$(OS)"=="WNT"
CONFIGURE_ACTION=
.ELSE
-CONFIGURE_ACTION=.$/configure
+CONFIGURE_ACTION=.$/configure --without-docbook
.ENDIF
BUILD_DIR=lib
diff --git a/main/expat/prj/d.lst b/main/expat/prj/d.lst
index 951ac27..fe7184e 100644
--- a/main/expat/prj/d.lst
+++ b/main/expat/prj/d.lst
@@ -1,7 +1,7 @@
mkdir: %_DEST%\inc%_EXT%\external\expat
mkdir: %_DEST%\lib%_EXT%\x64
-..\%__SRC%\misc\build\expat-2.2.3\lib\expat.h
%_DEST%\inc%_EXT%\external\expat.h
-..\%__SRC%\misc\build\expat-2.2.3\lib\expat_external.h
%_DEST%\inc%_EXT%\external\expat_external.h
+..\%__SRC%\misc\build\expat-2.2.9\lib\expat.h
%_DEST%\inc%_EXT%\external\expat.h
+..\%__SRC%\misc\build\expat-2.2.9\lib\expat_external.h
%_DEST%\inc%_EXT%\external\expat_external.h
..\%__SRC%\slb\expat_xmltok.lib %_DEST%\lib%_EXT%\expat_xmltok.lib
..\%__SRC%\slb\expat_xmlparse.lib %_DEST%\lib%_EXT%\expat_xmlparse.lib
..\%__SRC%\slb\ascii_expat_xmlparse.lib
%_DEST%\lib%_EXT%\ascii_expat_xmlparse.lib
diff --git a/main/external_deps.lst b/main/external_deps.lst
index 5a7ea06..2b0ebe6 100644
--- a/main/external_deps.lst
+++ b/main/external_deps.lst
@@ -217,9 +217,9 @@ if (SYSTEM_VIGRA != YES)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_EXPAT != YES)
- MD5 = f053af63ef5f39bd9b78d01fbc203334
- name = expat-2.2.3.tar.bz2
- URL1 =
https://sourceforge.net/projects/expat/files/expat/2.2.3/expat-2.2.3.tar.bz2
+ MD5 = 875a2c2ff3e8eb9e5a5cd62db2033ab5
+ name = expat-2.2.9.tar.bz2
+ URL1 =
https://sourceforge.net/projects/expat/files/expat/2.2.9/expat-2.2.9.tar.bz2
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_CURL != YES)
diff --git a/main/solenv/gbuild/gbuild.mk b/main/solenv/gbuild/gbuild.mk
index 4770ae7..f874d37 100644
--- a/main/solenv/gbuild/gbuild.mk
+++ b/main/solenv/gbuild/gbuild.mk
@@ -216,6 +216,11 @@ ifeq ($(strip $(ENABLE_GRAPHITE)),TRUE)
gb_GLOBALDEFS += -DENABLE_GRAPHITE
endif
+# Required for correct Windows function call ABI for expat static library
+ifeq ($(SYSTEM_EXPAT),NO)
+gb_GLOBALDEFS += -DXML_STATIC
+endif
+
gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS))
include $(GBUILDDIR)/Deliver.mk
diff --git a/main/solenv/inc/settings.mk b/main/solenv/inc/settings.mk
index 3ccf863..43c945c 100644
--- a/main/solenv/inc/settings.mk
+++ b/main/solenv/inc/settings.mk
@@ -892,6 +892,11 @@ CDEFS+=$(CDEFS_PRESET)
CDEFS+=-DTIMELOG
.ENDIF
+# Required for correct Windows function call ABI for expat static library
+.IF "$(SYSTEM_EXPAT)"=="NO"
+CDEFS+=-DXML_STATIC
+.ENDIF
+
CDEFSCXX=
CDEFSOBJ=
CDEFSSLO=-DSHAREDLIB -D_DLL_
