From patchwork Mon May 7 20:26:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Asaf Kahlon X-Patchwork-Id: 909911 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="iILeCEBv"; 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 40fvLD26LSz9ry1 for ; Tue, 8 May 2018 06:27:16 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 3FD57870EA; Mon, 7 May 2018 20:27:12 +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 bI-u9MZ80AUN; Mon, 7 May 2018 20:27:10 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id C5449870E0; Mon, 7 May 2018 20:27:10 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 642CA1BFA95 for ; Mon, 7 May 2018 20:27:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 619F3870D5 for ; Mon, 7 May 2018 20:27:09 +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 qBTDQ77RCfse for ; Mon, 7 May 2018 20:27:09 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by hemlock.osuosl.org (Postfix) with ESMTPS id 7F85F870DF for ; Mon, 7 May 2018 20:27:08 +0000 (UTC) Received: by mail-wr0-f193.google.com with SMTP id f2-v6so18222973wrm.3 for ; Mon, 07 May 2018 13:27:08 -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=Qh7715M5mGPWZaxHZXg1og6Zir3lb4ZnI3WVcR2Dy40=; b=iILeCEBv5eyf44Y8UzNpHT0d/Nqvw6im6oybjTjSl1W1aET3IAbUvkUMi2a8ERXkzb oIaNavWMgSw6y0k2EnUMiasEdBBeeT3NLRji91kKX3EIeAcx9pF3U8q6ETeEUlQyoy1U nu9rofRECWdwNzQpaPPKzzUcRmCrSgQVLsycYY8Q/kWAqXY5PMEGA3Z/JQpaGB8Twr6S MsyVl6Ay8jBloQpYbD/drqUdeVTwh4hh0snNSV9+xUh2ps8AaKDlJFLVM+oGK8Uaqsw9 osXijOVlNDxmtFDcNCiO1nU9DATAatUL+J3VE0tvNWxRS0QPQugAkiXAdL5t4uPXshxg Tx7Q== 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=Qh7715M5mGPWZaxHZXg1og6Zir3lb4ZnI3WVcR2Dy40=; b=knj8Yvr4nesJMxOEM6DuzLWR+Y3EE5AkkTSdtEpGVw4uOn+yzZuGeBmtoQrMto+LkF rYKiWz5FQKXohX0AqdICB3zuemN22let0Q6KHF9gWXmp9glsO3BRVfYfOoirqDvHsrNv u5bQGcJXHsQtitBKOzPsCreqzaLlnJ6uR67Au3viutH14bwTB57WTmPmRIqWcU5U4lQZ JJcH0dQE/CizBIPEDPDBQ/9cXMEZChWk3aAkj29isxakmfFsiSiM5E4RyMk3E4WcNiuF 77cKVuEH+Z4fb/K74jln6airsJ3m2Log7SdgADmRq69LggwR/uB4kqWVFMvZVEYxZoaV ZOUw== X-Gm-Message-State: ALQs6tAxn6Ny4c6P4XrnwUEDmt3Yae7imbJ6h4AciQT1K30LcqD+LNSi RCNTT6TU5IQXgPcT3Va3/CBPWA== X-Google-Smtp-Source: AB8JxZqTVt9eb/mGy6HLaFCQqk+c/3gYm8HBwooVDJsHCGQdxoNjZDoiccspyey1xOG+qGsh03SFlg== X-Received: by 2002:adf:9e49:: with SMTP id v9-v6mr32780944wre.210.1525724826748; Mon, 07 May 2018 13:27:06 -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 j18-v6sm23610850wrd.92.2018.05.07.13.27.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 07 May 2018 13:27:05 -0700 (PDT) From: Asaf Kahlon To: buildroot@buildroot.org Date: Mon, 7 May 2018 23:26:23 +0300 Message-Id: <20180507202623.29498-1-asafka7@gmail.com> X-Mailer: git-send-email 2.17.0 Subject: [Buildroot] [PATCH v2 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 --- v2: fix typos and small refactoring. ...nclude.m4-check-if-latomic-is-needed.patch | 70 +++++++++++++++++++ 1 file changed, 70 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..6f3671c4a0 --- /dev/null +++ b/package/zeromq/0002-acinclude.m4-check-if-latomic-is-needed.patch @@ -0,0 +1,70 @@ +From 9f4ca582555b208d065f730b5ce3b1901136b275 Mon Sep 17 00:00:00 2001 +From: Asaf Kahlon +Date: Mon, 7 May 2018 23:19:09 +0300 +Subject: [PATCH 1/1] 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 +--- + acinclude.m4 | 32 ++++++++++++++++++++++++++++---- + 1 file changed, 28 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,33 @@ 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_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; ++ } ++ ])], ++ [libzmq_cv_has_atomic_instrisics="yes" LIBS="-latomic"], ++ [libzmq_cv_has_atomic_instrisics="no"]) ++ LDFLAGS=$save_LDFLAGS ++ 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 +