From patchwork Fri Aug 2 19:27:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Jean Texier X-Patchwork-Id: 1141358 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.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=quarantine dis=none) header.from=koncepto.io Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=koncepto.io header.i=@koncepto.io header.b="k83SH+Kh"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 460cdw07mBz9s00 for ; Sat, 3 Aug 2019 05:28:35 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 7E8C2234B3; Fri, 2 Aug 2019 19:28:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id glPCX0a0u+0J; Fri, 2 Aug 2019 19:28:30 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id B4B2B204B7; Fri, 2 Aug 2019 19:28:30 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 5650B1BF2A3 for ; Fri, 2 Aug 2019 19:28:29 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 5260487E80 for ; Fri, 2 Aug 2019 19:28:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id r9X2ct0JJcEK for ; Fri, 2 Aug 2019 19:28:28 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from koncepto.io (koncepto.io [195.154.119.111]) by whitealder.osuosl.org (Postfix) with ESMTPS id C208D87D2F for ; Fri, 2 Aug 2019 19:28:27 +0000 (UTC) Received: from menoah.home (apoitiers-652-1-11-81.w92-146.abo.wanadoo.fr [92.146.125.81]) by koncepto.io (Postfix) with ESMTPSA id 164E0602B3; Fri, 2 Aug 2019 21:28:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=koncepto.io; s=default; t=1564774096; bh=sLDXj2yv1B3s2fnHjIFT1RyoWGgvoy1O7LwhPkTGiiI=; h=From:To:Cc:Subject:Date:From; b=k83SH+KhUWR9vEfyYcm9kwPEUkpYQ/d2Joi8Jq3MbQPkhwQltQNdcIYlpWf2nzdNc EUSaoxpjIRoZonOpJHSjdyUlLdMSQo+mVGGKO4QzjpMWl9jQS5Mq/dE1BcOEumrvgF 7DRT3hqE9IElKrrRwz306o2UYZ9I+S3dCU3ijD22y8aYuU/BXE31TPeTN7eIDKv4CN Cecbkx37mCfJoe4BmFouf08wsg9/wYHU8iw4U4hWikf7h5xmwswqfH4bVBh8bhT7La DlnI14u6pZdkqChTrw4bC9lNC5HZL/bP02RSncBrQIkLMXty5a58EOqdHKUr7g6J/1 vWGffglUrasTQ== From: Pierre-Jean Texier To: buildroot@buildroot.org Date: Fri, 2 Aug 2019 21:27:22 +0200 Message-Id: <1564774042-9857-1-git-send-email-pjtexier@koncepto.io> X-Mailer: git-send-email 2.7.4 Subject: [Buildroot] [PATCH 1/1] package/cppzmq: bump to version 4.4.1 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Pierre-Jean Texier , Simon Dawson MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Remove patch (already in version) Signed-off-by: Pierre-Jean Texier --- .../0001-fix-install-without-static-libzmq.patch | 47 ---------------------- package/cppzmq/cppzmq.hash | 2 +- package/cppzmq/cppzmq.mk | 2 +- 3 files changed, 2 insertions(+), 49 deletions(-) delete mode 100644 package/cppzmq/0001-fix-install-without-static-libzmq.patch diff --git a/package/cppzmq/0001-fix-install-without-static-libzmq.patch b/package/cppzmq/0001-fix-install-without-static-libzmq.patch deleted file mode 100644 index 15936f3..0000000 --- a/package/cppzmq/0001-fix-install-without-static-libzmq.patch +++ /dev/null @@ -1,47 +0,0 @@ -From bffb0eda34195339f2af49f2879d9d0b9dee5c28 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 20 Sep 2018 19:37:26 +0200 -Subject: [PATCH] fix install without static libzmq - -If libzmq is only available as a shared library and not a static one -then cmake fails with: - --- CMake libzmq package not found, trying again with pkg-config (normal install of zeromq) --- Found PkgConfig: /home/fabrice/buildroot/output/host/bin/pkg-config (found version "0.28") -CMake Error at CMakeLists.txt:20 (message): - ZeroMQ was not found, neither as a CMake package nor via pkg-config - -This is due to the fact that ZeroMQ_FOUND is not set to ON even if -ZEROMQ_LIBRARY is TRUE: - -if(ZeroMQ_LIBRARY AND ZeroMQ_STATIC_LIBRARY) - set(ZeroMQ_FOUND ON) -endif() - -So change AND by OR as suggested in -https://github.com/zeromq/cppzmq/issues/266 - -Fix #266 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/zeromq/cppzmq/pull/267] ---- - libzmq-pkg-config/FindZeroMQ.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libzmq-pkg-config/FindZeroMQ.cmake b/libzmq-pkg-config/FindZeroMQ.cmake -index 89d8236..1b84c95 100644 ---- a/libzmq-pkg-config/FindZeroMQ.cmake -+++ b/libzmq-pkg-config/FindZeroMQ.cmake -@@ -8,7 +8,7 @@ find_library(ZeroMQ_LIBRARY NAMES libzmq.so libzmq.dylib libzmq.dll - find_library(ZeroMQ_STATIC_LIBRARY NAMES libzmq-static.a libzmq.a libzmq.dll.a - PATHS ${PC_LIBZMQ_LIBDIR} ${PC_LIBZMQ_LIBRARY_DIRS}) - --if(ZeroMQ_LIBRARY AND ZeroMQ_STATIC_LIBRARY) -+if(ZeroMQ_LIBRARY OR ZeroMQ_STATIC_LIBRARY) - set(ZeroMQ_FOUND ON) - endif() - --- -2.17.1 - diff --git a/package/cppzmq/cppzmq.hash b/package/cppzmq/cppzmq.hash index 54406ad..58b91b5 100644 --- a/package/cppzmq/cppzmq.hash +++ b/package/cppzmq/cppzmq.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 27d1f56406ba94ee779e639203218820975cf68174f92fbeae0f645df0fcada4 cppzmq-4.3.0.tar.gz +sha256 117fc1ca24d98dbe1a60c072cde13be863d429134907797f8e03f654ce679385 cppzmq-4.4.1.tar.gz sha256 7e6db90e2e805c72b3daa77849d1cb5f1f92da0e69750c8a4aa1d86d70704748 LICENSE diff --git a/package/cppzmq/cppzmq.mk b/package/cppzmq/cppzmq.mk index aab6e71..95c0880 100644 --- a/package/cppzmq/cppzmq.mk +++ b/package/cppzmq/cppzmq.mk @@ -4,7 +4,7 @@ # ################################################################################ -CPPZMQ_VERSION = 4.3.0 +CPPZMQ_VERSION = 4.4.1 CPPZMQ_SITE = $(call github,zeromq,cppzmq,v$(CPPZMQ_VERSION)) CPPZMQ_INSTALL_STAGING = YES CPPZMQ_DEPENDENCIES = host-pkgconf zeromq