From 99be9a25f2f1d479371c80e85153b77961c3514f Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 10 Nov 2017 17:39:38 +0100 Subject: [PATCH 1/2] Compile expat even without entropy source when using configure There is no other choice but to continue without a high quality entropy source if it's just not available on the current system as determined by configure. This problem was fixed in Expat fd9581a34e5665958939e3db408893fd4fac7398 which is not yet included in our version, and the (hopefully soon to be implemented) real solution is to just upgrade Expat version, but for now at least allow building without any extra hacks such as putting XML_POOR_ENTROPY in CPPFLAGS. --- src/expat/lib/xmlparse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/expat/lib/xmlparse.c b/src/expat/lib/xmlparse.c index 1d53f50720..5cdefb40f8 100644 --- a/src/expat/lib/xmlparse.c +++ b/src/expat/lib/xmlparse.c @@ -54,7 +54,7 @@ #if !defined(HAVE_GETRANDOM) && !defined(HAVE_SYSCALL_GETRANDOM) \ && !defined(HAVE_ARC4RANDOM_BUF) && !defined(_WIN32) \ - && !defined(XML_POOR_ENTROPY) + && !defined(XML_POOR_ENTROPY) && !defined(HAVE_EXPAT_CONFIG_H) # error \ You do not have support for any sources of high quality entropy \ enabled. For end user security, that is probably not what you want. \ From fc8b7e4e61e03fce7e8273cf9e20b5a9856e952e Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 10 Nov 2017 15:24:42 +0100 Subject: [PATCH 2/2] Build bundled 3rd party libraries on Travis Configure Travis CI to run at least one build using the bundled versions of third party libraries to make sure this is tested too. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f8cfe6e588..c9ad509373 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ matrix: env: wxCONFIGURE_FLAGS="--enable-cxx11 --enable-stl" wxMAKEFILE_FLAGS="CXXFLAGS=-std=c++11" - dist: trusty compiler: clang - env: wxCONFIGURE_FLAGS="--disable-shared" + env: wxCONFIGURE_FLAGS="--disable-shared --disable-sys-libs" - os: osx osx_image: xcode6.4 compiler: clang