From patchwork Sat Jan 12 19:02:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Asaf Kahlon X-Patchwork-Id: 1023962 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="Yo7I3nJO"; 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 43cTdX2Wqhz9s55 for ; Sun, 13 Jan 2019 06:02:55 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3EE9E85B45; Sat, 12 Jan 2019 19:02:52 +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 YDRQlltaRnXS; Sat, 12 Jan 2019 19:02:48 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0D2298560E; Sat, 12 Jan 2019 19:02:48 +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 1D55C1BF2C5 for ; Sat, 12 Jan 2019 19:02:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id BDB6A864D2 for ; Sat, 12 Jan 2019 19:02:46 +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 GEswwTK+1WmA for ; Sat, 12 Jan 2019 19:02:44 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by whitealder.osuosl.org (Postfix) with ESMTPS id AB59685039 for ; Sat, 12 Jan 2019 19:02:43 +0000 (UTC) Received: by mail-wr1-f47.google.com with SMTP id t6so18553799wrr.12 for ; Sat, 12 Jan 2019 11:02:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=EQGHWN5SWrb1+FWjN3rndwN+eXSY5kd7DQyv2Yy+4cU=; b=Yo7I3nJOq0Pc7aIjfpK0l/79FiHwhUscaoAr5sw6P34DbWHHeJB5dZSsJ01fm2T9VP LVU/Vq/NPoCEKVvo4jNCva1t7B1Tp5WgQxxq6KoSiEUJXgd+43tORFt1Zw5B4f/oxwae oxu8Gw/VkYuhmmThmVKdmle2JjDdo83sT1phIwYahQGGT2iu8Ri5etIGtorkHG7pe4Qo OaOjBaz2kzQkaArTXXMMaSmWvWD6NsloW9fkQOPqHs5ORUl+jtLAZ9xWB0DEby5+V+Xl 9+JaCOAOCcWnpM/2iYh73paGQ1v/fQfDSlQvA9QNrbKY5FBWzhigRfQn1MBUWSwjb0Rl m0jA== 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:mime-version :content-transfer-encoding; bh=EQGHWN5SWrb1+FWjN3rndwN+eXSY5kd7DQyv2Yy+4cU=; b=hewo2HzyOkkxUyIVDF/s+bnZZcK7HD3PUFpR+/yVjQX0zSkVI9c4qB0vYNqj8UUCus fPI9y6eGuMoPlDk0dy8Sm/fudJ62S+Db5rTZrr7qPChd3Wk+rYpSOpzqhxdsOKCCAe1V t2sJG4bWVKrI7ovDbJG1ki/bxZo2wVprqljdnfm1nW1tZSDBqqz6cvpDUZZ7RMShXAe7 m/Mji0toSRTGF6cv/uuQdLkxGuXn2z3nmddr1At6XN8gLKG8KQqdMQYjskhsVKxMpOlS 0y0J4sfgNlELZCzNVQs3DS57fonlrQ3wbPGl7G3FGyyNv44bqX3wfaq10CXgTj4c66Qd L9vQ== X-Gm-Message-State: AJcUukd74ofVZvn09ajr1deNGK7NiTiWnltufGDfNj8uNPpv8pi3sPUB HR1mggRD/fHvWzG0VwnFwEqp/L0J X-Google-Smtp-Source: ALg8bN4Gg9xxXZDodPaen73WYYRe1hz+La0t66ocm1SaNc5bGW9qYqWyHo5GXtViSUuF1xfcbMYy4w== X-Received: by 2002:adf:8b83:: with SMTP id o3mr18975512wra.81.1547319761684; Sat, 12 Jan 2019 11:02:41 -0800 (PST) Received: from localhost.localdomain (bzq-84-108-5-46.cablep.bezeqint.net. [84.108.5.46]) by smtp.gmail.com with ESMTPSA id q9sm90758474wrp.0.2019.01.12.11.02.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 12 Jan 2019 11:02:40 -0800 (PST) From: Asaf Kahlon To: buildroot@buildroot.org Date: Sat, 12 Jan 2019 21:02:30 +0200 Message-Id: <20190112190230.13556-1-asafka7@gmail.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] zeromq: bump to version 4.3.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: Asaf Kahlon Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Remove the patches as they're already on upstream. As a consequence, no need to autoreconf anymore. Also added license hashes. Signed-off-by: Asaf Kahlon --- ...-serach-for-dladdr-only-on-libunwind.patch | 45 ------------ ...nclude.m4-check-if-latomic-is-needed.patch | 71 ------------------- package/zeromq/zeromq.hash | 8 ++- package/zeromq/zeromq.mk | 4 +- 4 files changed, 6 insertions(+), 122 deletions(-) delete mode 100644 package/zeromq/0001-configure.ac-serach-for-dladdr-only-on-libunwind.patch delete mode 100644 package/zeromq/0002-acinclude.m4-check-if-latomic-is-needed.patch diff --git a/package/zeromq/0001-configure.ac-serach-for-dladdr-only-on-libunwind.patch b/package/zeromq/0001-configure.ac-serach-for-dladdr-only-on-libunwind.patch deleted file mode 100644 index 1037a67fe2..0000000000 --- a/package/zeromq/0001-configure.ac-serach-for-dladdr-only-on-libunwind.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 194b3836c87f77aca34581656ff99da49813d8c3 Mon Sep 17 00:00:00 2001 -From: Asaf Kahlon -Date: Fri, 13 Apr 2018 11:56:46 +0300 -Subject: [PATCH] configure.ac: search for dladdr only on libunwind - -The original configure.ac tries to check for dladdr, but it actually needs -it only in case we have libunwind (which has a another section and checks for it -too). -This can fail the build on systems without dynamic linking support. -Therefore, the dladdr check has to be performed only when checking libunwind. - -Signed-off-by: Asaf Kahlon -Upstream-status: https://github.com/zeromq/libzmq/commit/c971445025535b9f989ab0b78f5ddd1c026f1878 ---- - configure.ac | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 216b2bc4..0858a6c1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -174,11 +174,6 @@ case "${host_os}" in - AC_DEFINE(ZMQ_HAVE_LINUX, 1, [Have Linux OS]) - libzmq_on_linux="yes" - -- # dladdr/dlopen is in libdl on glibc -- AC_SEARCH_LIBS([dladdr], [dl dld], [], [ -- AC_MSG_ERROR([unable to find the dladdr() function]) -- ]) -- - if test "x$libzmq_tipc_support" = "xyes"; then - AC_DEFINE(ZMQ_HAVE_TIPC, 1, [Have TIPC support]) - fi -@@ -783,7 +778,7 @@ if test "x$enable_libunwind" != "xno"; then - AC_DEFINE(HAVE_LIBUNWIND, 1, [The libunwind library is to be used]) - AC_SUBST([LIBUNWIND_CFLAGS]) - AC_SUBST([LIBUNWIND_LIBS]) -- AC_CHECK_LIB([dl], [dladdr]) -+ AC_SEARCH_LIBS([dladdr], [dl dld]) - ], - [ - if test "x$enable_libunwind" = "xyes"; then --- -2.17.0 - diff --git a/package/zeromq/0002-acinclude.m4-check-if-latomic-is-needed.patch b/package/zeromq/0002-acinclude.m4-check-if-latomic-is-needed.patch deleted file mode 100644 index 233b364662..0000000000 --- a/package/zeromq/0002-acinclude.m4-check-if-latomic-is-needed.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 9f4ca582555b208d065f730b5ce3b1901136b275 Mon Sep 17 00:00:00 2001 -From: Asaf Kahlon -Date: Mon, 7 May 2018 23:19:09 +0300 -Subject: [PATCH] acinclude.m4: check if -latomic is needed - -On some cases, -latomic is needed for linking, and since the current -acinclude.m4 checks only compilation we can sometimes miss the need for -latomic -and the linking process will fail. -Therefore, the AC_CHECK_IFELSE was replaced with AC_LINK_IFELSE. If the first -try fails, we try to link again with -latomic and add LIBS="-latomic" in case we -succeeded. - -Signed-off-by: Asaf Kahlon -Signed-off-by: Fabrice Fontaine -[Update to use LIBS: https://github.com/zeromq/libzmq/pull/3250] ---- - acinclude.m4 | 31 +++++++++++++++++++++++++++---- - 1 file changed, 27 insertions(+), 4 deletions(-) - -diff --git a/acinclude.m4 b/acinclude.m4 -index f648ed0f..aa35195f 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -668,7 +668,7 @@ dnl # Check if compiler supoorts __atomic_Xxx intrinsics - dnl ################################################################################ - AC_DEFUN([LIBZMQ_CHECK_ATOMIC_INTRINSICS], [{ - AC_MSG_CHECKING(whether compiler supports __atomic_Xxx intrinsics) -- AC_COMPILE_IFELSE([AC_LANG_SOURCE([ -+ AC_LINK_IFELSE([AC_LANG_SOURCE([ - /* atomic intrinsics test */ - int v = 0; - int main (int, char **) -@@ -677,9 +677,32 @@ int main (int, char **) - return t; - } - ])], -- [AC_MSG_RESULT(yes) ; libzmq_cv_has_atomic_instrisics="yes" ; $1], -- [AC_MSG_RESULT(no) ; libzmq_cv_has_atomic_instrisics="no" ; $2] -- ) -+ [libzmq_cv_has_atomic_instrisics="yes"], -+ [libzmq_cv_has_atomic_instrisics="no"]) -+ -+ if test "x$libzmq_cv_has_atomic_instrisics" = "xno"; then -+ save_LIBS=$LIBS -+ LIBS="$LIBS -latomic" -+ AC_LINK_IFELSE([AC_LANG_SOURCE([ -+ /* atomic intrinsics test */ -+ int v = 0; -+ int main (int, char **) -+ { -+ int t = __atomic_add_fetch (&v, 1, __ATOMIC_ACQ_REL); -+ return t; -+ } -+ ])], -+ [libzmq_cv_has_atomic_instrisics="yes"], -+ [libzmq_cv_has_atomic_instrisics="no" LIBS=$save_LIBS]) -+ fi -+ -+ if test "x$libzmq_cv_has_atomic_instrisics" = "xyes"; then -+ AC_MSG_RESULT(yes) -+ $1 -+ else -+ AC_MSG_RESULT(no) -+ $2 -+ fi - }]) - - dnl ################################################################################ --- -2.17.0 - diff --git a/package/zeromq/zeromq.hash b/package/zeromq/zeromq.hash index 86380c0295..5af6a3ff8d 100644 --- a/package/zeromq/zeromq.hash +++ b/package/zeromq/zeromq.hash @@ -1,5 +1,7 @@ # From https://github.com/zeromq/libzmq/releases -md5 a1c95b34384257e986842f4d006957b8 zeromq-4.2.5.tar.gz -sha1 1132f839d703486c4ee1cf22f056585dfbb329c2 zeromq-4.2.5.tar.gz +md5 64cbf3577afdbfda30358bc757a6ac83 zeromq-4.3.1.tar.gz +sha1 6cce22d830eaf95feff7cab00744df13ad7ab7f3 zeromq-4.3.1.tar.gz # Locally computed -sha256 cc9090ba35713d59bb2f7d7965f877036c49c5558ea0c290b0dcc6f2a17e489f zeromq-4.2.5.tar.gz +sha256 bcbabe1e2c7d0eec4ed612e10b94b112dd5f06fcefa994a0c79a45d835cd21eb zeromq-4.3.1.tar.gz +sha256 4fd86507c9b486764343065a9e035222869a27b5789efeb4fd93edc85412d7a3 COPYING +sha256 83f32abe61ee58ffb1b007412c08415168c052501dbf56d7a47aaaac52b03ef6 COPYING.LESSER diff --git a/package/zeromq/zeromq.mk b/package/zeromq/zeromq.mk index 4b25c7d678..da57f8745c 100644 --- a/package/zeromq/zeromq.mk +++ b/package/zeromq/zeromq.mk @@ -4,15 +4,13 @@ # ################################################################################ -ZEROMQ_VERSION = 4.2.5 +ZEROMQ_VERSION = 4.3.1 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 -# 0001-configure.ac-serach-for-dladdr-only-on-libunwind.patch touches configure.ac -ZEROMQ_AUTORECONF = YES # Assume these flags are always available. It is true, at least for # SOCK_CLOEXEC, since linux v2.6.27.