package/minizip: fix options
PATCH 1/1 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
--- package/minizip/minizip.mk | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
package/minizip/minizip.mk +8 -8
@@ -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))
Signature · 1 line
2.23.0
Yann E. MORIN
AppliedPATCH 1/1 package/minizip: fix options
Fabrice, All,
On 2019-11-06 18:59 +0100, Fabrice Fontaine spake thusly:
Quoted 10 lines
Options have been prefixed by
MZ_since version 2.8.3 and
https://github.com/nmoinvaz/minizip/commit/cdedc087e7306fbe2c73d4302920846f5c4a8a11This will fix a build failure with php due to the compat headers being enabled
Fixes:
- http://autobuild.buildroot.org/results/fee97d1879b5ea2d9630b2ae629f12b0e202a50eSigned-off-by Fabrice Fontaine <[email protected]>
Applied to master, thanks.
Regards,
Yann E. MORIN.
Quoted 54 lines
--- package/minizip/minizip.mk | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)package/minizip/minizip.mk +8
-8@@ -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))Signature · 6 lines
2.23.0 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'