* [Buildroot] [PATCH 1/1] package/minizip: fix build without openssl
@ 2020-12-25 22:13 Fabrice Fontaine
2020-12-25 22:49 ` Yann E. MORIN
0 siblings, 1 reply; 2+ messages in thread
From: Fabrice Fontaine @ 2020-12-25 22:13 UTC (permalink / raw)
To: buildroot
Disable PKWARE traditional and WinZIP AES encryption without openssl to
avoid the following build failure due to MZ_FETCH_LIBS being set to OFF
since commit f9d31de3b7585e3521aafe2089fcff79bf7f037d
Fixes:
- http://autobuild.buildroot.org/results/ae16497bf56df9ce4be97651b5ce65f75bdf909f
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/minizip/minizip.mk | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/package/minizip/minizip.mk b/package/minizip/minizip.mk
index e2abfd4f20..9e60bc2aab 100644
--- a/package/minizip/minizip.mk
+++ b/package/minizip/minizip.mk
@@ -38,9 +38,15 @@ endif
ifeq ($(BR2_PACKAGE_OPENSSL),y)
MINIZIP_DEPENDENCIES += openssl
-MINIZIP_CONF_OPTS += -DMZ_OPENSSL=ON
+MINIZIP_CONF_OPTS += \
+ -DMZ_OPENSSL=ON \
+ -DMZ_PKCRYPT=ON \
+ -DMZ_WZAES=ON
else
-MINIZIP_CONF_OPTS += -DMZ_OPENSSL=OFF
+MINIZIP_CONF_OPTS += \
+ -DMZ_OPENSSL=OFF \
+ -DMZ_PKCRYPT=OFF \
+ -DMZ_WZAES=OFF
endif
ifeq ($(BR2_PACKAGE_XZ),y)
--
2.29.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [Buildroot] [PATCH 1/1] package/minizip: fix build without openssl
2020-12-25 22:13 [Buildroot] [PATCH 1/1] package/minizip: fix build without openssl Fabrice Fontaine
@ 2020-12-25 22:49 ` Yann E. MORIN
0 siblings, 0 replies; 2+ messages in thread
From: Yann E. MORIN @ 2020-12-25 22:49 UTC (permalink / raw)
To: buildroot
Fabrice, All,
On 2020-12-25 23:13 +0100, Fabrice Fontaine spake thusly:
> Disable PKWARE traditional and WinZIP AES encryption without openssl to
> avoid the following build failure due to MZ_FETCH_LIBS being set to OFF
> since commit f9d31de3b7585e3521aafe2089fcff79bf7f037d
>
> Fixes:
> - http://autobuild.buildroot.org/results/ae16497bf56df9ce4be97651b5ce65f75bdf909f
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Applied to master, thanks.
Regards,
Yann E. MORIN.
> ---
> package/minizip/minizip.mk | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/package/minizip/minizip.mk b/package/minizip/minizip.mk
> index e2abfd4f20..9e60bc2aab 100644
> --- a/package/minizip/minizip.mk
> +++ b/package/minizip/minizip.mk
> @@ -38,9 +38,15 @@ endif
>
> ifeq ($(BR2_PACKAGE_OPENSSL),y)
> MINIZIP_DEPENDENCIES += openssl
> -MINIZIP_CONF_OPTS += -DMZ_OPENSSL=ON
> +MINIZIP_CONF_OPTS += \
> + -DMZ_OPENSSL=ON \
> + -DMZ_PKCRYPT=ON \
> + -DMZ_WZAES=ON
> else
> -MINIZIP_CONF_OPTS += -DMZ_OPENSSL=OFF
> +MINIZIP_CONF_OPTS += \
> + -DMZ_OPENSSL=OFF \
> + -DMZ_PKCRYPT=OFF \
> + -DMZ_WZAES=OFF
> endif
>
> ifeq ($(BR2_PACKAGE_XZ),y)
> --
> 2.29.2
>
> _______________________________________________
> 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:[~2020-12-25 22:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-25 22:13 [Buildroot] [PATCH 1/1] package/minizip: fix build without openssl Fabrice Fontaine
2020-12-25 22:49 ` 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.