From patchwork Wed Sep 4 19:33:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1157916 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.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=t-online.de Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46NvBP6SLvz9sBF for ; Thu, 5 Sep 2019 05:33:33 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id D861986AD1; Wed, 4 Sep 2019 19:33:30 +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 jpC8FFa_LK5M; Wed, 4 Sep 2019 19:33:29 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id E688E869F5; Wed, 4 Sep 2019 19:33:28 +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 8B55E1BF31D for ; Wed, 4 Sep 2019 19:33:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 867EF220C2 for ; Wed, 4 Sep 2019 19:33:26 +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 zQRsTwpHdrjN for ; Wed, 4 Sep 2019 19:33:25 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout09.t-online.de (mailout09.t-online.de [194.25.134.84]) by silver.osuosl.org (Postfix) with ESMTPS id 3810F20423 for ; Wed, 4 Sep 2019 19:33:25 +0000 (UTC) Received: from fwd20.aul.t-online.de (fwd20.aul.t-online.de [172.20.26.140]) by mailout09.t-online.de (Postfix) with SMTP id BEBC04268F98 for ; Wed, 4 Sep 2019 21:33:22 +0200 (CEST) Received: from fli4l.lan.fli4l (XRY1xaZ18huX8j12sIGjkdsiMG-m89FSaBgpHZyBxGlQcjjheQmQ94tSgrh9l1yw4i@[91.58.12.59]) by fwd20.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1i5b1p-16JHGq0; Wed, 4 Sep 2019 21:33:17 +0200 Received: from mahler.lan.fli4l ([192.168.1.1]:38260) by fli4l.lan.fli4l with esmtp (Exim 4.92.1) (envelope-from ) id 1i5b1n-0005Ij-L7 for buildroot@buildroot.org; Wed, 04 Sep 2019 21:33:17 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Wed, 4 Sep 2019 21:33:15 +0200 Message-Id: <20190904193315.28943-1-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-ID: XRY1xaZ18huX8j12sIGjkdsiMG-m89FSaBgpHZyBxGlQcjjheQmQ94tSgrh9l1yw4i X-TOI-MSGID: 63cd4ea6-d23d-485e-a788-d6003211bb8c Subject: [Buildroot] [PATCH 1/1] package/apr: fix non-portable atomics X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" apr-1.7.0 added support for 8 bytes atomics for 32 bit archs https://github.com/apache/apr/commit/2f61f960c81e4a45f3849baa7563812e7e526436 We need to adjust our _CONF_OPTS which fixes an apache build error. Fixes: http://autobuild.buildroot.net/results/f24/f2461c1ed542e050afd761db5faeaaff1f51775b/ Signed-off-by: Bernd Kuhls Reviewed-by: Giulio Benetti --- package/apr/apr.mk | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/package/apr/apr.mk b/package/apr/apr.mk index 2a57f854f9..72008d8998 100644 --- a/package/apr/apr.mk +++ b/package/apr/apr.mk @@ -42,15 +42,10 @@ endif # Fix lfs detection when cross compiling APR_CONF_ENV += apr_cv_use_lfs64=yes -# Use non-portable atomics when available: 8 bytes atomics are used on -# 64-bits architectures, 4 bytes atomics on 32-bits architectures. We -# have to override ap_cv_atomic_builtins because the test used to -# check for atomic builtins uses AC_TRY_RUN, which doesn't work when -# cross-compiling. -ifeq ($(BR2_ARCH_IS_64):$(BR2_TOOLCHAIN_HAS_SYNC_8),y:y) -APR_CONF_OPTS += --enable-nonportable-atomics -APR_CONF_ENV += ap_cv_atomic_builtins=yes -else ifeq ($(BR2_ARCH_IS_64):$(BR2_TOOLCHAIN_HAS_SYNC_4),:y) +# Use non-portable atomics when available. We have to override +# ap_cv_atomic_builtins because the test used to check for atomic +# builtins uses AC_TRY_RUN, which doesn't work when cross-compiling. +ifeq ($(BR2_TOOLCHAIN_HAS_SYNC_8),y) APR_CONF_OPTS += --enable-nonportable-atomics APR_CONF_ENV += ap_cv_atomic_builtins=yes else