aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Fabrice Fontaine <fontaine.fabrice@gmail.com>2019-11-06 18:59:57 +0100
committerGravatar Yann E. MORIN <yann.morin.1998@free.fr>2019-11-07 21:09:45 +0100
commit4d68651f2c1e374df08278100f576f63eedb80cc (patch)
tree8334fb023fff02e7650ef833640a75a2fc9b364f
parentdca3a64b48a8a160477d46bec763b6a5478138d2 (diff)
downloadbuildroot-4d68651f2c1e374df08278100f576f63eedb80cc.tar.gz
buildroot-4d68651f2c1e374df08278100f576f63eedb80cc.tar.bz2
package/minizip: fix options
Options have been prefixed by MZ_ since version 2.8.3 and https://github.com/nmoinvaz/minizip/commit/cdedc087e7306fbe2c73d4302920846f5c4a8a11 This will fix a build failure with php due to the compat headers being enabled Fixes: - http://autobuild.buildroot.org/results/fee97d1879b5ea2d9630b2ae629f12b0e202a50e Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
-rw-r--r--package/minizip/minizip.mk16
1 files changed, 8 insertions, 8 deletions
diff --git a/package/minizip/minizip.mk b/package/minizip/minizip.mk
index bf0b6198b0..3ae8d1d6f0 100644
--- a/package/minizip/minizip.mk
+++ b/package/minizip/minizip.mk
@@ -12,30 +12,30 @@ MINIZIP_DEPENDENCIES = \
$(if $(BR2_PACKAGE_LIBICONV),libiconv)
MINIZIP_INSTALL_STAGING = YES
MINIZIP_CONF_OPTS = \
- $(if $(BR2_PACKAGE_MINIZIP_DEMOS),-DBUILD_TEST=ON) \
- -DUSE_COMPAT=OFF
+ $(if $(BR2_PACKAGE_MINIZIP_DEMOS),-DMZ_BUILD_TEST=ON) \
+ -DMZ_COMPAT=OFF
MINIZIP_LICENSE = Zlib
MINIZIP_LICENSE_FILES = LICENSE
ifeq ($(BR2_PACKAGE_BZIP2),y)
MINIZIP_DEPENDENCIES += bzip2
-MINIZIP_CONF_OPTS += -DUSE_BZIP2=ON
+MINIZIP_CONF_OPTS += -DMZ_BZIP2=ON
else
-MINIZIP_CONF_OPTS += -DUSE_BZIP2=OFF
+MINIZIP_CONF_OPTS += -DMZ_BZIP2=OFF
endif
ifeq ($(BR2_PACKAGE_OPENSSL),y)
MINIZIP_DEPENDENCIES += openssl
-MINIZIP_CONF_OPTS += -DUSE_OPENSSL=ON
+MINIZIP_CONF_OPTS += -DMZ_OPENSSL=ON
else
-MINIZIP_CONF_OPTS += -DUSE_OPENSSL=OFF
+MINIZIP_CONF_OPTS += -DMZ_OPENSSL=OFF
endif
ifeq ($(BR2_PACKAGE_ZLIB),y)
MINIZIP_DEPENDENCIES += zlib
-MINIZIP_CONF_OPTS += -DUSE_ZLIB=ON
+MINIZIP_CONF_OPTS += -DMZ_ZLIB=ON
else
-MINIZIP_CONF_OPTS += -DUSE_ZLIB=OFF
+MINIZIP_CONF_OPTS += -DMZ_ZLIB=OFF
endif
$(eval $(cmake-package))