NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/minizip: fix options

Browse Source 
Options have been prefixed by MZ_ since version 2.8.3 and
cdedc087e7

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>
This commit is contained in:
Fabrice Fontaine 2019-11-06 18:59:57 +01:00 committed by Yann E. MORIN
parent dca3a64b48
commit 4d68651f2c
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
package/minizip/minizip.mk
View File

@ -12,30 +12,30 @@ MINIZIP_DEPENDENCIES = \
$(if $(BR2_PACKAGE_LIBICONV),libiconv) $(if $(BR2_PACKAGE_LIBICONV),libiconv)
MINIZIP_INSTALL_STAGING = YES MINIZIP_INSTALL_STAGING = YES
MINIZIP_CONF_OPTS = \ MINIZIP_CONF_OPTS = \
$(if $(BR2_PACKAGE_MINIZIP_DEMOS),-DBUILD_TEST=ON) \ $(if $(BR2_PACKAGE_MINIZIP_DEMOS),-DMZ_BUILD_TEST=ON) \
-DUSE_COMPAT=OFF -DMZ_COMPAT=OFF
MINIZIP_LICENSE = Zlib MINIZIP_LICENSE = Zlib
MINIZIP_LICENSE_FILES = LICENSE MINIZIP_LICENSE_FILES = LICENSE
ifeq ($(BR2_PACKAGE_BZIP2),y) ifeq ($(BR2_PACKAGE_BZIP2),y)
MINIZIP_DEPENDENCIES += bzip2 MINIZIP_DEPENDENCIES += bzip2
MINIZIP_CONF_OPTS += -DUSE_BZIP2=ON MINIZIP_CONF_OPTS += -DMZ_BZIP2=ON
else else
MINIZIP_CONF_OPTS += -DUSE_BZIP2=OFF MINIZIP_CONF_OPTS += -DMZ_BZIP2=OFF
endif endif
ifeq ($(BR2_PACKAGE_OPENSSL),y) ifeq ($(BR2_PACKAGE_OPENSSL),y)
MINIZIP_DEPENDENCIES += openssl MINIZIP_DEPENDENCIES += openssl
MINIZIP_CONF_OPTS += -DUSE_OPENSSL=ON MINIZIP_CONF_OPTS += -DMZ_OPENSSL=ON
else else
MINIZIP_CONF_OPTS += -DUSE_OPENSSL=OFF MINIZIP_CONF_OPTS += -DMZ_OPENSSL=OFF
endif endif
ifeq ($(BR2_PACKAGE_ZLIB),y) ifeq ($(BR2_PACKAGE_ZLIB),y)
MINIZIP_DEPENDENCIES += zlib MINIZIP_DEPENDENCIES += zlib
MINIZIP_CONF_OPTS += -DUSE_ZLIB=ON MINIZIP_CONF_OPTS += -DMZ_ZLIB=ON
else else
MINIZIP_CONF_OPTS += -DUSE_ZLIB=OFF MINIZIP_CONF_OPTS += -DMZ_ZLIB=OFF
endif endif
$(eval $(cmake-package)) $(eval $(cmake-package))