Skip to contentSkip to conversation

minizip: disable compatibility headers

PATCH New Fabrice Fontaine 2 participants 2 messages Jan 28, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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

---
 package/minizip/minizip.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
package/minizip/minizip.mk +3 -1
index 7f7a1d277d..a9eea1b1c8 100644
@@ -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
 
Signature · 1 line
2.14.1
#1 lore raw

PATCH 1/1 minizip: disable compatibility headers

Quoted 10 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fabrice" == Fabrice Fontaine <[email protected]> writes:

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 ...

Quoted 6 lines

So until the compatibility headers are enhanced/fixed in minizip, disable them

Fixes:
- http://autobuild.buildroot.org/results/7b41f4e4a521b1e17aa885aac4419b26e0dd8700

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard