From patchwork Sat Dec 21 11:12:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Bilas X-Patchwork-Id: 1214477 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=grinn-global.com Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47g2xh6DFQz9sPJ for ; Sat, 21 Dec 2019 22:11:50 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id B0CFC20440; Sat, 21 Dec 2019 11:11:47 +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 UrICwPXt2ycF; Sat, 21 Dec 2019 11:11:45 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 298F920243; Sat, 21 Dec 2019 11:11:45 +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 3F8C61BF836 for ; Sat, 21 Dec 2019 11:11:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3AFF987379 for ; Sat, 21 Dec 2019 11:11:44 +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 zJYCI9dHnT_B for ; Sat, 21 Dec 2019 11:11:42 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from smtp.megiteam.pl (smtp.megiteam.pl [31.186.83.105]) by fraxinus.osuosl.org (Postfix) with ESMTPS id BBB89872B2 for ; Sat, 21 Dec 2019 11:11:42 +0000 (UTC) Received: from host-81-161-203-239.oxylion.net.pl ([81.161.203.239] helo=bartekk-pc.lan) by smtp.megiteam.pl with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86.2_XX) (envelope-from ) id 1iicfb-0001mw-1v; Sat, 21 Dec 2019 12:11:39 +0100 From: Bartosz Bilas To: buildroot@buildroot.org Date: Sat, 21 Dec 2019 12:12:18 +0100 Message-Id: <20191221111218.26960-1-b.bilas@grinn-global.com> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 1/1] package/qt5/qt5webengine: fix build error X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bartosz Bilas Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This commit adds a patch from upstream chromium [1]. Fixes: ../../3rdparty/chromium/third_party/skia/third_party/skcms/skcms.cc:1909:16: note: in definition of macro 'NS' #define NS(id) id [1] https://chromium.googlesource.com/chromium/src/+/a8c8396fd20d98666d517c45b358c63736e345ef Signed-off-by: Bartosz Bilas --- v1 -> v2: - keep gcc 4.8 as a minimum required version (suggested by Giulio Benetti) ..._config-Fixes-when-use_sysroot-false.patch | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 package/qt5/qt5webengine/5.12.5/0001-pkg_config-Fixes-when-use_sysroot-false.patch diff --git a/package/qt5/qt5webengine/5.12.5/0001-pkg_config-Fixes-when-use_sysroot-false.patch b/package/qt5/qt5webengine/5.12.5/0001-pkg_config-Fixes-when-use_sysroot-false.patch new file mode 100644 index 0000000000..a0fdad4da3 --- /dev/null +++ b/package/qt5/qt5webengine/5.12.5/0001-pkg_config-Fixes-when-use_sysroot-false.patch @@ -0,0 +1,57 @@ +From cc35cac78c053c14da01d6b1e5b05b0615360148 Mon Sep 17 00:00:00 2001 +From: Tom Anderson +Date: Thu, 2 Aug 2018 01:59:28 +0000 +Subject: [PATCH] pkg_config: Fixes when use_sysroot=false + +This CL introduces 2 changes to the behavior of pkg_config when +use_sysroot=false: + +1. The path is not made relative to the build directory. This fixes the case +where your src directory may be mounted at different locations. + +2. -I is used instead of -isystem. When -isystem is used, dep files do not +reference the system header files. This is OK when using the sysroot because +the CR_SYSROOT_HASH macro contains the sysroot revision so any source files will +be rebuilt when the sysroot updates. + +R=dpranke + +Change-Id: Ia3d7df51880205fee888923283b76078ccb3112f +Reviewed-on: https://chromium-review.googlesource.com/1159689 +Reviewed-by: Dirk Pranke +Commit-Queue: Thomas Anderson +Cr-Original-Commit-Position: refs/heads/master@{#580030} +Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src +Cr-Mirrored-Commit: a8c8396fd20d98666d517c45b358c63736e345ef +Signed-off-by: Bartosz Bilas +--- + src/3rdparty/chromium/build/config/linux/pkg_config.gni | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/src/3rdparty/chromium/build/config/linux/pkg_config.gni b/src/3rdparty/chromium/build/config/linux/pkg_config.gni +index 53ee353af..428e44ac0 100644 +--- a/src/3rdparty/chromium/build/config/linux/pkg_config.gni ++++ b/src/3rdparty/chromium/build/config/linux/pkg_config.gni +@@ -103,11 +103,15 @@ template("pkg_config") { + pkgresult = exec_script(pkg_config_script, args, "value") + cflags = pkgresult[1] + +- # We want the system include paths to use -isystem instead of -I to suppress +- # warnings in those headers. + foreach(include, pkgresult[0]) { +- include_relativized = rebase_path(include, root_build_dir) +- cflags += [ "-isystem$include_relativized" ] ++ if (use_sysroot) { ++ # We want the system include paths to use -isystem instead of -I to ++ # suppress warnings in those headers. ++ include_relativized = rebase_path(include, root_build_dir) ++ cflags += [ "-isystem$include_relativized" ] ++ } else { ++ cflags += [ "-I$include" ] ++ } + } + + if (!defined(invoker.ignore_libs) || !invoker.ignore_libs) { +-- +2.21.0 +