CaROS/meta-qt6
3
0
Fork 0
mirror of http://code.qt.io/yocto/meta-qt6.git synced 2026-01-01 13:58:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

squish: fix poison-system-directories error

Browse Source 
Squish does not correctly use sysroot for freetype include,
causing cc1plus: error: include location "/usr/include/freetype2"
is unsafe for cross-compilation [-Werror=poison-system-directories]

Task-number: SQUISH-18588
Pick-to: 6.8
Change-Id: I9aa30f3df02dbd1502e6f6697788016f6b88cd45
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
This commit is contained in:
Samuli Piippo 2025-01-24 17:31:17 +00:00
parent 6c7b78d147
commit 00e8a7149e
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
recipes-qt/squish/squish/0001-Use-correct-prefix-for-Xft-include.patch Normal file
View File

@ -0,0 +1,26 @@
From 4c4daf9c1d2b32bcd19206f91d50aaf8f073c764 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Fri, 24 Jan 2025 16:54:17 +0000
Subject: [PATCH] Use correct prefix for Xft include
Use sysroot prefix include path to prevent:
cc1plus: error: include location "/usr/include/freetype2" is unsafe for cross-compilation [-Werror=poison-system-directories]
Upstream-Status: Pending
---
configure.cos | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.cos b/configure.cos
index 138e5fe..d1c1723 100644
--- a/configure.cos
+++ b/configure.cos
@@ -2257,7 +2257,7 @@ function checkXft()
if ( compileTest( target ) ) {
msgResult( "yes" );
config["LIBXFT"] = libXft;
- config["XFT_INC"] = ["/usr/include/freetype2"];
+ config["XFT_INC"] = [freetypePrefix + "/include/freetype2"];
defines["HAVE_XFT"] = 1;
return true;
}

1
recipes-qt/squish/squish_8.1.0.bb
View File

@ -12,6 +12,7 @@ SQUISH_INSTALLER = "squish-${PV}-qt68x-linux64.run"
SRC_URI = "\
${SQUISH_MIRROR}/${SQUISH_INSTALLER};name=squish \
${SQUISH_MIRROR}/squish-${PV}-qt-embedded-src.tar.gz;name=qt-squish-embedded \
file://0001-Use-correct-prefix-for-Xft-include.patch \
"
SRC_URI[squish.sha256sum] = "2ff96e9f2e8594833c186d0b34f12f2014b2fcd30f087e53edc39066587c42b6"