t-head/meta-qt5
1
0
Fork 0
mirror of https://github.com/thead-yocto-mirror/meta-qt5 synced 2026-09-11 00:25:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

qttools: Add CONFIG+=config_clang_done when not building with clang

Browse Source 
This ensures that dev packages from clang are not looked into during
configure

Define YOCTO_ALTERNATE_EXE_PATH pointing into target sysroot so that
llvm-config can find the target libclang instead of native one

Fixes
linking ../../bin/qdoc
TMPDIR/work/cortexa7t2hf-neon-vfpv4-yoe-linux-gnueabi/qttools/5.13.0+gitAUTOINC+cc9250477e-r0/recipe-sysroot-native/usr/lib/libclang.so: file not recognized: file format not recognized
clang-9: error: linker command failed with exit code 1 (use -v to see invocation)
make[2]: *** [Makefile:212: ../../bin/qdoc] Error 1

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2019-09-02 13:21:23 -07:00
committed by Martin Jansa
parent dc502d5758
commit 12ea469918
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
recipes-qt/qt5/qttools_git.bb
View File

@@ -30,13 +30,15 @@ PACKAGECONFIG_append_toolchain-clang = " clang"
PACKAGECONFIG[qtwebkit] = ",,qtwebkit"
PACKAGECONFIG[clang] = ",,clang"
export YOCTO_ALTERNATE_EXE_PATH = "${STAGING_BINDIR}/llvm-config"
EXTRA_QMAKEVARS_PRE += " \
${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \
"
EXTRA_QMAKEVARS_PRE_append_class-native = " CONFIG-=config_clang"
EXTRA_QMAKEVARS_PRE_append_class-nativesdk = " CONFIG-=config_clang"
EXTRA_QMAKEVARS_PRE_append_class-native = " CONFIG+=config_clang_done CONFIG-=config_clang"
EXTRA_QMAKEVARS_PRE_append_class-nativesdk = " CONFIG+=config_clang_done CONFIG-=config_clang"
EXTRA_QMAKEVARS_PRE_append_class-target = "\
${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=config_clang', 'CONFIG-=config_clang', d)} \
${@bb.utils.contains('PACKAGECONFIG', 'clang', 'CONFIG+=config_clang', 'CONFIG+=config_clang_done CONFIG-=config_clang', d)} \
"
SRCREV = "cc9250477eaa71a3f3ffd050591d4a9d835288ca"