From patchwork Sun Sep 23 12:11:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 973664 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ER0QMpTn"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42J5mZ45Mzz9s5c for ; Sun, 23 Sep 2018 22:11:57 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 7B66A88BE9; Sun, 23 Sep 2018 12:11:54 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id JQrJdQt8tRqU; Sun, 23 Sep 2018 12:11:53 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id BB31488B13; Sun, 23 Sep 2018 12:11:53 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 10A221C25D9 for ; Sun, 23 Sep 2018 12:11:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 0DD2F89AFC for ; Sun, 23 Sep 2018 12:11:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id V6RUdeI+bvvF for ; Sun, 23 Sep 2018 12:11:52 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by hemlock.osuosl.org (Postfix) with ESMTPS id AD5E289AFA for ; Sun, 23 Sep 2018 12:11:51 +0000 (UTC) Received: by mail-wr1-f42.google.com with SMTP id e1-v6so16974315wrt.3 for ; Sun, 23 Sep 2018 05:11:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=hJsdRdIc8pWv3Y0maxqTCED3vxxL64O4pkbB+kruhEA=; b=ER0QMpTny8tQ9njdmELgJfjqIqMMdlEBdXdyZy5CXjEBvbT+g97jnLEJyroyTmNoUl Q/ar3loQ2JEYfdBwd6ztDxOIKwJHY2+2yTLJDP76VKK/eC9T1XkBV7M4dTXl+xle4R8g AM+HG/nLHx24x3dNpG80qFEbKXaUXKQeWSNyr8Op5YQzdAVRSSt2FElA3Cs+tw8tMVEB WZEi9vnw/1xwg/NebSsyCg04IoWklM44xTkJMfx33Wx18mVZm9rt1F5t9JTxgGXlosqD 7gFhSn++b+FhQqjH0CZG/wvcEaDVGT1xxgTEa+XbeiLoe0dIgICbqYaMz5sIpK14DqbD cc8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=hJsdRdIc8pWv3Y0maxqTCED3vxxL64O4pkbB+kruhEA=; b=Wer1Y+3ZHPLXGlVIdaZAD/DTS5WjRU9vIOIohKBncN2yJEb3JhA9PGQaq1GvQxwCuF U4bnhhohwhRuJvHn9VtFTRQYNm5IL5tgcmc8uN0Uu7UtC7J7DcaGqVcdYkLVloU7wHPS HG/xj9hMWlIbeKpQIBaqatzAPkmRnMF2W7G28GoTS40slv75DOfGcGsDxGEKsFn1NMSU B8oYB3IZpNAewjtSwQUUGI+yAHHD9R8BUnwIzM+H+871VgJVZZAHqKD9t2jKDAXnYnWS YGaqqtKzLT4mZabr+1hggNtA8JjC3SpX3fmwYomLcjyBSotWY1as2b4R5e8VV+DTkfNK MKGw== X-Gm-Message-State: ABuFfoipornC+E+d8/rYkpUbIVA51tD+K7Worj0gS1xcEJOrQbXcRkTd ckKMXlq/MULAT+Y6h/o5xpggYaUX X-Google-Smtp-Source: ACcGV60NIVbSjofsilGSNiIdLBoJp9sqTh6oAm0wwPMTu5ulKNRedZL1t+wBHU3vpaKNArhFOdvbiQ== X-Received: by 2002:a5d:650d:: with SMTP id x13-v6mr4539965wru.194.1537704709734; Sun, 23 Sep 2018 05:11:49 -0700 (PDT) Received: from localhost.localdomain (ARennes-656-1-284-254.w109-218.abo.wanadoo.fr. [109.218.204.254]) by smtp.gmail.com with ESMTPSA id w15-v6sm27460034wrs.8.2018.09.23.05.11.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Sep 2018 05:11:49 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sun, 23 Sep 2018 14:11:42 +0200 Message-Id: <20180923121142.3204-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [Buildroot] [PATCH v2,1/1] minizip: bump to version 2.5.3 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrice Fontaine MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" - Move to cmake infrastructure - Do not enforce zlib dependency - Add optional bzip2 dependency - Add mandatory host-pkgconf and libbsd dependency - Remove miniunzip from Config.in, miniunzip (miniunz) has been merged with minizip: https://github.com/nmoinvaz/minizip/commit/a66cc31fac61e47a34bced08569ddec38b81bbef - Add hash for license file Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2 (after review of Baruch Siach): - Remove zlib select as it is now an optional dependency - Replace --enable-demos by -DBUILD_TEST=ON and remove miniunzip from Config .in package/minizip/Config.in | 13 ++++++++++--- package/minizip/minizip.hash | 3 ++- package/minizip/minizip.mk | 23 ++++++++++++++++++----- 3 files changed, 30 insertions(+), 9 deletions(-) diff --git a/package/minizip/Config.in b/package/minizip/Config.in index 7205e0007e..68fa1d7118 100644 --- a/package/minizip/Config.in +++ b/package/minizip/Config.in @@ -1,6 +1,9 @@ config BR2_PACKAGE_MINIZIP bool "minizip" - select BR2_PACKAGE_ZLIB + depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_THREADS # libbsd + depends on BR2_USE_WCHAR # libbsd + select BR2_PACKAGE_LIBBSD help Enables to extract files from a .zip archive file. It is compatible with PKZip 2.04g, WinZip, InfoZip, @@ -9,7 +12,11 @@ config BR2_PACKAGE_MINIZIP https://github.com/nmoinvaz/minizip config BR2_PACKAGE_MINIZIP_DEMOS - bool "miniunzip/minizip" + bool "minizip" depends on BR2_PACKAGE_MINIZIP help - Enable miniunzip/minizip binary tools. + Enable minizip binary tool. + +comment "minizip needs a toolchain w/ threads, wchar" + depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR diff --git a/package/minizip/minizip.hash b/package/minizip/minizip.hash index 718026c1f6..f77d40a02c 100644 --- a/package/minizip/minizip.hash +++ b/package/minizip/minizip.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 5666b5ee3e85dfd2dd119970613c12e6267d31813f07d3ffa5d359fe272cb6d1 minizip-1.1.tar.gz +sha256 0afe6528f530cc9c1440053a7bbff53087e86f849e145d233464052c730431e9 minizip-2.5.3.tar.gz +sha256 87642305968765a4030fd202ff7006afa67274da7f9bde84506e51ae58ecc2b4 LICENSE diff --git a/package/minizip/minizip.mk b/package/minizip/minizip.mk index bcd6cc928f..5a596f7ccf 100644 --- a/package/minizip/minizip.mk +++ b/package/minizip/minizip.mk @@ -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_CONF_OPTS = $(if $(BR2_PACKAGE_MINIZIP_DEMOS),-DBUILD_TEST=ON) 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))