From patchwork Sat Apr 7 07:29:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Asaf Kahlon X-Patchwork-Id: 895893 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.138; helo=whitealder.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="NE5xkvtH"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40J7WT23nmz9s2M for ; Sat, 7 Apr 2018 17:30:13 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 75DDD88E93; Sat, 7 Apr 2018 07:30:10 +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 5xWIMejWwwKW; Sat, 7 Apr 2018 07:30:08 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 0D83A88E22; Sat, 7 Apr 2018 07:30:08 +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 5BE351BF9EA for ; Sat, 7 Apr 2018 07:30:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 5875E88E22 for ; Sat, 7 Apr 2018 07:30:07 +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 LyXkrUxZVsjV for ; Sat, 7 Apr 2018 07:30:06 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lf0-f49.google.com (mail-lf0-f49.google.com [209.85.215.49]) by whitealder.osuosl.org (Postfix) with ESMTPS id AF31588E09 for ; Sat, 7 Apr 2018 07:30:05 +0000 (UTC) Received: by mail-lf0-f49.google.com with SMTP id c78-v6so3436853lfh.1 for ; Sat, 07 Apr 2018 00:30:05 -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=0WFhTT7XH8A6nZN1h2WRGC5HIDzFcy3ChTXTo9aocmQ=; b=NE5xkvtHFDfoe5wZmy0YRhNZ8qvgI/EaNswUHiUdSqpo7xrIe70HvcLuOb2R6LB9hh y+sjK4letK5YO+b/DmHOGxPKlS5EscSyinrGcyNHxeSGAeUkF0/lpmq1ksaPYMXuZ26G HweqNPJrK64hBlWnS+/wNt6aEsBGwwsKBtFxvi94R7LN2p80nBC+27e1BF/dFI/zTb0R LFj5IUA27PR1/8PmSwXKdz4bdAdpEhA1bLwvIhbAkw3BIV3oMf00EXSdzPHWOdDNYrJs +tf3xVVVwOcu0FA/zMNxHMhCVCslXwSgxg3KQmFjJoLjNC7yNjK3E3rwYtx8Ii1rnE3F cmlw== 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=0WFhTT7XH8A6nZN1h2WRGC5HIDzFcy3ChTXTo9aocmQ=; b=eiBXurnJ/4TJJs/eLaI4YE9ZGsnnHjvKRvFlbclxDz6h4bRPEZpfVFVKtBgSz1zsvV 2/Dp7n2LZPdTNlauS1ySsW2ybtsh71mMWIdo0TLXYHdu5DZYeIaXStETEIcE3iO3hKz5 VAtrFdHvY/gaoKocQJ335jKssGE5Aw7WnA1FfNL2O1ilfUMJXVR/8LJD9fcw9qQ7vYAc tC+1jN7zBK70rlQW69gAfcivAWcBjKuPJwgoL1ABGCbTL2iKa5Vci/AaCSZVuSMWF9rR HczDAkl9NiS9kRgkYSa4klXz3YYtNDbSeZ2Ybl5z8xZQ46dJoiqbWMX+Y0g3YhfxYWbF SaDw== X-Gm-Message-State: AElRT7EvEfy6n561UrdzOt/tAZBsKC8eRqFdNFyhcnDwZHDG5yVVAQRZ t5q351VVgt65NNl8Cch1wl7sHQ== X-Google-Smtp-Source: AIpwx4+rm1Tr0k4FqzZZzicnGJ/erFmmQs7w0WYwJYvuIis6wAl+5W7ans/9glimLxDY8THngOJzig== X-Received: by 10.46.137.13 with SMTP id d13mr18524430lji.27.1523086202882; Sat, 07 Apr 2018 00:30:02 -0700 (PDT) Received: from localhost.localdomain (bzq-84-108-5-46.cablep.bezeqint.net. [84.108.5.46]) by smtp.gmail.com with ESMTPSA id l25sm2013399lja.25.2018.04.07.00.30.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 07 Apr 2018 00:30:01 -0700 (PDT) From: Asaf Kahlon To: buildroot@buildroot.org Date: Sat, 7 Apr 2018 10:29:09 +0300 Message-Id: <20180407072909.25962-1-asafka7@gmail.com> X-Mailer: git-send-email 2.16.2 Subject: [Buildroot] [PATCH 1/1] zeromq: bump to version 4.2.5 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: Asaf Kahlon MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Update the ZEROMQ_SITE with the active repository. Remove the two patches because they were both applied on zeromq. As a result, the ZEROMQ_AUTORECONF was removed. Signed-off-by: Asaf Kahlon --- ...e.m4-make-kernel-specific-flags-cacheable.patch | 199 --------------------- ...q-Fix-pkg-config-files-for-static-linking.patch | 29 --- package/zeromq/zeromq.hash | 9 +- package/zeromq/zeromq.mk | 6 +- 4 files changed, 7 insertions(+), 236 deletions(-) delete mode 100644 package/zeromq/0001-acinclude.m4-make-kernel-specific-flags-cacheable.patch delete mode 100644 package/zeromq/0002-libzmq-Fix-pkg-config-files-for-static-linking.patch diff --git a/package/zeromq/0001-acinclude.m4-make-kernel-specific-flags-cacheable.patch b/package/zeromq/0001-acinclude.m4-make-kernel-specific-flags-cacheable.patch deleted file mode 100644 index ff225d3592..0000000000 --- a/package/zeromq/0001-acinclude.m4-make-kernel-specific-flags-cacheable.patch +++ /dev/null @@ -1,199 +0,0 @@ -commit 9daf6dd7c4947ce74ca729de5c3cfe8cbc304702 -Author: Lionel Orry -Date: Fri Feb 6 15:11:07 2015 +0100 - - acinclude.m4: make kernel-specific flags cacheable - - Specifically when cross-compiling, one can be willing to force these - variable values using the environment of a config.cache file. This - commit makes this possible. - - The affected variables are: - - * libzmq_cv_sock_cloexec - * libzmq_cv_so_keepalive - * libzmq_cv_tcp_keepcnt - * libzmq_cv_tcp_keepidle - * libzmq_cv_tcp_keepintvl - * libzmq_cv_tcp_keepalive - - Signed-off-by: Lionel Orry - -diff --git a/acinclude.m4 b/acinclude.m4 -index 4bbd19e..456740d 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -586,8 +586,8 @@ dnl # LIBZMQ_CHECK_SOCK_CLOEXEC([action-if-found], [action-if-not-found]) - dnl # Check if SOCK_CLOEXEC is supported # - dnl ################################################################################ - AC_DEFUN([LIBZMQ_CHECK_SOCK_CLOEXEC], [{ -- AC_MSG_CHECKING(whether SOCK_CLOEXEC is supported) -- AC_TRY_RUN([/* SOCK_CLOEXEC test */ -+ AC_CACHE_CHECK([whether SOCK_CLOEXEC is supported], [libzmq_cv_sock_cloexec], -+ [AC_TRY_RUN([/* SOCK_CLOEXEC test */ - #include - #include - -@@ -596,11 +596,13 @@ int main (int argc, char *argv []) - int s = socket (PF_INET, SOCK_STREAM | SOCK_CLOEXEC, 0); - return (s == -1); - } -- ], -- [AC_MSG_RESULT(yes) ; libzmq_cv_sock_cloexec="yes" ; $1], -- [AC_MSG_RESULT(no) ; libzmq_cv_sock_cloexec="no" ; $2], -- [AC_MSG_RESULT(not during cross-compile) ; libzmq_cv_sock_cloexec="no"] -+ ], -+ [libzmq_cv_sock_cloexec="yes"], -+ [libzmq_cv_sock_cloexec="no"], -+ [libzmq_cv_sock_cloexec="not during cross-compile"] -+ )] - ) -+ AS_IF([test "x$libzmq_cv_sock_cloexec" = "xyes"], [$1], [$2]) - }]) - - dnl ################################################################################ -@@ -628,8 +630,8 @@ dnl # LIBZMQ_CHECK_SO_KEEPALIVE([action-if-found], [action-if-not-found]) - dnl # Check if SO_KEEPALIVE is supported # - dnl ################################################################################ - AC_DEFUN([LIBZMQ_CHECK_SO_KEEPALIVE], [{ -- AC_MSG_CHECKING(whether SO_KEEPALIVE is supported) -- AC_TRY_RUN([/* SO_KEEPALIVE test */ -+ AC_CACHE_CHECK([whether SO_KEEPALIVE is supported], [libzmq_cv_so_keepalive], -+ [AC_TRY_RUN([/* SO_KEEPALIVE test */ - #include - #include - -@@ -641,11 +643,13 @@ int main (int argc, char *argv []) - ((rc = setsockopt (s, SOL_SOCKET, SO_KEEPALIVE, (char*) &opt, sizeof (int))) == -1) - ); - } -- ], -- [AC_MSG_RESULT(yes) ; libzmq_cv_so_keepalive="yes" ; $1], -- [AC_MSG_RESULT(no) ; libzmq_cv_so_keepalive="no" ; $2], -- [AC_MSG_RESULT(not during cross-compile) ; libzmq_cv_so_keepalive="no"] -+ ], -+ [libzmq_cv_so_keepalive="yes"], -+ [libzmq_cv_so_keepalive="no"], -+ [libzmq_cv_so_keepalive="not during cross-compile"] -+ )] - ) -+ AS_IF([test "x$libzmq_cv_so_keepalive" = "xyes"], [$1], [$2]) - }]) - - dnl ################################################################################ -@@ -653,8 +657,8 @@ dnl # LIBZMQ_CHECK_TCP_KEEPCNT([action-if-found], [action-if-not-found]) - dnl # Check if TCP_KEEPCNT is supported # - dnl ################################################################################ - AC_DEFUN([LIBZMQ_CHECK_TCP_KEEPCNT], [{ -- AC_MSG_CHECKING(whether TCP_KEEPCNT is supported) -- AC_TRY_RUN([/* TCP_KEEPCNT test */ -+ AC_CACHE_CHECK([whether TCP_KEEPCNT is supported], [libzmq_cv_tcp_keepcnt], -+ [AC_TRY_RUN([/* TCP_KEEPCNT test */ - #include - #include - #include -@@ -669,11 +673,13 @@ int main (int argc, char *argv []) - ((rc = setsockopt (s, IPPROTO_TCP, TCP_KEEPCNT, (char*) &opt, sizeof (int))) == -1) - ); - } -- ], -- [AC_MSG_RESULT(yes) ; libzmq_cv_tcp_keepcnt="yes" ; $1], -- [AC_MSG_RESULT(no) ; libzmq_cv_tcp_keepcnt="no" ; $2], -- [AC_MSG_RESULT(not during cross-compile) ; libzmq_cv_tcp_keepcnt="no"] -+ ], -+ [libzmq_cv_tcp_keepcnt="yes"], -+ [libzmq_cv_tcp_keepcnt="no"], -+ [libzmq_cv_tcp_keepcnt="not during cross-compile"] -+ )] - ) -+ AS_IF([test "x$libzmq_cv_tcp_keepcnt" = "xyes"], [$1], [$2]) - }]) - - dnl ################################################################################ -@@ -681,8 +687,8 @@ dnl # LIBZMQ_CHECK_TCP_KEEPIDLE([action-if-found], [action-if-not-found]) - dnl # Check if TCP_KEEPIDLE is supported # - dnl ################################################################################ - AC_DEFUN([LIBZMQ_CHECK_TCP_KEEPIDLE], [{ -- AC_MSG_CHECKING(whether TCP_KEEPIDLE is supported) -- AC_TRY_RUN([/* TCP_KEEPIDLE test */ -+ AC_CACHE_CHECK([whether TCP_KEEPIDLE is supported], [libzmq_cv_tcp_keepidle], -+ [AC_TRY_RUN([/* TCP_KEEPIDLE test */ - #include - #include - #include -@@ -697,11 +703,13 @@ int main (int argc, char *argv []) - ((rc = setsockopt (s, IPPROTO_TCP, TCP_KEEPIDLE, (char*) &opt, sizeof (int))) == -1) - ); - } -- ], -- [AC_MSG_RESULT(yes) ; libzmq_cv_tcp_keepidle="yes" ; $1], -- [AC_MSG_RESULT(no) ; libzmq_cv_tcp_keepidle="no" ; $2], -- [AC_MSG_RESULT(not during cross-compile) ; libzmq_cv_tcp_keepidle="no"] -+ ], -+ [libzmq_cv_tcp_keepidle="yes"], -+ [libzmq_cv_tcp_keepidle="no"], -+ [libzmq_cv_tcp_keepidle="not during cross-compile"] -+ )] - ) -+ AS_IF([test "x$libzmq_cv_tcp_keepidle" = "xyes"], [$1], [$2]) - }]) - - dnl ################################################################################ -@@ -709,8 +717,8 @@ dnl # LIBZMQ_CHECK_TCP_KEEPINTVL([action-if-found], [action-if-not-found]) - dnl # Check if TCP_KEEPINTVL is supported # - dnl ################################################################################ - AC_DEFUN([LIBZMQ_CHECK_TCP_KEEPINTVL], [{ -- AC_MSG_CHECKING(whether TCP_KEEPINTVL is supported) -- AC_TRY_RUN([/* TCP_KEEPINTVL test */ -+ AC_CACHE_CHECK([whether TCP_KEEPINTVL is supported], [libzmq_cv_tcp_keepintvl], -+ [AC_TRY_RUN([/* TCP_KEEPINTVL test */ - #include - #include - #include -@@ -725,11 +733,13 @@ int main (int argc, char *argv []) - ((rc = setsockopt (s, IPPROTO_TCP, TCP_KEEPINTVL, (char*) &opt, sizeof (int))) == -1) - ); - } -- ], -- [AC_MSG_RESULT(yes) ; libzmq_cv_tcp_keepintvl="yes" ; $1], -- [AC_MSG_RESULT(no) ; libzmq_cv_tcp_keepintvl="no" ; $2], -- [AC_MSG_RESULT(not during cross-compile) ; libzmq_cv_tcp_keepintvl="no"] -+ ], -+ [libzmq_cv_tcp_keepintvl="yes"], -+ [libzmq_cv_tcp_keepintvl="no"], -+ [libzmq_cv_tcp_keepintvl="not during cross-compile"] -+ )] - ) -+ AS_IF([test "x$libzmq_cv_tcp_keepintvl" = "xyes"], [$1], [$2]) - }]) - - dnl ################################################################################ -@@ -737,8 +747,8 @@ dnl # LIBZMQ_CHECK_TCP_KEEPALIVE([action-if-found], [action-if-not-found]) - dnl # Check if TCP_KEEPALIVE is supported # - dnl ################################################################################ - AC_DEFUN([LIBZMQ_CHECK_TCP_KEEPALIVE], [{ -- AC_MSG_CHECKING(whether TCP_KEEPALIVE is supported) -- AC_TRY_RUN([/* TCP_KEEPALIVE test */ -+ AC_CACHE_CHECK([whether TCP_KEEPALIVE is supported], [libzmq_cv_tcp_keepalive], -+ [AC_TRY_RUN([/* TCP_KEEPALIVE test */ - #include - #include - #include -@@ -753,11 +763,13 @@ int main (int argc, char *argv []) - ((rc = setsockopt (s, IPPROTO_TCP, TCP_KEEPALIVE, (char*) &opt, sizeof (int))) == -1) - ); - } -- ], -- [AC_MSG_RESULT(yes) ; libzmq_cv_tcp_keepalive="yes" ; $1], -- [AC_MSG_RESULT(no) ; libzmq_cv_tcp_keepalive="no" ; $2], -- [AC_MSG_RESULT(not during cross-compile) ; libzmq_cv_tcp_keepalive="no"] -+ ], -+ [libzmq_cv_tcp_keepalive="yes"], -+ [libzmq_cv_tcp_keepalive="no"], -+ [libzmq_cv_tcp_keepalive="not during cross-compile"] -+ )] - ) -+ AS_IF([test "x$libzmq_cv_tcp_keepalive" = "xyes"], [$1], [$2]) - }]) - - dnl ################################################################################ diff --git a/package/zeromq/0002-libzmq-Fix-pkg-config-files-for-static-linking.patch b/package/zeromq/0002-libzmq-Fix-pkg-config-files-for-static-linking.patch deleted file mode 100644 index 11acec26ae..0000000000 --- a/package/zeromq/0002-libzmq-Fix-pkg-config-files-for-static-linking.patch +++ /dev/null @@ -1,29 +0,0 @@ -From e89577d30c278fba0f9e40266ceb6fb2821907d5 Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Wed, 13 May 2015 08:01:34 +0200 -Subject: [PATCH] libzmq: Fix pkg-config files for static linking - -Libzmq uses C++ standard library features, so users of it should link -against that as well when statically linking. - -Add it to Libs.private so users using pkg-config automatically gets the -correct linker flags. - -Signed-off-by: Peter Korsgaard ---- - src/libzmq.pc.in | 1 + - 1 file changed, 1 insertions(+) - -diff --git a/src/libzmq.pc.in b/src/libzmq.pc.in -index ba155a3..52a39f7 100644 ---- a/src/libzmq.pc.in -+++ b/src/libzmq.pc.in -@@ -7,4 +7,5 @@ Name: libzmq - Description: 0MQ c++ library - Version: @VERSION@ - Libs: -L${libdir} -lzmq -+Libs.private: -lstdc++ - Cflags: -I${includedir} --- -2.1.4 - diff --git a/package/zeromq/zeromq.hash b/package/zeromq/zeromq.hash index 486656e429..86380c0295 100644 --- a/package/zeromq/zeromq.hash +++ b/package/zeromq/zeromq.hash @@ -1,4 +1,5 @@ -# From https://github.com/zeromq/zeromq4-1/releases -sha1 b956df8c6f77c174683b51fbee67f99c94945651 zeromq-4.1.6.tar.gz -# Calculated based on the hash above -sha256 02ebf60a43011e770799336365bcbce2eb85569e9b5f52aa0d8cc04672438a0a zeromq-4.1.6.tar.gz +# From https://github.com/zeromq/libzmq/releases +md5 a1c95b34384257e986842f4d006957b8 zeromq-4.2.5.tar.gz +sha1 1132f839d703486c4ee1cf22f056585dfbb329c2 zeromq-4.2.5.tar.gz +# Locally computed +sha256 cc9090ba35713d59bb2f7d7965f877036c49c5558ea0c290b0dcc6f2a17e489f zeromq-4.2.5.tar.gz diff --git a/package/zeromq/zeromq.mk b/package/zeromq/zeromq.mk index caf5643718..debaf413b4 100644 --- a/package/zeromq/zeromq.mk +++ b/package/zeromq/zeromq.mk @@ -4,15 +4,13 @@ # ################################################################################ -ZEROMQ_VERSION = 4.1.6 -ZEROMQ_SITE = https://github.com/zeromq/zeromq4-1/releases/download/v$(ZEROMQ_VERSION) +ZEROMQ_VERSION = 4.2.5 +ZEROMQ_SITE = https://github.com/zeromq/libzmq/releases/download/v$(ZEROMQ_VERSION) ZEROMQ_INSTALL_STAGING = YES ZEROMQ_DEPENDENCIES = util-linux ZEROMQ_CONF_OPTS = --without-documentation ZEROMQ_LICENSE = LGPL-3.0+ with exceptions ZEROMQ_LICENSE_FILES = COPYING COPYING.LESSER -# For 0001-acinclude.m4-make-kernel-specific-flags-cacheable.patch -ZEROMQ_AUTORECONF = YES # Assume these flags are always available. It is true, at least for # SOCK_CLOEXEC, since linux v2.6.27.