From patchwork Sun Apr 15 18:15:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Asaf Kahlon X-Patchwork-Id: 898298 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="LvIw1L+P"; 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 40PKTv5J0Qz9rvt for ; Mon, 16 Apr 2018 04:16:50 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id C01DF22839; Sun, 15 Apr 2018 18:16:46 +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 xXdhSaY9k8+t; Sun, 15 Apr 2018 18:16:42 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 7FEA922172; Sun, 15 Apr 2018 18:16:42 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 300C51C3F99 for ; Sun, 15 Apr 2018 18:16:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 2BB238761F for ; Sun, 15 Apr 2018 18:16:42 +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 spnswoCmOGmO for ; Sun, 15 Apr 2018 18:16:39 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 7588987617 for ; Sun, 15 Apr 2018 18:16:39 +0000 (UTC) Received: by mail-wr0-f195.google.com with SMTP id u11so20014046wri.12 for ; Sun, 15 Apr 2018 11:16:39 -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=ZYCQPAcifXr7aAs2QaXCqeiVQFbgDc/rBNl57ZkC9Cg=; b=LvIw1L+PDEKFMIgKAujQCl5Mz58GK4osjWPsEORc+Kw5SmIRPT0+ZlWLF/R+JNA01o FkjGjTJ82ki1w3VZKCpA0dHUPlZUcZeGZKuYi1fhPATdlkARH7zLg1H8ODPTIHUF+mi2 ibNPzvQuc+VFx/04LFDLpwtr6ltYHSMH4LdhKO3PiRMG9VCj6KS47eEWYcOBUfRX/2AJ tzPkbcPv/NTKi1UQ3tEDpXz5gI0LigVTW7frL8bLh8G5pD+kYBVaA+wPwZcg3b6bYhtK 2SbUV8Wa3og6w1ym0fVSsNy4edvdOurUuBoZT0bCmyl21sUCV/kupXLoZU7pXKmtut+m XzQQ== 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=ZYCQPAcifXr7aAs2QaXCqeiVQFbgDc/rBNl57ZkC9Cg=; b=N9OVNqJJ1SWHjNez5w5XW9hSUcZwJiZ0VUUcOh4dN2N4d1DxXnb1uzmN8Y/qbor7gU x7fRjR8B8q8SBf+qBby5PnZprbVd36XDKusyQVJ4Q1/fwIpMP18AglTR8z7zOnjvb7vA RhvgEofDTJMkk1veO0KayP/48LpHBw1WWwtSM6DyBV8BJ5gY9PtC+bd+sBCZP943DQhp 2owIOnU34ibw1wp5r9slN6mKcbz/w69i21pCXeETuZULn7JVzVbQD3FbQ8UfAxTNYded r493MiJKQQ2qG/eAaegWH6YcJYP88vJnxTUDO2P2uczP6PFxyk9giOuUrmvF/w9LOcS0 vTkQ== X-Gm-Message-State: ALQs6tDNe8iEGq54rg/wwM1vEO6nrPmrxr9XJ4r8Xbiil5w5teDpEuXx i9uyWJs/SLGMTV41A69RnnfgWw== X-Google-Smtp-Source: AIpwx4/goC+thUn1PCW5saNB/uKfLYpNMwz8dqvXiN7y8OrT9CaVSul0r6KK5ZRzw9yNHcKrnf+LNw== X-Received: by 10.223.219.10 with SMTP id s10mr8278169wri.241.1523816197736; Sun, 15 Apr 2018 11:16:37 -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 t6sm1211599wre.32.2018.04.15.11.16.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 15 Apr 2018 11:16:37 -0700 (PDT) From: Asaf Kahlon To: buildroot@buildroot.org Date: Sun, 15 Apr 2018 21:15:55 +0300 Message-Id: <20180415181555.20945-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, ZEROMQ_AUTORECONF was set. The patch was applied to the zeromq master branch, see: https://github.com/zeromq/libzmq/commit/c971445025535b9f989ab0b78f5ddd1c026f1878 Signed-off-by: Asaf Kahlon --- DEVELOPERS | 1 + ...-serach-for-dladdr-only-on-libunwind.patch | 44 +++++++++++++++++++ package/zeromq/zeromq.mk | 2 + 3 files changed, 47 insertions(+) create mode 100644 package/zeromq/0001-configure.ac-serach-for-dladdr-only-on-libunwind.patch diff --git a/DEVELOPERS b/DEVELOPERS index 05693d3024..aa70ba5264 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..2682a567de 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.