From patchwork Fri Nov 1 11:10:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1187904 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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=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="rUnJXkHj"; dkim-atps=neutral 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 474KGD28LTz9sPT for ; Fri, 1 Nov 2019 22:09:40 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 473E3857D6; Fri, 1 Nov 2019 11:09:36 +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 CdlmMWK9fz8f; Fri, 1 Nov 2019 11:09:34 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id A95B684B08; Fri, 1 Nov 2019 11:09:34 +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 4F4571BF372 for ; Fri, 1 Nov 2019 11:09:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 4BE1B2372E for ; Fri, 1 Nov 2019 11:09:33 +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 4Mh2vfyNL-mr for ; Fri, 1 Nov 2019 11:09:32 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by silver.osuosl.org (Postfix) with ESMTPS id 562E1234BB for ; Fri, 1 Nov 2019 11:09:32 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id s1so9327061wro.0 for ; Fri, 01 Nov 2019 04:09:32 -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:mime-version :content-transfer-encoding; bh=EKOuZIEa8I5uQwLruPyUl2vcXDg0vthZHm00MzstKUk=; b=rUnJXkHjwJMjYUQXAugLT5G6MD5ZcEjliOfAf66hflnwqRHo7Rr5ltUh1Zl+CCCRbx Y5nIX2pTooCrG9CocuBTvPJ3Vq4lxyjQt/qRzZ7LgfM7RyaoY/8AIiu5u7thS4RFJxBP HrSzEHDbd2O4Ydz2gbjuvaCQ1kl6ytW1dwPTR9YwnpxeIs1v65hbDe8YJiJrw20n5XU4 icDSghaO46OZZGDn2qbhfYgdT/xomfuuk++R7lX9AmG/dtJYJ2ZdfzUTyiUQCrljYEF/ T5238lMuFnyZl3KkL5euTTRkg7ixvYlDSEFf45CCQ1smc0ebu9MahRoi3TPVgpdY0Qci GDGQ== 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:mime-version :content-transfer-encoding; bh=EKOuZIEa8I5uQwLruPyUl2vcXDg0vthZHm00MzstKUk=; b=i2TanA9O2Ysuq/tZFd4gbRi78BUJXVlZu37guz/42Oofb1o+Q6gCWuJ1RzPRxFQWCj wlIGSn7vCxyaUWqhfeTZERYgIAxdwkP+dXnyyfXVTGEehcqvIkZzLzHvLbU1JBi06PKo VoIWS08g9CX5E2Qs/4toBzRK2l8K1Q6P+ROb9AMUQLDidDQ8wa8Q91es/nhkXwz2Lpie TN0sqHeMWIIKs8q4m28izjWIV7Exnx8r23jz5YNz0D6TVSFCyTRdUEi//DCZNhhfq651 NlPwY3zr+9Js169h86FSVVFNtT7l3nyv/UefwcWth1rE97vk+AldpPL4C68l9N2Lt6Ix w+ow== X-Gm-Message-State: APjAAAWt2oCkomLgjfVGvx76B8lvpYemL9w1SUIB1BzO/R+ItO8x5yMC GHi5wN1PSO3h8AKXYpgT4cw5kEmU X-Google-Smtp-Source: APXvYqxmksNe8pWHMzT9W4ZOrlsuUOmj0HdbDyaZCoPz5YaKZboL8pVvc12EydPKT7YLp6vcHEUiPA== X-Received: by 2002:adf:e682:: with SMTP id r2mr9692616wrm.365.1572606570629; Fri, 01 Nov 2019 04:09:30 -0700 (PDT) Received: from kali.home (lfbn-1-3732-187.w86-229.abo.wanadoo.fr. [86.229.230.187]) by smtp.gmail.com with ESMTPSA id h124sm7343159wmf.30.2019.11.01.04.09.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Nov 2019 04:09:30 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Fri, 1 Nov 2019 12:10:05 +0100 Message-Id: <20191101111005.21389-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/haproxy: fix build on m68k 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: , Cc: Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" When threads are enabled, haproxy expects that pthread_getcpuclockid is available which is not the case on m68k. Fix this by enabling threads support only if NPTL is available. Fixes: - http://autobuild.buildroot.org/results/52cc4b1fcac2a4fc84ab15ec4c692d2cd9b6d8bd Signed-off-by: Fabrice Fontaine --- package/haproxy/haproxy.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/haproxy/haproxy.mk b/package/haproxy/haproxy.mk index 9d0ef5710f..fdaf5ed19b 100644 --- a/package/haproxy/haproxy.mk +++ b/package/haproxy/haproxy.mk @@ -19,7 +19,7 @@ ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) HAPROXY_LIBS += -latomic endif -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS_NPTL),y) # threads uses atomics on gcc >= 4.7 and sync otherwise (see # include/common/hathreads.h) ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_7):$(BR2_TOOLCHAIN_HAS_ATOMIC),y:y)