From 304452558c7f6f5e32ba13d8f05325790c8a4f5f Mon Sep 17 00:00:00 2001 From: fanquake Date: Mon, 25 Jul 2022 12:18:11 +0100 Subject: [PATCH 1/2] depends: expat 2.4.8 --- depends/packages/expat.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/depends/packages/expat.mk b/depends/packages/expat.mk index 349319138e6..6f40f4e4977 100644 --- a/depends/packages/expat.mk +++ b/depends/packages/expat.mk @@ -1,8 +1,8 @@ package=expat -$(package)_version=2.4.1 +$(package)_version=2.4.8 $(package)_download_path=https://github.com/libexpat/libexpat/releases/download/R_$(subst .,_,$($(package)_version))/ $(package)_file_name=$(package)-$($(package)_version).tar.xz -$(package)_sha256_hash=cf032d0dba9b928636548e32b327a2d66b1aab63c4f4a13dd132c2d1d2f2fb6a +$(package)_sha256_hash=f79b8f904b749e3e0d20afeadecf8249c55b2e32d4ebb089ae378df479dcaf25 define $(package)_set_vars $(package)_config_opts=--disable-shared --without-docbook --without-tests --without-examples From e838a9847580527b8321d65e57b1c53cc2af6bf4 Mon Sep 17 00:00:00 2001 From: fanquake Date: Mon, 25 Jul 2022 12:18:27 +0100 Subject: [PATCH 2/2] depends: re-enable using -flto when building expat --- depends/packages/expat.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/depends/packages/expat.mk b/depends/packages/expat.mk index 6f40f4e4977..bb203d06f84 100644 --- a/depends/packages/expat.mk +++ b/depends/packages/expat.mk @@ -4,12 +4,15 @@ $(package)_download_path=https://github.com/libexpat/libexpat/releases/download/ $(package)_file_name=$(package)-$($(package)_version).tar.xz $(package)_sha256_hash=f79b8f904b749e3e0d20afeadecf8249c55b2e32d4ebb089ae378df479dcaf25 +# -D_DEFAULT_SOURCE defines __USE_MISC, which exposes additional +# definitions in endian.h, which are required for a working +# endianess check in configure when building with -flto. define $(package)_set_vars $(package)_config_opts=--disable-shared --without-docbook --without-tests --without-examples $(package)_config_opts += --disable-dependency-tracking --enable-option-checking $(package)_config_opts += --without-xmlwf $(package)_config_opts_linux=--with-pic - $(package)_cflags += -fno-lto + $(package)_cppflags += -D_DEFAULT_SOURCE endef define $(package)_config_cmds