From patchwork Fri Apr 13 11:57:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Asaf Kahlon X-Patchwork-Id: 897918 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=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="GuSwN5AK"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40MxBS1zr7z9s0t for ; Fri, 13 Apr 2018 21:58:39 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 70D502272F; Fri, 13 Apr 2018 11:58:35 +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 iB8WdnfzI6mV; Fri, 13 Apr 2018 11:58:33 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 3773022615; Fri, 13 Apr 2018 11:58:33 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 6B5411BFFDD for ; Fri, 13 Apr 2018 11:58:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 68C0622615 for ; Fri, 13 Apr 2018 11:58:31 +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 uaY3EFnYH+Gm for ; Fri, 13 Apr 2018 11:58:27 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by silver.osuosl.org (Postfix) with ESMTPS id 5DFDD22237 for ; Fri, 13 Apr 2018 11:58:27 +0000 (UTC) Received: by mail-wm0-f66.google.com with SMTP id 66so4641408wmd.3 for ; Fri, 13 Apr 2018 04:58:27 -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=FA83DEaguprQKbmU2xVEkAYFJ6Q2DGDwHLqTMjMSBV8=; b=GuSwN5AKZn0EI9+SZo3O2HFmfko+aQDd9yqH3EI5fQLFt+omv4SC1sPOlidM1vYh7u BEbme8eDET4L3tSRQDjvDS0Pj/YDH4U+omP3TNQmw45+X8MZYo7/4b+JKfDoV2H4W5aO 89+k4Tv1SQNgU4Y2iej0/A72gL0Rn7rTtkfAv3Vz53RvJWYKCcODj9OdR0AKZMGZ1iFe mxxUNcRb9GgYbxR/MbgsQE4FkVAvsXE6WG0ElZGxnsu8k8/2n7bqofSmco4GOv7a2AUs iqZ1S7cRtOBNlv1Ps7BOUxUaWYFlnXeX2xQpwFSLOGqDdGLP2514vJNtDcHi/CzGZYIE inXw== 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=FA83DEaguprQKbmU2xVEkAYFJ6Q2DGDwHLqTMjMSBV8=; b=kkM2WSEOUbp4EQPDig2MtlJl/GSpkL4vreLSxQU9Qtv6CQZ6A/5ntUTE3hTm7e/ice M/AP+wVEkmluKPICujWpL7/dUfKVP/GiRFSwkawaoXjFzLSuFcy8QS3NvR2/feTY8ukI 8GiJabvRWGE83rJG8iKEKOL6NWJprriA2CFH6qwWGcDYzbgWk2lou2CgznS1sEVF9gtq EsD3E3MaZHpHr3VOxMAFQqF2PkwX7FbHLnvPfbdFzKYKOxTqk/bMYgHN/p18BStJJOl3 dKnfpdjINA+mgjqDHIpTg67TES6pgnKSZWopx8uqTwEAsqnrUhSq6Gl0UcYMfiBtAEaB XH7Q== X-Gm-Message-State: ALQs6tDOu6hRbi8ssnpPIigw5xr/jy3IN32PzlhR+tQzyLqr++yrbo4k B78/VOZmZJSJ0065QVmSQJT5JA== X-Google-Smtp-Source: AIpwx48/ey+M8zVPjGqD1H1drn0orOwCL9IVc8f1ha1qUw7s+BRQ5tfoV17L/XTzaRiBJok2VT1XYw== X-Received: by 10.28.225.11 with SMTP id y11mr3804117wmg.46.1523620705440; Fri, 13 Apr 2018 04:58:25 -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 j126sm1334027wmb.33.2018.04.13.04.58.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Apr 2018 04:58:24 -0700 (PDT) From: Asaf Kahlon To: buildroot@buildroot.org Date: Fri, 13 Apr 2018 14:57:40 +0300 Message-Id: <20180413115740.23425-1-asafka7@gmail.com> X-Mailer: git-send-email 2.17.0 Subject: [Buildroot] [PATCH 1/1] zeromq: patch configure.ac to check for ldaddr on when checking libunwind 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" Fixes: http://autobuild.buildroot.net/results/2b1aaf7e35651f04a9e9d0269e49c1b0bd87ae29/ configure.ac can fail the build when there's no dynamic library support, since it cannot find dladdr which is needed only when we have libunwind. Therefore, configure.ac was patched to check for dladdr only in the libunwind check section. As a consequence of the patch, libunwind was added as an optional dependency, and ZEROMQ_AUTORECONF was set. Signed-off-by: Asaf Kahlon --- DEVELOPERS | 1 + ...-serach-for-dladdr-only-on-libunwind.patch | 44 +++++++++++++++++++ package/zeromq/zeromq.mk | 10 +++++ 3 files changed, 55 insertions(+) create mode 100644 package/zeromq/0001-configure.ac-serach-for-dladdr-only-on-libunwind.patch diff --git a/DEVELOPERS b/DEVELOPERS index 05693d3024..f269b79dd4 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -191,6 +191,7 @@ F: package/stress/ N: Asaf Kahlon F: package/python-jsonmodels/ F: package/python-yieldfrom/ +F: package/zeromq N: Ash Charles F: package/pru-software-support/ 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 new file mode 100644 index 0000000000..36092447ca --- /dev/null +++ b/package/zeromq/0001-configure.ac-serach-for-dladdr-only-on-libunwind.patch @@ -0,0 +1,44 @@ +From 194b3836c87f77aca34581656ff99da49813d8c3 Mon Sep 17 00:00:00 2001 +From: Asaf Kahlon +Date: Fri, 13 Apr 2018 11:56:46 +0300 +Subject: [PATCH 1/1] configure.ac: serach 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 preformed only when checking libunwind. + +Signed-off-by: Asaf Kahlon +--- + 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/zeromq.mk b/package/zeromq/zeromq.mk index debaf413b4..ac9cc4aa80 100644 --- a/package/zeromq/zeromq.mk +++ b/package/zeromq/zeromq.mk @@ -11,6 +11,8 @@ 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. @@ -49,4 +51,12 @@ else ZEROMQ_CONF_OPTS += --without-libsodium endif +# ZeroMQ uses libunwind if it's available +ifeq ($(BR2_PACKAGE_LIBUNWIND), y) +ZEROMQ_DEPENDENCIES += libunwind +ZEROMQ_CONF_OPTS += --enable-libunwind +else +ZEROMQ_CONF_OPTS += --disable-libunwind +endif + $(eval $(autotools-package))