From: Yann E. MORIN <yann.morin.1998@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 1/1] package/minizip: fix options
Date: Thu, 7 Nov 2019 21:13:47 +0100 [thread overview]
Message-ID: <20191107201346.GF3419@scaer> (raw)
In-Reply-To: <20191106175957.32565-1-fontaine.fabrice@gmail.com>
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. |
'------------------------------^-------^------------------^--------------------'
prev parent reply other threads:[~2019-11-07 20:13 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-06 17:59 [Buildroot] [PATCH 1/1] package/minizip: fix options Fabrice Fontaine
2019-11-07 20:13 ` Yann E. MORIN [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191107201346.GF3419@scaer \
--to=yann.morin.1998@free.fr \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox