package/minizip: fix build without openssl
PATCH 1/1 package/minizip: fix build without openssl
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
--- package/minizip/minizip.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
package/minizip/minizip.mk +8 -2
@@ -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)
Signature · 1 line
2.29.2
Yann E. MORIN
AppliedPATCH 1/1 package/minizip: fix build without openssl
Fabrice, All,
On 2020-12-25 23:13 +0100, Fabrice Fontaine spake thusly:
Quoted 8 lines
Disable PKWARE traditional and WinZIP AES encryption without openssl to avoid the following build failure due to
MZ_FETCH_LIBSbeing set to OFF since commitf9d31de3b7585e3521aafe2089fcff79bf7f037dFixes:
- http://autobuild.buildroot.org/results/ae16497bf56df9ce4be97651b5ce65f75bdf909fSigned-off-by Fabrice Fontaine <[email protected]>
Applied to master, thanks.
Regards,
Yann E. MORIN.
Quoted 33 lines
--- package/minizip/minizip.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)package/minizip/minizip.mk +8
-2@@ -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)Signature · 6 lines
2.29.2 _______________________________________________ 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. | '------------------------------^-------^------------------^--------------------'