From patchwork Wed Jul 12 23:55:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Perez de Castro X-Patchwork-Id: 787453 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]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3x7G7B1Tf4z9s03 for ; Thu, 13 Jul 2017 09:56:06 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=igalia.com header.i=@igalia.com header.b="BayRC7tI"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 32D758803C; Wed, 12 Jul 2017 23:56:01 +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 MSDIYXaKenTc; Wed, 12 Jul 2017 23:56:00 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 478798803D; Wed, 12 Jul 2017 23:56:00 +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 994281BF228 for ; Wed, 12 Jul 2017 23:55:51 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 923C7246F6 for ; Wed, 12 Jul 2017 23:55:51 +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 jUkSyQK0BBUJ for ; Wed, 12 Jul 2017 23:55:51 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from fanzine.igalia.com (fanzine.igalia.com [91.117.99.155]) by silver.osuosl.org (Postfix) with ESMTPS id F168523D44 for ; Wed, 12 Jul 2017 23:55:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=S4n1DaJMzp7ZeLoE7wIg6bOddeAuRVXcONb/ZMQ+uMs=; b=BayRC7tIMoW0/OCXeUpg7OBEy96ltdgefCuuEpp6YjmO2QCOScD6LFb5X7xCE8gXUSBvwa5bmnUvWuQUdqLnx+2DwQNa61N0WAogQWLvzS1dR8bYfmgCim36E2BQFkFMdxeD94DWpRmBr9fY9hQ3rJt5iMlNixo2k+k6e5yddHVaIOgs2fzdEAfQGGjn2hBZOyyAE9eENkOVnydGxxsQvCuPQIkqARV7gnPr9CHrWgmJom/d8APCo0+VrwnjUbBG4ivOGu1Lr4R+w3MxmKSWBRBPR/Y+kwMhE7XANUf8ED2HPuj9L+NivDTDC3aWzexANyG0QH9xW2AWzrkMpBUuHw==; Received: from 82-181-162-35.bb.dnainternet.fi ([82.181.162.35] helo=momiji) by fanzine.igalia.com with esmtpsa (Cipher TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim) id 1dVRTw-0000mz-U5; Thu, 13 Jul 2017 01:55:49 +0200 Received: from localhost (momiji [local]) by momiji (OpenSMTPD) with ESMTPA id a830f482; Wed, 12 Jul 2017 23:55:31 +0000 (UTC) From: Adrian Perez de Castro To: buildroot@buildroot.org Date: Thu, 13 Jul 2017 02:55:31 +0300 Message-Id: <20170712235531.20444-5-aperez@igalia.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20170712235531.20444-1-aperez@igalia.com> References: <20170712235531.20444-1-aperez@igalia.com> Cc: Adrian Perez de Castro Subject: [Buildroot] [PATCH 4/4] webkitgtk: Ensure that Mesa headers do not include X11 headers on Wayland builds 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" Defining MESA_EGL_NO_X11_HEADERS avoids the situation in which the Mesa headers try to include the X11 headers as they may not be present when building for Wayland. Signed-off-by: Adrian Perez de Castro --- package/webkitgtk/webkitgtk.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index ef20839f92..09781c2318 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -84,6 +84,9 @@ endif ifeq ($(BR2_PACKAGE_LIBGTK3_WAYLAND),y) WEBKITGTK_CONF_OPTS += -DENABLE_WAYLAND_TARGET=ON endif +WEBKITGTK_CONF_OPTS += \ + -DCMAKE_C_FLAGS='$(TARGET_CFLAGS) -DMESA_EGL_NO_X11_HEADERS' \ + -DCMAKE_CXX_FLAGS='$(TARGET_CXXFLAGS) -DMESA_EGL_NO_X11_HEADERS' endif $(eval $(cmake-package))