This is an automated email from the ASF dual-hosted git repository.
jim pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new 316716d Upgrade to APR(*) 1.6.x and work around Xcode12
over-agressive clang warning/errors
316716d is described below
commit 316716d6ea48f0328e1769bc4cf3de607b1c1491
Author: Jim Jagielski <jim...@gmail.com>
AuthorDate: Tue Dec 1 10:30:02 2020 -0500
Upgrade to APR(*) 1.6.x and work around Xcode12 over-agressive clang
warning/errors
(cherry picked from commit b1dc36c01638ed0d08b23f216ee4fa310c82a82b)
---
....4.apu.hw.patch => apr-util-1.6.1.apu.hw.patch} | 4 +-
....5.4.expat.patch => apr-util-1.6.1.expat.patch} | 4 +-
...ewin32.patch => apr-util-1.6.1.makewin32.patch} | 102 ++++++++++-----------
ext_libraries/apr-util/aprutil_version.mk | 4 +-
ext_libraries/apr-util/makefile.mk | 12 ++-
...2-no-devenv.patch => apr-1.6.5-no-devenv.patch} | 4 +-
...1.5.2-windows.patch => apr-1.6.5-windows.patch} | 4 +-
ext_libraries/apr/apr_version.mk | 4 +-
ext_libraries/apr/makefile.mk | 10 +-
main/external_deps.lst | 8 +-
10 files changed, 86 insertions(+), 70 deletions(-)
diff --git a/ext_libraries/apr-util/apr-util-1.5.4.apu.hw.patch
b/ext_libraries/apr-util/apr-util-1.6.1.apu.hw.patch
similarity index 70%
rename from ext_libraries/apr-util/apr-util-1.5.4.apu.hw.patch
rename to ext_libraries/apr-util/apr-util-1.6.1.apu.hw.patch
index 81924b1..bdd6362 100644
--- a/ext_libraries/apr-util/apr-util-1.5.4.apu.hw.patch
+++ b/ext_libraries/apr-util/apr-util-1.6.1.apu.hw.patch
@@ -1,5 +1,5 @@
---- misc/apr-util-1.5.4/include/apu.hw 2008-11-21 07:18:37.000000000 +0100
-+++ misc/build/apr-util-1.5.4/include/apu.hw 2012-01-03 13:37:20.042007300
+0100
+--- misc/apr-util-1.6.1/include/apu.hw 2008-11-21 07:18:37.000000000 +0100
++++ misc/build/apr-util-1.6.1/include/apu.hw 2012-01-03 13:37:20.042007300
+0100
@@ -132,8 +132,8 @@
#define APU_HAVE_NSS 0
#endif
diff --git a/ext_libraries/apr-util/apr-util-1.5.4.expat.patch
b/ext_libraries/apr-util/apr-util-1.6.1.expat.patch
similarity index 81%
rename from ext_libraries/apr-util/apr-util-1.5.4.expat.patch
rename to ext_libraries/apr-util/apr-util-1.6.1.expat.patch
index 5733756..3a84a6a 100644
--- a/ext_libraries/apr-util/apr-util-1.5.4.expat.patch
+++ b/ext_libraries/apr-util/apr-util-1.6.1.expat.patch
@@ -1,5 +1,5 @@
---- misc/apr-util-1.5.4/build/apu-conf.m4 2011-08-08 06:32:27.000000000
-0300
-+++ misc/build/apr-util-1.5.4/build/apu-conf.m4 2013-06-12
20:09:05.877947541 -0300
+--- misc/apr-util-1.6.1/build/apu-conf.m4 2011-08-08 06:32:27.000000000
-0300
++++ misc/build/apr-util-1.6.1/build/apu-conf.m4 2013-06-12
20:09:05.877947541 -0300
@@ -87,8 +87,14 @@ dnl be dropped later.
dnl
AC_DEFUN([APU_SYSTEM_EXPAT], [
diff --git a/ext_libraries/apr-util/apr-util-1.5.4.makewin32.patch
b/ext_libraries/apr-util/apr-util-1.6.1.makewin32.patch
similarity index 65%
rename from ext_libraries/apr-util/apr-util-1.5.4.makewin32.patch
rename to ext_libraries/apr-util/apr-util-1.6.1.makewin32.patch
index 1fb914c..f986fde 100644
--- a/ext_libraries/apr-util/apr-util-1.5.4.makewin32.patch
+++ b/ext_libraries/apr-util/apr-util-1.6.1.makewin32.patch
@@ -1,5 +1,5 @@
---- misc/apr-util-1.5.4/Library_apr-util.mk 2012-01-05 14:49:40.529219100
+0100
-+++ misc/build/apr-util-1.5.4/Library_apr-util.mk 2012-01-05
14:47:18.621102400 +0100
+--- misc/apr-util-1.6.1/Library_apr-util.mk 2012-01-05 14:49:40.529219100
+0100
++++ misc/build/apr-util-1.6.1/Library_apr-util.mk 2012-01-05
14:47:18.621102400 +0100
@@ -1 +1,89 @@
-dummy
+#/**************************************************************
@@ -46,53 +46,53 @@
+))
+
+$(eval $(call gb_Library_add_cobjects,apr-util,\
-+ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/buckets/apr_brigade \
-+ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/buckets/apr_buckets \
-+ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/buckets/apr_buckets_alloc \
-+ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/buckets/apr_buckets_eos \
-+ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/buckets/apr_buckets_file \
-+ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/buckets/apr_buckets_flush \
-+ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/buckets/apr_buckets_heap \
-+ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/buckets/apr_buckets_mmap \
-+ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/buckets/apr_buckets_pipe \
-+ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/buckets/apr_buckets_pool \
-+
apr-util/$(INPATH)/misc/build/apr-util-1.5.4/buckets/apr_buckets_refcount \
-+ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/buckets/apr_buckets_simple
\
-+ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/buckets/apr_buckets_socket
\
-+ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/crypto/apr_crypto \
-+ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/crypto/apr_md4 \
-+ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/crypto/apr_md5 \
-+ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/crypto/apr_sha1 \
-+ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/crypto/getuuid \
-+ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/crypto/uuid \
-+ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/dbd/apr_dbd \
-+ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/dbm/apr_dbm \
-+ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/dbm/apr_dbm_sdbm \
-+ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/dbm/sdbm/sdbm \
-+ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/dbm/sdbm/sdbm_hash \
-+ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/dbm/sdbm/sdbm_lock \
-+ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/dbm/sdbm/sdbm_pair \
-+ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/encoding/apr_base64 \
-+ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/hooks/apr_hooks \
-+ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/ldap/apr_ldap_stub \
-+ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/ldap/apr_ldap_url \
-+ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/memcache/apr_memcache \
-+ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/misc/apr_date \
-+ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/misc/apr_queue \
-+ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/misc/apr_reslist \
-+ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/misc/apr_rmm \
-+ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/misc/apr_thread_pool \
-+ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/misc/apu_dso \
-+ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/misc/apu_version \
-+ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/strmatch/apr_strmatch \
-+ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/uri/apr_uri \
-+ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/xlate/xlate \
-+ apr-util/$(INPATH)/misc/build/apr-util-1.5.4/xml/apr_xml \
++ apr-util/$(INPATH)/misc/build/apr-util-1.6.1/buckets/apr_brigade \
++ apr-util/$(INPATH)/misc/build/apr-util-1.6.1/buckets/apr_buckets \
++ apr-util/$(INPATH)/misc/build/apr-util-1.6.1/buckets/apr_buckets_alloc \
++ apr-util/$(INPATH)/misc/build/apr-util-1.6.1/buckets/apr_buckets_eos \
++ apr-util/$(INPATH)/misc/build/apr-util-1.6.1/buckets/apr_buckets_file \
++ apr-util/$(INPATH)/misc/build/apr-util-1.6.1/buckets/apr_buckets_flush \
++ apr-util/$(INPATH)/misc/build/apr-util-1.6.1/buckets/apr_buckets_heap \
++ apr-util/$(INPATH)/misc/build/apr-util-1.6.1/buckets/apr_buckets_mmap \
++ apr-util/$(INPATH)/misc/build/apr-util-1.6.1/buckets/apr_buckets_pipe \
++ apr-util/$(INPATH)/misc/build/apr-util-1.6.1/buckets/apr_buckets_pool \
++
apr-util/$(INPATH)/misc/build/apr-util-1.6.1/buckets/apr_buckets_refcount \
++ apr-util/$(INPATH)/misc/build/apr-util-1.6.1/buckets/apr_buckets_simple
\
++ apr-util/$(INPATH)/misc/build/apr-util-1.6.1/buckets/apr_buckets_socket
\
++ apr-util/$(INPATH)/misc/build/apr-util-1.6.1/crypto/apr_crypto \
++ apr-util/$(INPATH)/misc/build/apr-util-1.6.1/crypto/apr_md4 \
++ apr-util/$(INPATH)/misc/build/apr-util-1.6.1/crypto/apr_md5 \
++ apr-util/$(INPATH)/misc/build/apr-util-1.6.1/crypto/apr_sha1 \
++ apr-util/$(INPATH)/misc/build/apr-util-1.6.1/crypto/getuuid \
++ apr-util/$(INPATH)/misc/build/apr-util-1.6.1/crypto/uuid \
++ apr-util/$(INPATH)/misc/build/apr-util-1.6.1/dbd/apr_dbd \
++ apr-util/$(INPATH)/misc/build/apr-util-1.6.1/dbm/apr_dbm \
++ apr-util/$(INPATH)/misc/build/apr-util-1.6.1/dbm/apr_dbm_sdbm \
++ apr-util/$(INPATH)/misc/build/apr-util-1.6.1/dbm/sdbm/sdbm \
++ apr-util/$(INPATH)/misc/build/apr-util-1.6.1/dbm/sdbm/sdbm_hash \
++ apr-util/$(INPATH)/misc/build/apr-util-1.6.1/dbm/sdbm/sdbm_lock \
++ apr-util/$(INPATH)/misc/build/apr-util-1.6.1/dbm/sdbm/sdbm_pair \
++ apr-util/$(INPATH)/misc/build/apr-util-1.6.1/encoding/apr_base64 \
++ apr-util/$(INPATH)/misc/build/apr-util-1.6.1/hooks/apr_hooks \
++ apr-util/$(INPATH)/misc/build/apr-util-1.6.1/ldap/apr_ldap_stub \
++ apr-util/$(INPATH)/misc/build/apr-util-1.6.1/ldap/apr_ldap_url \
++ apr-util/$(INPATH)/misc/build/apr-util-1.6.1/memcache/apr_memcache \
++ apr-util/$(INPATH)/misc/build/apr-util-1.6.1/misc/apr_date \
++ apr-util/$(INPATH)/misc/build/apr-util-1.6.1/misc/apr_queue \
++ apr-util/$(INPATH)/misc/build/apr-util-1.6.1/misc/apr_reslist \
++ apr-util/$(INPATH)/misc/build/apr-util-1.6.1/misc/apr_rmm \
++ apr-util/$(INPATH)/misc/build/apr-util-1.6.1/misc/apr_thread_pool \
++ apr-util/$(INPATH)/misc/build/apr-util-1.6.1/misc/apu_dso \
++ apr-util/$(INPATH)/misc/build/apr-util-1.6.1/misc/apu_version \
++ apr-util/$(INPATH)/misc/build/apr-util-1.6.1/strmatch/apr_strmatch \
++ apr-util/$(INPATH)/misc/build/apr-util-1.6.1/uri/apr_uri \
++ apr-util/$(INPATH)/misc/build/apr-util-1.6.1/xlate/xlate \
++ apr-util/$(INPATH)/misc/build/apr-util-1.6.1/xml/apr_xml \
+))
+
+# vim: set noet sw=4 ts=4:
---- misc/apr-util-1.5.4/Makefile 2012-01-05 14:49:40.420212900 +0100
-+++ misc/build/apr-util-1.5.4/Makefile 2012-01-05 14:47:07.827485100 +0100
+--- misc/apr-util-1.6.1/Makefile 2012-01-05 14:49:40.420212900 +0100
++++ misc/build/apr-util-1.6.1/Makefile 2012-01-05 14:47:07.827485100 +0100
@@ -1 +1,32 @@
-dummy
+#/**************************************************************
@@ -127,8 +127,8 @@
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath
$(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
---- misc/apr-util-1.5.4/Module_apr-util.mk 2012-01-05 14:49:40.476216100
+0100
-+++ misc/build/apr-util-1.5.4/Module_apr-util.mk 2012-01-05
14:47:42.567472100 +0100
+--- misc/apr-util-1.6.1/Module_apr-util.mk 2012-01-05 14:49:40.476216100
+0100
++++ misc/build/apr-util-1.6.1/Module_apr-util.mk 2012-01-05
14:47:42.567472100 +0100
@@ -1 +1,29 @@
-dummy
+#/**************************************************************
@@ -160,8 +160,8 @@
+))
+
+# vim: set noet ts=4 sw=4:
---- misc/apr-util-1.5.4/Package_inc.mk 2012-01-05 14:49:40.585222300 +0100
-+++ misc/build/apr-util-1.5.4/Package_inc.mk 2012-01-05 14:47:51.616989700
+0100
+--- misc/apr-util-1.6.1/Package_inc.mk 2012-01-05 14:49:40.585222300 +0100
++++ misc/build/apr-util-1.6.1/Package_inc.mk 2012-01-05 14:47:51.616989700
+0100
@@ -1 +1,33 @@
-dummy
+#/**************************************************************
@@ -185,7 +185,7 @@
+# *
+# *************************************************************/
+
-+$(eval $(call
gb_Package_Package,apr-util_inc,$(EXT_LIBRARIES)/apr-util/$(INPATH)/misc/build/apr-util-1.5.4/include))
++$(eval $(call
gb_Package_Package,apr-util_inc,$(EXT_LIBRARIES)/apr-util/$(INPATH)/misc/build/apr-util-1.6.1/include))
+$(eval $(call gb_Package_add_files, apr-util_inc, inc/apr-util, \
+ apu.h \
+ apu_version.h \
diff --git a/ext_libraries/apr-util/aprutil_version.mk
b/ext_libraries/apr-util/aprutil_version.mk
index 9ddbb81..6a4eabb 100644
--- a/ext_libraries/apr-util/aprutil_version.mk
+++ b/ext_libraries/apr-util/aprutil_version.mk
@@ -20,5 +20,5 @@
#**************************************************************
APR_UTIL_MAJOR=1
-APR_UTIL_MINOR=5
-APR_UTIL_MICRO=4
+APR_UTIL_MINOR=6
+APR_UTIL_MICRO=1
diff --git a/ext_libraries/apr-util/makefile.mk
b/ext_libraries/apr-util/makefile.mk
index fee1298..c2ba7b5 100644
--- a/ext_libraries/apr-util/makefile.mk
+++ b/ext_libraries/apr-util/makefile.mk
@@ -43,7 +43,7 @@
APR_UTIL_VERSION=$(APR_UTIL_MAJOR).$(APR_UTIL_MINOR).$(APR_UTIL_MICRO)
TARFILE_NAME=$(PRJNAME)-$(APR_UTIL_VERSION)
-TARFILE_MD5=866825c04da827c6e5f53daff5569f42
+TARFILE_MD5=bd502b9a8670a8012c4d90c31a84955f
.IF "$(OS)"=="WNT"
@@ -86,10 +86,18 @@ CONFIGURE_FLAGS=
\
# Use our own expat on the Mac. Maybe we should do this on Linux, too? Yes!
.IF "$(OS)" == "MACOSX" || ("$(OS)" == "LINUX" && "$(SYSTEM_EXPAT)"!="YES")
+# Recent versions of clang on macOS break some tests in APR 1.6 (and older)
+# configure (mostly around testing sizeof) due to errors now being fatal.
+# Work around this by ignoring all errors
+.IF "$(OS)"=="MACOSX"
+XCPPFLAGS=-Wno-error=all
+.ENDIF
+
expat_CPPFLAGS=-I$(SOLARINCDIR)$/external
expat_LDFLAGS+=-L$(SOLARLIBDIR)
+XCPPFLAGS+=$(expat_CPPFLAGS)
CONFIGURE_FLAGS+= SOLARINCDIR=$(SOLARINCDIR) SOLARLIBDIR=$(SOLARLIBDIR) \
- CPPFLAGS=$(expat_CPPFLAGS) LDFLAGS=$(expat_LDFLAGS)
+ CPPFLAGS="$(XCPPFLAGS)" LDFLAGS=$(expat_LDFLAGS)
# The non-standard names of our expat libraries (yes, plural) make
# a special handling in apr-utils configure necessary.
diff --git a/ext_libraries/apr/apr-1.5.2-no-devenv.patch
b/ext_libraries/apr/apr-1.6.5-no-devenv.patch
similarity index 74%
rename from ext_libraries/apr/apr-1.5.2-no-devenv.patch
rename to ext_libraries/apr/apr-1.6.5-no-devenv.patch
index 99fd04d..a2d0163 100644
--- a/ext_libraries/apr/apr-1.5.2-no-devenv.patch
+++ b/ext_libraries/apr/apr-1.6.5-no-devenv.patch
@@ -1,5 +1,5 @@
---- misc/build/apr-1.5.2/Makefile.win 2013-10-03 12:58:21.000000000 +0200
-+++ misc/build/apr-1.5.2/Makefile.win 2016-07-26 12:59:58.183576182 +0200
+--- misc/build/apr-1.6.5/Makefile.win 2013-10-03 12:58:21.000000000 +0200
++++ misc/build/apr-1.6.5/Makefile.win 2016-07-26 12:59:58.183576182 +0200
@@ -28,12 +28,7 @@
# nmake -f Makefile.win PREFIX=C:\APR buildall checkall install clean
#
diff --git a/ext_libraries/apr/apr-1.5.2-windows.patch
b/ext_libraries/apr/apr-1.6.5-windows.patch
similarity index 64%
rename from ext_libraries/apr/apr-1.5.2-windows.patch
rename to ext_libraries/apr/apr-1.6.5-windows.patch
index a659064..c684ecc 100644
--- a/ext_libraries/apr/apr-1.5.2-windows.patch
+++ b/ext_libraries/apr/apr-1.6.5-windows.patch
@@ -1,5 +1,5 @@
---- misc/build/apr-1.5.2/Makefile.win 2018-03-05 05:48:04.021330400 +0200
-+++ misc/build/apr-1.5.2/Makefile.win 2018-03-05 05:58:03.647346500 +0200
+--- misc/build/apr-1.6.5/Makefile.win 2018-03-05 05:48:04.021330400 +0200
++++ misc/build/apr-1.6.5/Makefile.win 2018-03-05 05:58:03.647346500 +0200
@@ -41,7 +41,7 @@
PREFIX=..\apr-dist
diff --git a/ext_libraries/apr/apr_version.mk b/ext_libraries/apr/apr_version.mk
index ddf1860..3c92444 100644
--- a/ext_libraries/apr/apr_version.mk
+++ b/ext_libraries/apr/apr_version.mk
@@ -20,5 +20,5 @@
#**************************************************************
APR_MAJOR=1
-APR_MINOR=5
-APR_MICRO=2
+APR_MINOR=6
+APR_MICRO=5
diff --git a/ext_libraries/apr/makefile.mk b/ext_libraries/apr/makefile.mk
index 036af1f..0f29c60 100644
--- a/ext_libraries/apr/makefile.mk
+++ b/ext_libraries/apr/makefile.mk
@@ -42,7 +42,7 @@ all:
APRVERSION=$(APR_MAJOR).$(APR_MINOR).$(APR_MICRO)
TARFILE_NAME=$(PRJNAME)-$(APRVERSION)
-TARFILE_MD5=98492e965963f852ab29f9e61b2ad700
+TARFILE_MD5=0759294408daace192c935b7c9e76e04
.IF "$(OS)"=="WNT"
@@ -61,7 +61,15 @@ BUILD_ACTION=INCLUDE="$(INCLUDE);./include" USEMAK=1 nmake
-f Makefile.win buil
CONFIGURE_DIR=
CONFIGURE_ACTION=.$/configure --prefix=$(OUTDIR)
--includedir=$(OUTDIR)$/inc$/apr
+
+# Recent versions of clang on macOS break some tests in APR 1.6 (and older)
+# configure (mostly around testing sizeof) due to errors now being fatal.
+# Work around this by ignoring all errors
+.IF "$(OS)"=="MACOSX"
+CONFIGURE_FLAGS=CPPFLAGS="-Wno-error=all"
+.ELSE
CONFIGURE_FLAGS=
+.ENDIF
BUILD_DIR=$(CONFIGURE_DIR)
BUILD_ACTION=$(GNUMAKE) --debug=b
diff --git a/main/external_deps.lst b/main/external_deps.lst
index dc09293..b25649b 100644
--- a/main/external_deps.lst
+++ b/main/external_deps.lst
@@ -157,14 +157,14 @@ if (SYSTEM_OPENSSL!=YES && DISABLE_OPENSSL!=TRUE)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if ( true )
- MD5 = 98492e965963f852ab29f9e61b2ad700
- name = apr-1.5.2.tar.gz
+ MD5 = 0759294408daace192c935b7c9e76e04
+ name = apr-1.6.5.tar.gz
URL1 = https://archive.apache.org/dist/apr/$(name)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if ( true )
- MD5 = 866825c04da827c6e5f53daff5569f42
- name = apr-util-1.5.4.tar.gz
+ MD5 = bd502b9a8670a8012c4d90c31a84955f
+ name = apr-util-1.6.1.tar.gz
URL1 = https://archive.apache.org/dist/apr/$(name)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
