From patchwork Sat Jan 23 01:11:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Hunleth X-Patchwork-Id: 572040 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 3498B1402C4 for ; Sat, 23 Jan 2016 12:18:48 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=troodon-software-com.20150623.gappssmtp.com header.i=@troodon-software-com.20150623.gappssmtp.com header.b=Jevwx3EM; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 6E991A5956; Sat, 23 Jan 2016 01:18:47 +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 rAHha5cBAtev; Sat, 23 Jan 2016 01:18:45 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id A5B2FA5926; Sat, 23 Jan 2016 01:18:45 +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 933811C1F38 for ; Sat, 23 Jan 2016 01:18:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 8D3DF94CB4 for ; Sat, 23 Jan 2016 01:18:43 +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 GZIxhJfyxoXw for ; Sat, 23 Jan 2016 01:18:43 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qk0-f174.google.com (mail-qk0-f174.google.com [209.85.220.174]) by hemlock.osuosl.org (Postfix) with ESMTPS id F1C0B94BB5 for ; Sat, 23 Jan 2016 01:18:42 +0000 (UTC) Received: by mail-qk0-f174.google.com with SMTP id s68so35448256qkh.3 for ; Fri, 22 Jan 2016 17:18:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=troodon-software-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=cIxE5BDil0G8P8AiyoUUF3epfCO2+nXIEum0MCGeL7E=; b=Jevwx3EMw9O8Guk1N5LEDt/HQVyh75WsK77LmgvyYJiUyDIx18RjhPtagxnz/LnalQ AQQ5mr0N6XWsm79xmp/V7w5p61djG03jFMs8VcQVIrVuuKZUaXWfW6QUmmhFV/sMDA8L zwD67PBeB8/dewu7jdS3n87a67V0rpQh65iCQP/K8aK7EEkwtFV+L+6+Bx33tztbiTyB nDULovZLqEiqmMmJzEraxStxagW5YJDOzQLzMqIcBor+PPtUKLCOobXt134jn6TNvUug 2xJ86vnJ9jKWEDoXuSUY+wq8XLs7w/S6ZnugchobgLXceCLyz3Ici5fqNIY/yG41U6Pd rvjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=cIxE5BDil0G8P8AiyoUUF3epfCO2+nXIEum0MCGeL7E=; b=Rxi2kcpc2NNo449vTNstKoS2cWX2FZv9kC3U747/Xcvk6qJchOipB8mYqvHATK3JmC +K/OIXllfusNF+/lIu6WN6FvdH5B5RgKDzJc0sTc1lgsu2qdNSwGhYeKWPkF1/EQXmzM zhE0n1cVER0ch/kdvSSoRlqHq88GwwZL+3Ux5dUBTaC1nL1BvuGxmxkwc8k43VpDBb8x NLMop6T6+bk7AyUkFWxHdvhi8XTijIDrhIw2rUtmXHkah2JM1P3A0PAd55AsgMPbB94O /CSdlowkPmxg6M45S8hC+y355+g5CTBON6tLDx+HR9ee305MU15EYiaMDdky0EHJKDPv 4n1w== X-Gm-Message-State: AG10YOR0Fsw1ACMirn6LWOObDAXKGKM7D7B6VZQ9Hp7Q6oSrLOR5ndm+GgBsJ/ujHpEeIQ== X-Received: by 10.55.33.73 with SMTP id h70mr7234546qkh.69.1453511512076; Fri, 22 Jan 2016 17:11:52 -0800 (PST) Received: from halfmarathon.home.hunleth.com (pool-100-36-100-112.washdc.fios.verizon.net. [100.36.100.112]) by smtp.gmail.com with ESMTPSA id z62sm3934424qka.26.2016.01.22.17.11.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 22 Jan 2016 17:11:51 -0800 (PST) From: Frank Hunleth To: buildroot@buildroot.org Date: Fri, 22 Jan 2016 20:11:11 -0500 Message-Id: <1453511471-28519-19-git-send-email-fhunleth@troodon-software.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1453511471-28519-1-git-send-email-fhunleth@troodon-software.com> References: <1453511471-28519-1-git-send-email-fhunleth@troodon-software.com> Subject: [Buildroot] [PATCH 18/18] erlang: make libatomic_ops optional X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The Erlang developers prefer the use of Erlang's native atomics in Erlang 18. In the previous Erlang release, the native atomics implementation was not complete and so libatomic_ops was necessary. Now libatomic_ops is used as a fallback, but based on tests of every qemu_*_defconfig and several other configs it appears to not be necessary. In fact, it causes build failures on aarch64. Since it is conceivable that a platform exists that may still require libatomic_ops, this change makes the use of the library optional. Fixes: http://autobuild.buildroot.net/results/0cd/0cd22eb74fa29e5a85bf897762e16ab3daf33962/ Signed-off-by: Frank Hunleth --- package/erlang/Config.in | 10 ++++++++-- package/erlang/erlang.mk | 2 ++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/package/erlang/Config.in b/package/erlang/Config.in index 0ec01bb..9bd64ac 100644 --- a/package/erlang/Config.in +++ b/package/erlang/Config.in @@ -7,8 +7,7 @@ config BR2_PACKAGE_ERLANG bool "erlang" depends on BR2_USE_MMU # fork() depends on !BR2_STATIC_LIBS - depends on BR2_PACKAGE_LIBATOMIC_ARCH_SUPPORTS - select BR2_PACKAGE_LIBATOMIC_OPS + depends on BR2_PACKAGE_LIBATOMIC_ARCH_SUPPORTS # erlang native atomics and libatomic_ops help Erlang is a programming language used to build massively scalable soft real-time systems with requirements on high availability. @@ -20,6 +19,13 @@ config BR2_PACKAGE_ERLANG if BR2_PACKAGE_ERLANG +config BR2_PACKAGE_ERLANG_USE_LIBATOMIC_OPS + bool "use libatomic_ops" + select BR2_PACKAGE_LIBATOMIC_OPS + help + Erlang's native atomic ops implementation is preferred. If this is + insufficient, enabling this option forces Erlang to use libatomic_ops. + config BR2_PACKAGE_ERLANG_SMP bool "enable SMP support" help diff --git a/package/erlang/erlang.mk b/package/erlang/erlang.mk index dfab30d..a2f75e7 100644 --- a/package/erlang/erlang.mk +++ b/package/erlang/erlang.mk @@ -30,8 +30,10 @@ ERLANG_CONF_ENV += erl_xcomp_sysroot=$(STAGING_DIR) ERLANG_CONF_OPTS = --without-javac +ifeq ($(BR2_PACKAGE_ERLANG_USE_LIBATOMIC_OPS),y) ERLANG_DEPENDENCIES += libatomic_ops ERLANG_CONF_OPTS += --with-libatomic_ops=$(STAGING_DIR)/usr LIBS=-latomic_ops +endif # erlang uses openssl for all things crypto. Since the host tools (such as # rebar) uses crypto, we need to build host-erlang with support for openssl.