From patchwork Fri Dec 28 08:04:45 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Hoffmann X-Patchwork-Id: 208419 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 44BFD2C00D2 for ; Fri, 28 Dec 2012 19:04:58 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 31E2C101091; Fri, 28 Dec 2012 08:04:47 +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 6r7v0zTYZNtT; Fri, 28 Dec 2012 08:04:43 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id D69C7100351; Fri, 28 Dec 2012 08:04:42 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 1EC5C8F74B for ; Fri, 28 Dec 2012 08:04:56 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 3F739201ED for ; Fri, 28 Dec 2012 08:04:50 +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 iqVgxxqKCW9m for ; Fri, 28 Dec 2012 08:04:49 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from moutng.kundenserver.de (moutng.kundenserver.de [212.227.17.8]) by silver.osuosl.org (Postfix) with ESMTPS id C997320165 for ; Fri, 28 Dec 2012 08:04:48 +0000 (UTC) Received: from stephan-desktop (p54BBCA77.dip.t-dialin.net [84.187.202.119]) by mrelayeu.kundenserver.de (node=mreu4) with ESMTP (Nemesis) id 0LrDwG-1T3Jha0h12-0139nB; Fri, 28 Dec 2012 09:04:46 +0100 Received: by stephan-desktop (Postfix, from userid 1000) id C5A5F500C48; Fri, 28 Dec 2012 09:04:45 +0100 (CET) From: Stephan Hoffmann To: buildroot@uclibc.org Date: Fri, 28 Dec 2012 09:04:45 +0100 Message-Id: <1356681885-4123-1-git-send-email-sho@relinux.de> X-Mailer: git-send-email 1.7.0.4 X-Provags-ID: V02:K0:NjV1E5OwOINzwxUTQxYlsHDuvnoFVJKY94SIvXEUI0y fR9fCwxiUAnlFEy4uN3Nqa8HYawrmXLC5z+NLERwZ0hLkzLHGl 6DKLMw5lmKIy4althr2IEHKDdJK/Poe1Yv4rBngxr9Y3HfeI38 Ywu7L3KAk3rJqdQZyebjjiiwUu1GymzUYoe9WIHZxR8/SGnATV p3CDPoQspDSF+Vs6oFp4/k64KY3Fzp6x4Xe9vaDtWT6QPcPBs4 JQ0KFKtQi6ZDts30wAdY2DCQfrfoHc5m/jgD2CEr607tvjaNFD uZqyU57wMMC22OYl6gu/7Oyu6gamCKwMR1xh4jhi4mLK6TSm42 rB1dd+LMG/AAspEZ6MLl57akwiV/sO8AUAOq/juYga2D4cLjl3 /KPvNKoLN0p/w== Subject: [Buildroot] [PATCH] webkit: fix compilation without X11 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 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-bounces@busybox.net Fixes: http://autobuild.buildroot.net/results/86534588d192fe1515ce520c109e884864871d94/ and others. Webkit includes X11 headers even when configuerd for DirecfFB, because the test within GNUmakefile.in does not work properly. Autoreconfigure fails because of incompatibility with buildroot's autotools version. For now a patch for GNUmakefile.in fixes this problem. Since webkit release is quite old it doesn't seem to be worth doing more, on the long run we should bump the version. Signed-off-by: Stephan Hoffmann --- .../webkit-fix-compilation-on-DirectFB-2.patch | 33 ++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) create mode 100644 package/webkit/webkit-fix-compilation-on-DirectFB-2.patch diff --git a/package/webkit/webkit-fix-compilation-on-DirectFB-2.patch b/package/webkit/webkit-fix-compilation-on-DirectFB-2.patch new file mode 100644 index 0000000..097fa5d --- /dev/null +++ b/package/webkit/webkit-fix-compilation-on-DirectFB-2.patch @@ -0,0 +1,33 @@ +From ef45c7ce5325d85ca924502b1b0a929fecd6581d Mon Sep 17 00:00:00 2001 +From: Stephan Hoffmann +Date: Thu, 27 Dec 2012 18:08:29 +0100 +Subject: [PATCH] Fix test for presence of X11 + +The test in GNUmakefile.in checking for presence of X11 and +enabling the XP_UNIX define succeeds even when X11 is not +present and Webkit is built for DirectFB. + +Because of this X11-headers are included and the build fails. + +Signed-off-by: Stephan Hoffmann +--- + GNUmakefile.in | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/GNUmakefile.in b/GNUmakefile.in +index f14f27b..3ac811f 100644 +--- a/GNUmakefile.in ++++ b/GNUmakefile.in +@@ -88,7 +88,8 @@ noinst_PROGRAMS = Programs/minidom$(EXEEXT) \ + $(am__EXEEXT_1) + + # For the Gtk port we want to use XP_UNIX both in X11 and Mac +-@TARGET_WIN32_FALSE@am__append_1 = -DXP_UNIX ++@TARGET_X11_TRUE@am__append_1 = -DXP_UNIX ++@TARGET_QUARTZ_TRUE@am__append_1 = -DXP_UNIX + @USE_ICU_UNICODE_TRUE@am__append_2 = \ + @USE_ICU_UNICODE_TRUE@ -DWTF_USE_ICU_UNICODE=1 + +-- +1.7.0.4 +