kumquat-buildroot/package/qt5/qt5webengine/5.12.7/0001-pkg_config-Fixes-when-use_sysroot-false.patch
Peter Seiderer e9830ff31f package/qt5: bump latest version to 5.12.7
qt5base:
 - remove 0003-Do-not-load-plugin-from-the-PWD.patch
   (taken from upstream [1])
 - remove 0004-QLibrary-Unix-do-not-attempt-to-load-a-library-relat.patch
   (taken from upstream [2])

qt5webengine:
 - update 3rdparty license hash script to not include '*.pyc' files
 - update 3rdparty license hash list and chromium-latest.inc file

[1] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=bf131e8d2181b3404f5293546ed390999f760404
[2] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=e6f1fde24f77f63fb16b2df239f82a89d2bf05dd

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2020-02-02 21:03:58 +01:00

58 lines
2.4 KiB
Diff

From cc35cac78c053c14da01d6b1e5b05b0615360148 Mon Sep 17 00:00:00 2001
From: Tom Anderson <thomasanderson@chromium.org>
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 <dpranke@chromium.org>
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
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 <b.bilas@grinn-global.com>
---
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