From patchwork Thu Mar 1 21:34:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ga=C3=ABl_PORTAY?= X-Patchwork-Id: 880121 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.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=savoirfairelinux.com Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zsm103L2lz9s4v for ; Fri, 2 Mar 2018 08:34:44 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4E7E988C75; Thu, 1 Mar 2018 21:34:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gXabTT4uv73f; Thu, 1 Mar 2018 21:34:36 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 5039288C70; Thu, 1 Mar 2018 21:34:36 +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 C17EF1C0057 for ; Thu, 1 Mar 2018 21:34:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id BD71F89CEC for ; Thu, 1 Mar 2018 21:34:34 +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 1gVZilhZRI-A for ; Thu, 1 Mar 2018 21:34:33 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.savoirfairelinux.com (mail.savoirfairelinux.com [208.88.110.44]) by hemlock.osuosl.org (Postfix) with ESMTPS id BB0F489C96 for ; Thu, 1 Mar 2018 21:34:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.savoirfairelinux.com (Postfix) with ESMTP id 3B69B9C352F; Thu, 1 Mar 2018 16:34:32 -0500 (EST) Received: from mail.savoirfairelinux.com ([127.0.0.1]) by localhost (mail.savoirfairelinux.com [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id famL-CSjyYOG; Thu, 1 Mar 2018 16:34:31 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by mail.savoirfairelinux.com (Postfix) with ESMTP id A632E9C3539; Thu, 1 Mar 2018 16:34:31 -0500 (EST) X-Virus-Scanned: amavisd-new at mail.savoirfairelinux.com Received: from mail.savoirfairelinux.com ([127.0.0.1]) by localhost (mail.savoirfairelinux.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id KSR6K3tirfyk; Thu, 1 Mar 2018 16:34:31 -0500 (EST) Received: from localhost.localdomain (unknown [172.16.15.6]) by mail.savoirfairelinux.com (Postfix) with ESMTPSA id 7AF2D9C3535; Thu, 1 Mar 2018 16:34:31 -0500 (EST) From: =?utf-8?q?Ga=C3=ABl_PORTAY?= To: buildroot@buildroot.org Date: Thu, 1 Mar 2018 16:34:27 -0500 Message-Id: <20180301213428.21011-4-gael.portay@savoirfairelinux.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180301213428.21011-1-gael.portay@savoirfairelinux.com> References: <20180301213428.21011-1-gael.portay@savoirfairelinux.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 3/4] Revert "qt5webkit: fix build issue with mesa3d w/out xcb" 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: Joshua Henderson , =?utf-8?b?R2HDq2wg?= =?utf-8?q?PORTAY?= , Peter Seiderer , Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This reverts commit e46f9fde78e53740bd00c077275d3cd80d7792c7. Supersede by: qt5base: fix build issue with mesa3d w/out xcb Signed-off-by: Gaël PORTAY --- package/qt5/qt5webkit/qt5webkit.mk | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk index 5186671663..e8d368fb01 100644 --- a/package/qt5/qt5webkit/qt5webkit.mk +++ b/package/qt5/qt5webkit/qt5webkit.mk @@ -44,15 +44,8 @@ define QT5WEBKIT_PYTHON2_SYMLINK endef QT5WEBKIT_PRE_CONFIGURE_HOOKS += QT5WEBKIT_PYTHON2_SYMLINK -# The mesa's EGL/eglplatform.h header includes X11 headers unless the flag -# MESA_EGL_NO_X11_HEADERS is defined. Tell to not include X11 headers if -# the libxcb is not selected. -ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL)x$(BR2_PACKAGE_LIBXCB),yx) -QT5WEBKIT_QMAKEFLAGS += QMAKE_CXXFLAGS+=-DMESA_EGL_NO_X11_HEADERS -endif - define QT5WEBKIT_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(QT5WEBKIT_ENV) $(HOST_DIR)/bin/qmake $(QT5WEBKIT_QMAKEFLAGS)) + (cd $(@D); $(TARGET_MAKE_ENV) $(QT5WEBKIT_ENV) $(HOST_DIR)/bin/qmake) endef define QT5WEBKIT_BUILD_CMDS