From patchwork Mon Oct 15 13:51:47 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Valentine Barshak X-Patchwork-Id: 191563 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 830E72C009A for ; Tue, 16 Oct 2012 00:50:49 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 4F087A02BE; Mon, 15 Oct 2012 13:50:48 +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 t-cHby5l4-Um; Mon, 15 Oct 2012 13:50:47 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 22CD5A0304; Mon, 15 Oct 2012 13:50:47 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 4B07A8F74A for ; Mon, 15 Oct 2012 13:50:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 581EB8A28E for ; Mon, 15 Oct 2012 13:50:45 +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 tJIC3dHL4kMM for ; Mon, 15 Oct 2012 13:50:44 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lb0-f171.google.com (mail-lb0-f171.google.com [209.85.217.171]) by whitealder.osuosl.org (Postfix) with ESMTPS id D86338A278 for ; Mon, 15 Oct 2012 13:50:43 +0000 (UTC) Received: by mail-lb0-f171.google.com with SMTP id m4so4304527lbo.16 for ; Mon, 15 Oct 2012 06:50:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=GYAhRKkckn2wm/gAccvxtH7WImxl3dS80aCXF4JOdBI=; b=s2zRzeHaHavA62QSdTCNkhdtO9kgmC29hnDiQpazhITd/gCQ7rajT9Filb1CZ3BKXl hnFIjhCz6Oc8n6ySf8gBI03hDn8Q9foIrtHksETfcz7x46KYBsxqGR5wNGG/zbiCXo/y HpdLZNGR4q3Am1ni4VollQZq+PPefOBq/XQ8j3xo2L7/yhA2buDcIJol+5U5nqZYC/bJ PWtJZaqgSveXHZ86Eb/y8bpd2iZzTeDnWKPgprpQSTgvIM3KnBVXv5C9AeobwSJxXWO4 Da+snDtZkyrX8+KHNxGRy1h+q62KxxVTsq+vQElGT433RIG4DsFUnfnPRbPzKhb75jGQ cKhg== Received: by 10.112.104.36 with SMTP id gb4mr4281359lbb.97.1350309041660; Mon, 15 Oct 2012 06:50:41 -0700 (PDT) Received: from black.localnet ([93.100.122.208]) by mx.google.com with ESMTPS id nr2sm4577434lab.5.2012.10.15.06.50.40 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 15 Oct 2012 06:50:41 -0700 (PDT) From: Valentine Barshak To: buildroot@busybox.net Date: Mon, 15 Oct 2012 17:51:47 +0400 Message-Id: <1350309107-31873-1-git-send-email-gvaxon@gmail.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: References: Subject: [Buildroot] [PATCH v2] webkit: Fix build issue with gcc-4.6 and above 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 This fixes the "Unknown parameter for tags/attrs" build error. Backported from commit 88e08c43d0200a4b06a298b7d2541965eebc0afe [PATCH] 2011-04-17 Thierry Reding Reviewed by Adam Barth. Fix build with GCC 4.6. * dom/make_names.pl: Execute preprocessor without the -P option. The preprocessor in GCC 4.6 eats empty lines, effectively breaking the parsing performed by this script. Dropping the -P option when invoking the preprocessor keeps the empty lines but as a side-effect also adds additional linemarkers. From the cpp manpage: -P Inhibit generation of linemarkers in the output from the preprocessor. This might be useful when running the preprocessor on something that is not C code, and will be sent to a program which might be confused by the linemarkers. The linemarkers are not problematic, however, because the script properly handles them by ignoring all lines starting with a #. Signed-off-by: Valentine Barshak --- package/webkit/webkit-fix-build-with-gcc-4-6.patch | 45 ++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 package/webkit/webkit-fix-build-with-gcc-4-6.patch diff --git a/package/webkit/webkit-fix-build-with-gcc-4-6.patch b/package/webkit/webkit-fix-build-with-gcc-4-6.patch new file mode 100644 index 0000000..181c7f5 --- /dev/null +++ b/package/webkit/webkit-fix-build-with-gcc-4-6.patch @@ -0,0 +1,45 @@ +Backported from commit 88e08c43d0200a4b06a298b7d2541965eebc0afe: +Removed the ChangeLog part. + +From: "commit-queue@webkit.org" + +Date: Mon, 18 Apr 2011 06:53:23 +0000 +Subject: [PATCH] 2011-04-17 Thierry Reding + + + Reviewed by Adam Barth. + + Fix build with GCC 4.6. + + * dom/make_names.pl: Execute preprocessor without the -P option. The + preprocessor in GCC 4.6 eats empty lines, effectively breaking the + parsing performed by this script. Dropping the -P option when invoking + the preprocessor keeps the empty lines but as a side-effect also adds + additional linemarkers. + + From the cpp manpage: + + -P Inhibit generation of linemarkers in the output from the + preprocessor. This might be useful when running the preprocessor + on something that is not C code, and will be sent to a program + which might be confused by the linemarkers. + + The linemarkers are not problematic, however, because the script + properly handles them by ignoring all lines starting with a #. + +diff --git a/WebCore/dom/make_names.pl b/WebCore/dom/make_names.pl +index 836137e..50386e0 100755 +--- a/WebCore/dom/make_names.pl ++++ b/WebCore/dom/make_names.pl +@@ -54,7 +54,7 @@ if ($ENV{CC}) { + } else { + $gccLocation = "/usr/bin/gcc"; + } +-my $preprocessor = $gccLocation . " -E -P -x c++"; ++my $preprocessor = $gccLocation . " -E -x c++"; + + GetOptions( + 'tags=s' => \$tagsFile, +-- +1.7.11.4 +