* [Buildroot] [PATCH 1/1] package/minizip: fix options
@ 2019-11-06 17:59 Fabrice Fontaine
2019-11-07 20:13 ` Yann E. MORIN
0 siblings, 1 reply; 2+ messages in thread
From: Fabrice Fontaine @ 2019-11-06 17:59 UTC (permalink / raw)
To: buildroot
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>
---
package/minizip/minizip.mk | 16 ++++++++--------
1 file 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))
--
2.23.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [Buildroot] [PATCH 1/1] package/minizip: fix options
2019-11-06 17:59 [Buildroot] [PATCH 1/1] package/minizip: fix options Fabrice Fontaine
@ 2019-11-07 20:13 ` Yann E. MORIN
0 siblings, 0 replies; 2+ messages in thread
From: Yann E. MORIN @ 2019-11-07 20:13 UTC (permalink / raw)
To: buildroot
Fabrice, All,
On 2019-11-06 18:59 +0100, Fabrice Fontaine spake thusly:
> 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>
Applied to master, thanks.
Regards,
Yann E. MORIN.
> ---
> package/minizip/minizip.mk | 16 ++++++++--------
> 1 file 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))
> --
> 2.23.0
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| 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. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-11-07 20:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-06 17:59 [Buildroot] [PATCH 1/1] package/minizip: fix options Fabrice Fontaine
2019-11-07 20:13 ` Yann E. MORIN
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.