From fc166894b3f257c4cb20d84368c918f3335dadf5 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 28 Jan 2019 21:04:07 +0100 Subject: [PATCH] minizip: disable compatibility headers minizip enables zip.h and unzip.h compatibility headers since version 2.7.2 and https://github.com/nmoinvaz/minizip/commit/1b2b32c8b8c7ea441b14a2fd827d7e2dc886776c This is an issue as php fails to build if minizip is built after libzip because minizip installs a zip.h header without zip_stat, ZIP_CREATE, ZIP_FL_NOCASE, zip_fopen, etc ... So until the compatibility headers are enhanced/fixed in minizip, disable them Fixes: - http://autobuild.buildroot.org/results/7b41f4e4a521b1e17aa885aac4419b26e0dd8700 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/minizip/minizip.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/minizip/minizip.mk b/package/minizip/minizip.mk index 7f7a1d277d..a9eea1b1c8 100644 --- a/package/minizip/minizip.mk +++ b/package/minizip/minizip.mk @@ -11,7 +11,9 @@ MINIZIP_DEPENDENCIES = \ $(if $(BR2_PACKAGE_LIBBSD),libbsd) \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) MINIZIP_INSTALL_STAGING = YES -MINIZIP_CONF_OPTS = $(if $(BR2_PACKAGE_MINIZIP_DEMOS),-DBUILD_TEST=ON) +MINIZIP_CONF_OPTS = \ + $(if $(BR2_PACKAGE_MINIZIP_DEMOS),-DBUILD_TEST=ON) \ + -DUSE_COMPAT=OFF MINIZIP_LICENSE = Zlib MINIZIP_LICENSE_FILES = LICENSE -- 2.30.2