diff options
| author | Andras Timar <andras.timar@collabora.com> | 2017-03-22 12:02:28 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2017-03-22 12:02:28 +0100 |
| commit | 7f6ff8542aa6c9f37dad7f28fed272c9d4c18060 (patch) | |
| tree | c2982029b2300b36ec7643c70be59668acfecbba /external | |
| parent | e93f80bf8695d7183b46e8ee73448438a6d8e391 (diff) | |
upgrade expat to version 2.2.0
Change-Id: I106d9d7d578ad8960c9dff1475123d324600e59e
Diffstat (limited to 'external')
| -rw-r--r-- | external/expat/ExternalProject_expat.mk | 3 | ||||
| -rw-r--r-- | external/expat/StaticLibrary_expat.mk | 2 | ||||
| -rw-r--r-- | external/expat/UnpackedTarball_expat.mk | 2 | ||||
| -rw-r--r-- | external/expat/expat-2.1.0.patch | 13 |
4 files changed, 4 insertions, 16 deletions
diff --git a/external/expat/ExternalProject_expat.mk b/external/expat/ExternalProject_expat.mk index 0cc1eaa192f7..1a638eed14d6 100644 --- a/external/expat/ExternalProject_expat.mk +++ b/external/expat/ExternalProject_expat.mk @@ -16,7 +16,8 @@ $(eval $(call gb_ExternalProject_register_targets,expat,\ $(call gb_ExternalProject_get_state_target,expat,configure) : $(call gb_ExternalProject_run,configure,\ ./configure \ - $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ + $(if $(filter INTEL ARM,$(CPUNAME)),ac_cv_c_bigendian=no)) \ ,,expat_configure.log) # vim: set noet sw=4 ts=4: diff --git a/external/expat/StaticLibrary_expat.mk b/external/expat/StaticLibrary_expat.mk index 2f754526b6e9..4d6957f9ef52 100644 --- a/external/expat/StaticLibrary_expat.mk +++ b/external/expat/StaticLibrary_expat.mk @@ -15,7 +15,7 @@ $(eval $(call gb_StaticLibrary_use_unpacked,expat,expat)) # no configure step on windows, no dependency ifneq ($(OS)$(COM),WNTMSC) -$(eval $(call gb_StaticLibrary_use_external_project,expat,expat)) +$(eval $(call gb_StaticLibrary_use_external_project,expat,expat,full)) endif $(eval $(call gb_StaticLibrary_set_include,expat,\ diff --git a/external/expat/UnpackedTarball_expat.mk b/external/expat/UnpackedTarball_expat.mk index 1ea97b584251..60e933d76090 100644 --- a/external/expat/UnpackedTarball_expat.mk +++ b/external/expat/UnpackedTarball_expat.mk @@ -12,7 +12,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,expat)) $(eval $(call gb_UnpackedTarball_set_tarball,expat,$(EXPAT_TARBALL))) $(eval $(call gb_UnpackedTarball_add_patches,expat,\ - external/expat/expat-2.1.0.patch \ + external/expat/expat-winapi.patch \ )) # This is a bit hackish. diff --git a/external/expat/expat-2.1.0.patch b/external/expat/expat-2.1.0.patch deleted file mode 100644 index 070dafc0cb0c..000000000000 --- a/external/expat/expat-2.1.0.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- misc/expat-2.1.0/lib/expat_external.h 2009-11-16 08:53:17.375000000 +0000 -+++ misc/build/expat-2.1.0/lib/expat_external.h 2009-11-16 08:53:34.703125000 +0000 -@@ -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 |