From patchwork Mon May 7 19:51:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Asaf Kahlon X-Patchwork-Id: 909901 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.133; helo=hemlock.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="ZA9sTRHG"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40ftY82DMtz9ry1 for ; Tue, 8 May 2018 05:51:40 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id BFD94828B5; Mon, 7 May 2018 19:51:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id I9+AoY3DT0fV; Mon, 7 May 2018 19:51:37 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 29F4B82B72; Mon, 7 May 2018 19:51:37 +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 4EEA41CF09A for ; Mon, 7 May 2018 19:51:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 4B56A220A9 for ; Mon, 7 May 2018 19:51:36 +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 LW3AE6Th0DBb for ; Mon, 7 May 2018 19:51:35 +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 silver.osuosl.org (Postfix) with ESMTPS id 7358C22091 for ; Mon, 7 May 2018 19:51:35 +0000 (UTC) Received: by mail-wr0-f195.google.com with SMTP id p5-v6so29917905wre.12 for ; Mon, 07 May 2018 12:51:35 -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=E3Xyw27b7jtCCtUAHnffZs5bLvQzXoksTht/1Ixp6DE=; b=ZA9sTRHGzKlMJFvQmuwFEqEjd6ntdVctcEuYvmNUkA/M7i/m9itCpztObGbJeZh7KS LUuG6/UQtsNMadXmWGrOdss+29N8AbnI40yXgzNA6LExN+DDHqh5k2jvqHrzOKsFHWJb Jl+kWXbo+hSogo+jiXR0yVuJG2MJIOxAkP5hXkY73iYKbSeP6dULQlWLfEk9lGoJLBgJ EjLrO8huddQ9R68l/lRIExXiGCajFGm9j5u4+Senl6DAsGGtfGy6KOZtZ1P3Uwh61qKb 3Ry6K86PvphLZE4R5VtXe+6vwgH3K4TLTSIjYH1ixQ5FqeGesaE/uuAkyMdkeaNsYy34 YZxA== 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=E3Xyw27b7jtCCtUAHnffZs5bLvQzXoksTht/1Ixp6DE=; b=Um4nXu48O3BiyuXJiwDSmYLZP9zlyVj3IMmZ2B9E7qqEICE8way50MOpPWthJL/whz IgtK3kcK4Lo/kMX1mhHE/7ko33rcI00Lygp6dgq8jvtsOV7SterlBcHm27MGvajP1Mr/ yPpzBamDjRm92NwKrYYCqW/q3WOw1F/8Kjnl9gHuGwQySpYqxmSpibmD2HDRCW1Ueq9o 6ChyEZOfz/M5IMTCeUtjVLWQNihOifxMM/JhDX3pHdm7QG1/2PmMcGR2fKWICttsw0sJ xbb0f2iImVQDXbq/qK/Q7C+0KJ7J17PQUVwdve2BVyyWOidZ+f5jNoH8snkf3f72oeUI 3Lig== X-Gm-Message-State: ALQs6tBHH33qV2d1xbY1tOBNtKkcb4kMFXUu3yROKHYK3490PpIwtuIG SQ0TWjVDXrUrRIHx0Q+oRbf7zA== X-Google-Smtp-Source: AB8JxZoTh+LVmYYlgEEE5GsrEo1wcPpNWoVW40Devcag2cr6RMU1CU60U14UVXpoIGyyt0idgLP4dA== X-Received: by 2002:adf:8e44:: with SMTP id n62-v6mr30832693wrb.159.1525722693755; Mon, 07 May 2018 12:51:33 -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 q194-v6sm11507223wmd.26.2018.05.07.12.51.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 07 May 2018 12:51:32 -0700 (PDT) From: Asaf Kahlon To: buildroot@buildroot.org Date: Mon, 7 May 2018 22:51:14 +0300 Message-Id: <20180507195114.16417-1-asafka7@gmail.com> X-Mailer: git-send-email 2.17.0 Subject: [Buildroot] [PATCH 1/1] zeromq: check if -latomic is needed. 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/b149aa2ee00e4d6a53c884cf99ecb2dd8af58b65/ http://autobuild.buildroot.net/results/e4b3616ac2695d3b6898185a70da6509b1faa2b8/ Patch the package to check if -latomic is needed to be added, depending on the result of AC_LINK_IFELSE. The patch was sent to upstream, see: https://github.com/zeromq/libzmq/pull/3083 Signed-off-by: Asaf Kahlon --- ...nclude.m4-check-if-latomic-is-needed.patch | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 package/zeromq/0002-acinclude.m4-check-if-latomic-is-needed.patch 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 new file mode 100644 index 0000000000..3fe290474c --- /dev/null +++ b/package/zeromq/0002-acinclude.m4-check-if-latomic-is-needed.patch @@ -0,0 +1,61 @@ +From 2ec5a33f6e986661dc92f3585ea400f919a39cae Mon Sep 17 00:00:00 2001 +From: Asaf Kahlon +Date: Mon, 7 May 2018 22:02:25 +0300 +Subject: [PATCH 1/1] acinclude.m4: check if -latomic is needed. + +On some cases, -latomic is needed for likning, 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="-latmoic" in case we +succeeded. + +Signed-off-by: Asaf Kahlon +--- + acinclude.m4 | 23 +++++++++++++++++++---- + 1 file changed, 19 insertions(+), 4 deletions(-) + +diff --git a/acinclude.m4 b/acinclude.m4 +index f648ed0f..26c83ad9 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,24 @@ 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] +- ) ++ [AC_MSG_RESULT(yes) ; GCC_ATOMIC_BUILTINS_SUPPORTED=1 libzmq_cv_has_atomic_instrisics="yes" ; $1]) ++ ++ if test "x$GCC_ATOMIC_BUILTINS_SUPPORTED" != x1; then ++ save_LDFLAGS=$LDFLAGS ++ LDFLAGS="$LDFLAGS -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; ++ } ++ ])], ++ [AC_MSG_RESULT(yes) ; libzmq_cv_has_atomic_instrisics="yes" LIBS="-latomic" ; $1], ++ [AC_MSG_RESULT(no) ; libzmq_cv_has_atomic_instrisics="no"; $2]) ++ LDFLAGS=$save_LDFLAGS ++ fi + }]) + + dnl ################################################################################ +-- +2.17.0 +