From patchwork Mon Feb 12 17:01:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 872168 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Yc1+fIQ6"; 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 3zgBlt3NRLz9sRW for ; Tue, 13 Feb 2018 04:01:46 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 62F1C87472; Mon, 12 Feb 2018 17:01:41 +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 2yT3DTr+dMZ0; Mon, 12 Feb 2018 17:01:39 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id AEC6B87491; Mon, 12 Feb 2018 17:01:39 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id E1A601C0AE2 for ; Mon, 12 Feb 2018 17:01:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id DEDB886CF4 for ; Mon, 12 Feb 2018 17:01:38 +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 cx_IcCjjBDL7 for ; Mon, 12 Feb 2018 17:01:38 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-io0-f172.google.com (mail-io0-f172.google.com [209.85.223.172]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 2D87F86B4F for ; Mon, 12 Feb 2018 17:01:38 +0000 (UTC) Received: by mail-io0-f172.google.com with SMTP id 72so18001998iom.10 for ; Mon, 12 Feb 2018 09:01:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=9ad9wL15MXAthbydnRBrznDAkH1g8HhGmaBlwI1urHU=; b=Yc1+fIQ6l7I9UFqDsnHeYp37PDe39con3GdDlMAvY2/n+7UR/alxzIvoTiyQYwpNAv pSdsbnNNH0ik/Hmgx+5AQtxFe1gwNIIOHvvLzHS4K8wkeM25PUwvGS1u5RtlKWbNjJo0 CGRrwuIuzNivncAQ/6SwjC+TLWqdGb2VkPLVsKndNrrv6di1a9XwtYCV9lc4Ks7fy74n pgAx9+ldghJziiTRc5DHx8/yp0KD2DBMmB87g9j3ZKdSYzdLw6rxjRDJ9TI/dby99WRl RzITVc7VPCkWATwu50NhgfOZ2BiJplzFWflN921VNvHxoznPcTbynKZgOJprhKsxb8Wj piRw== 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=9ad9wL15MXAthbydnRBrznDAkH1g8HhGmaBlwI1urHU=; b=hFc+vRAhOkxFsO6JeCf1CYxfet4nbkb8H+Baw6pm47C5zcucw2EIYzfv3gyKe9vs+h mlzspmIyCD6OqJC9+O/nEbnialbSCce8jrVy2K/JUKPGLMvBsynMi+bnjnB383tiAro2 1vP7yAL1FB3oykmGmKbu9UFpD24MkTzTFzzfiMLptHYJ0z/FVTvhjKZSLg+61M3t4Wve kjpw/ED+1UgwpDK3sFmqjv0/Dj1bCEvkCDT+I/s9pTuQeJMQ5g0TMVOLYKmINnR5BYy1 COJhw1Woa9TybbB/GdTIBBX/kCSpPi/Q2/ydrZNBNDS6dlNYYNobCecS+nOO6zMp32aP up0w== X-Gm-Message-State: APf1xPAWkNGTWYUc7QOwc6CPSBkHiu3kdk1Cu2oud5ie6p/huehlUD5o Qkre44Me7kDI8aUtU0RmzGMlj1Da X-Google-Smtp-Source: AH8x227iVcxgbgwhCCUwO3MyvS9ox1vOZnBVQaRteU+TRjIg5LwrOfyo5Md5Txy3JlZZs2HmtDdKGw== X-Received: by 10.107.144.11 with SMTP id s11mr3670348iod.79.1518454896386; Mon, 12 Feb 2018 09:01:36 -0800 (PST) Received: from localhost.localdomain (mail.codeblue.com. [65.183.183.198]) by smtp.gmail.com with ESMTPSA id i201sm7153874ita.14.2018.02.12.09.01.35 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Feb 2018 09:01:35 -0800 (PST) From: Adam Duskett To: buildroot@buildroot.org Date: Mon, 12 Feb 2018 12:01:12 -0500 Message-Id: <20180212170112.12313-1-aduskett@gmail.com> X-Mailer: git-send-email 2.14.3 Subject: [Buildroot] [master 1/1] php: disable valgrind 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: Adam Duskett MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Introduced in PHP7.2, if a host has valgrind headers installed, PHP will detect them and set HAVE_VALGRIND to 1. Disable this entry after configuring. fixes: http://autobuild.buildroot.net/results/d59/d59b5961890aeddcd6d59ed52243be6554d1fe21 Signed-off-by: Adam Duskett --- package/php/php.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/php/php.mk b/package/php/php.mk index a4481c45c7..e6bc1e47e1 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -232,6 +232,11 @@ define PHP_DISABLE_PCRE_JIT $(SED) '/^#define SUPPORT_JIT/d' $(@D)/ext/pcre/pcrelib/config.h endef +define PHP_DISABLE_VALGRIND + $(SED) '/^#define HAVE_VALGRIND/d' $(@D)/main/php_config.h +endef +PHP_POST_CONFIGURE_HOOKS += PHP_DISABLE_VALGRIND + ### Use external PCRE if it's available ifeq ($(BR2_PACKAGE_PCRE),y) PHP_CONF_OPTS += --with-pcre-regex=$(STAGING_DIR)/usr