minizip: bump to version 2.5.3
PATCH 1/1 minizip: bump to version 2.5.3
- Move to cmake infrastructure
- Do not enforce zlib dependency
- Add optional bzip2 dependency
- Add mandatory host-pkgconf and libbsd dependency
- Add hash for license file
--- package/minizip/Config.in | 8 ++++++++ package/minizip/minizip.hash | 3 ++- package/minizip/minizip.mk | 21 +++++++++++++++++---- 3 files changed, 27 insertions(+), 5 deletions(-)
package/minizip/Config.in +8 -0
@@ -1,5 +1,9 @@ config BR2_PACKAGE_MINIZIP bool "minizip" + depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_THREADS # libbsd + depends on BR2_USE_WCHAR # libbsd + select BR2_PACKAGE_LIBBSD select BR2_PACKAGE_ZLIB help Enables to extract files from a .zip archive file.
@@ -13,3 +17,7 @@ config BR2_PACKAGE_MINIZIP_DEMOS depends on BR2_PACKAGE_MINIZIP help Enable miniunzip/minizip binary tools. + +comment "minizip needs a toolchain w/ threads, wchar" + depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
package/minizip/minizip.hash +2 -1
@@ -1,2 +1,3 @@ # Locally computed -sha256 5666b5ee3e85dfd2dd119970613c12e6267d31813f07d3ffa5d359fe272cb6d1 minizip-1.1.tar.gz +sha256 0afe6528f530cc9c1440053a7bbff53087e86f849e145d233464052c730431e9 minizip-2.5.3.tar.gz +sha256 87642305968765a4030fd202ff7006afa67274da7f9bde84506e51ae58ecc2b4 LICENSE
package/minizip/minizip.mk +17 -4
@@ -4,13 +4,26 @@ # ################################################################################ -MINIZIP_VERSION = 1.1 +MINIZIP_VERSION = 2.5.3 MINIZIP_SITE = $(call github,nmoinvaz,minizip,$(MINIZIP_VERSION)) -MINIZIP_DEPENDENCIES = zlib -MINIZIP_AUTORECONF = YES +MINIZIP_DEPENDENCIES = host-pkgconf libbsd MINIZIP_INSTALL_STAGING = YES MINIZIP_CONF_OPTS = $(if $(BR2_PACKAGE_MINIZIP_DEMOS),--enable-demos) MINIZIP_LICENSE = Zlib MINIZIP_LICENSE_FILES = LICENSE -$(eval $(autotools-package)) +ifeq ($(BR2_PACKAGE_BZIP2),y) +MINIZIP_DEPENDENCIES += bzip2 +MINIZIP_CONF_OPTS += -DUSE_BZIP2=ON +else +MINIZIP_CONF_OPTS += -DUSE_BZIP2=OFF +endif + +ifeq ($(BR2_PACKAGE_ZLIB),y) +MINIZIP_DEPENDENCIES += zlib +MINIZIP_CONF_OPTS += -DUSE_ZLIB=ON +else +MINIZIP_CONF_OPTS += -DUSE_ZLIB=OFF +endif + +$(eval $(cmake-package))
Signature · 1 line
2.17.1
PATCH 1/1 minizip: bump to version 2.5.3
Hi Fabrice,
Quoted 18 lines · Fabrice Fontaine
- Move to cmake infrastructure
- Do not enforce zlib dependency
- Add optional bzip2 dependency
- Add mandatory host-pkgconf and libbsd dependency
- Add hash for license fileSigned-off-by Fabrice Fontaine <[email protected]>--- package/minizip/Config.in | 8 ++++++++ package/minizip/minizip.hash | 3 ++- package/minizip/minizip.mk | 21 +++++++++++++++++---- 3 files changed, 27 insertions(+), 5 deletions(-)package/minizip/Config.in +0
-0
package/minizip/Config.in line 7
Quoted 7 lines
package/minizip/Config.in +4
-0@@ -1,5 +1,9 @@ config BR2_PACKAGE_MINIZIP bool "minizip" + depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_THREADS # libbsd + depends on BR2_USE_WCHAR # libbsd + select BR2_PACKAGE_LIBBSD select BR2_PACKAGE_ZLIB
This select is no longer needed since zlib is now an optional dependency.
baruch
Quoted 54 lines
package/minizip/Config.in +4
-0help Enables to extract files from a .zip archive file.@@ -13,3 +17,7 @@ config BR2_PACKAGE_MINIZIP_DEMOS depends on BR2_PACKAGE_MINIZIP help Enable miniunzip/minizip binary tools. + +comment "minizip needs a toolchain w/ threads, wchar" + depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHARpackage/minizip/minizip.hash +2
-1@@ -1,2 +1,3 @@ # Locally computed -sha256 5666b5ee3e85dfd2dd119970613c12e6267d31813f07d3ffa5d359fe272cb6d1 minizip-1.1.tar.gz +sha256 0afe6528f530cc9c1440053a7bbff53087e86f849e145d233464052c730431e9 minizip-2.5.3.tar.gz +sha256 87642305968765a4030fd202ff7006afa67274da7f9bde84506e51ae58ecc2b4 LICENSEpackage/minizip/minizip.mk +17
-4@@ -4,13 +4,26 @@ # ################################################################################ -MINIZIP_VERSION = 1.1 +MINIZIP_VERSION = 2.5.3 MINIZIP_SITE = $(call github,nmoinvaz,minizip,$(MINIZIP_VERSION)) -MINIZIP_DEPENDENCIES = zlib -MINIZIP_AUTORECONF = YES +MINIZIP_DEPENDENCIES = host-pkgconf libbsd MINIZIP_INSTALL_STAGING = YES MINIZIP_CONF_OPTS = $(if $(BR2_PACKAGE_MINIZIP_DEMOS),--enable-demos) MINIZIP_LICENSE = Zlib MINIZIP_LICENSE_FILES = LICENSE -$(eval $(autotools-package)) +ifeq ($(BR2_PACKAGE_BZIP2),y) +MINIZIP_DEPENDENCIES += bzip2 +MINIZIP_CONF_OPTS += -DUSE_BZIP2=ON +else +MINIZIP_CONF_OPTS += -DUSE_BZIP2=OFF +endif + +ifeq ($(BR2_PACKAGE_ZLIB),y) +MINIZIP_DEPENDENCIES += zlib +MINIZIP_CONF_OPTS += -DUSE_ZLIB=ON +else +MINIZIP_CONF_OPTS += -DUSE_ZLIB=OFF +endif + +$(eval $(cmake-package))
Signature · 3 lines
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -PATCH 1/1 minizip: bump to version 2.5.3
Dear Baruch,
Le dim. 23 sept. 2018 ? 05:24, Baruch Siach <[email protected]> a ?crit :
Quoted 16 lines
Hi Fabrice,
Quoted 13 lines · Fabrice Fontaine
- Move to cmake infrastructure
- Do not enforce zlib dependency
- Add optional bzip2 dependency
- Add mandatory host-pkgconf and libbsd dependency
- Add hash for license fileSigned-off-by Fabrice Fontaine <[email protected]>--- package/minizip/Config.in | 8 ++++++++ package/minizip/minizip.hash | 3 ++- package/minizip/minizip.mk | 21 +++++++++++++++++---- 3 files changed, 27 insertions(+), 5 deletions(-)
Quoted 15 lines
package/minizip/Config.in line 7
Quoted 12 lines
package/minizip/Config.in +4
-0@@ -1,5 +1,9 @@ config BR2_PACKAGE_MINIZIP bool "minizip" + depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_THREADS # libbsd + depends on BR2_USE_WCHAR # libbsd + select BR2_PACKAGE_LIBBSD select BR2_PACKAGE_ZLIBThis select is no longer needed since zlib is now an optional dependency.
Indeed, thanks for your review. I also forget to update --enable-demos. I will send a v2.
Quoted 62 lines
baruch
Quoted 15 lines
package/minizip/Config.in +4
-0help Enables to extract files from a .zip archive file.@@ -13,3 +17,7 @@ config BR2_PACKAGE_MINIZIP_DEMOS depends on BR2_PACKAGE_MINIZIP help Enable miniunzip/minizip binary tools. + +comment "minizip needs a toolchain w/ threads, wchar" + depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHARpackage/minizip/minizip.hash +0
-0package/minizip/minizip.hash line 2
Quoted 2 lines
package/minizip/minizip.hash +0
-1@@ -1,2 +1,3 @@ # Locally computed -sha256
5666b5ee3e85dfd2dd119970613c12e6267d31813f07d3ffa5d359fe272cb6d1minizip-1.1.tar.gzpackage/minizip/minizip.hash line 2
Quoted 1 line
package/minizip/minizip.hash +1
-0+sha256
0afe6528f530cc9c1440053a7bbff53087e86f849e145d233464052c730431e9minizip-2.5.3.tar.gzpackage/minizip/minizip.hash line 3
Quoted 1 line
package/minizip/minizip.hash +1
-0+sha256
87642305968765a4030fd202ff7006afa67274da7f9bde84506e51ae58ecc2b4LICENSEpackage/minizip/minizip.mk line 5
Quoted 7 lines
package/minizip/minizip.mk +0
-0@@ -4,13 +4,26 @@ #################################################################################
Quoted 27 lines
package/minizip/minizip.mk +16
-4-MINIZIP_VERSION = 1.1 +MINIZIP_VERSION = 2.5.3 MINIZIP_SITE = $(call github,nmoinvaz,minizip,$(MINIZIP_VERSION)) -MINIZIP_DEPENDENCIES = zlib -MINIZIP_AUTORECONF = YES +MINIZIP_DEPENDENCIES = host-pkgconf libbsd MINIZIP_INSTALL_STAGING = YES MINIZIP_CONF_OPTS = $(if $(BR2_PACKAGE_MINIZIP_DEMOS),--enable-demos) MINIZIP_LICENSE = Zlib MINIZIP_LICENSE_FILES = LICENSE -$(eval $(autotools-package)) +ifeq ($(BR2_PACKAGE_BZIP2),y) +MINIZIP_DEPENDENCIES += bzip2 +MINIZIP_CONF_OPTS += -DUSE_BZIP2=ON +else +MINIZIP_CONF_OPTS += -DUSE_BZIP2=OFF +endif + +ifeq ($(BR2_PACKAGE_ZLIB),y) +MINIZIP_DEPENDENCIES += zlib +MINIZIP_CONF_OPTS += -DUSE_ZLIB=ON +else +MINIZIP_CONF_OPTS += -DUSE_ZLIB=OFF +endif +
Quoted 9 lines
package/minizip/minizip.mk line 29
Quoted 1 line
package/minizip/minizip.mk +1
-0+$(eval $(cmake-package))--
http://baruch.siach.name/blog/ ~. .~ Tk Open
Systems =}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
Best Regards,
Fabrice
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20180923/36415f65/attachment.html>