Commit 562fa2e0 authored by Stepan Nassyr's avatar Stepan Nassyr
Browse files

2021a: Add Qt6 (for jumax)

parent 9a83a592
# This file is part of JSC's public easybuild repository (https://github.com/easybuilders/jsc)
easyblock = 'ConfigureMake'
name = 'CMake'
version = '3.23.2'
homepage = 'http://www.cmake.org'
description = """CMake, the cross-platform, open-source build system.
CMake is a family of tools designed to build, test and package software.
"""
toolchain = {'name': 'GCCcore', 'version': '11.1.0'}
source_urls = ['http://www.cmake.org/files/v%(version_major_minor)s']
sources = [SOURCELOWER_TAR_GZ]
checksums = ['f316b40053466f9a416adf981efda41b160ca859e97f6a484b447ea299ff26aa']
configopts = '-- -DCMAKE_USE_OPENSSL=1 -DCMAKE_PREFIX_PATH=$EBROOTNCURSES'
builddependencies = [
('binutils', '2.36.1'),
]
dependencies = [
('ncurses', '6.2'),
# OS dependency should be preferred if the os version is more recent then this version,
# it's nice to have an up to date openssl for security reasons
#('OpenSSL', '1.0.1p'),
]
osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
sanity_check_paths = {
'files': ["bin/%s" % x for x in ['cmake', 'cpack', 'ctest']],
'dirs': [],
}
moduleclass = 'devel'
easyblock = 'ConfigureMake'
name = 'FriBidi'
version = '1.0.12'
homepage = 'https://github.com/fribidi/fribidi'
description = """
The Free Implementation of the Unicode Bidirectional Algorithm.
"""
toolchain = {'name': 'GCCcore', 'version': '11.1.0'}
source_urls = ['https://github.com/%(namelower)s/%(namelower)s/releases/download/v%(version)s']
sources = [SOURCELOWER_TAR_XZ]
checksums = ['0cd233f97fc8c67bb3ac27ce8440def5d3ffacf516765b91c2cc654498293495']
builddependencies = [
('Autotools', '20210330'),
('binutils', '2.36.1'),
('pkgconf', '1.8.0'),
]
configopts = '--disable-docs'
sanity_check_paths = {
'files': ['bin/%(namelower)s', 'include/%(namelower)s/%(namelower)s.h',
'lib/lib%%(namelower)s.%s' % SHLIB_EXT],
'dirs': []
}
moduleclass = 'lang'
easyblock = 'Bundle'
name = 'GTK3'
version = '3.24.34'
homepage = 'https://developer.gnome.org/gtk3/stable/'
description = """GTK+ is the primary library used to construct user interfaces in GNOME. It
provides all the user interface controls, or widgets, used in a common
graphical application. Its object-oriented API allows you to construct
user interfaces without dealing with the low-level details of drawing and
device interaction.
"""
toolchain = {'name': 'GCCcore', 'version': '11.1.0'}
builddependencies = [
('binutils', '2.36.1'),
('Autotools', '20210330'),
('GObject-Introspection', '1.68.0'),
('gettext', '0.21'),
('pkgconf', '1.8.0'),
('cairo', '1.17.4'),
('Perl', '5.32.1'),
]
dependencies = [
('ATK', '2.36.0'),
('AT-SPI2-ATK', '2.38.0'),
('Gdk-Pixbuf', '2.42.0'),
('Pango', '1.48.4'),
('libepoxy', '1.5.7'),
('X11', '20210331'),
('FriBidi', '1.0.12'),
]
default_easyblock = 'ConfigureMake'
default_component_specs = {
'sources': [SOURCELOWER_TAR_XZ],
'start_dir': '%(namelower)s-%(version)s',
}
components = [
('GTK+', version, {
'source_urls': [FTPGNOME_SOURCE],
'configopts': "--disable-silent-rules --disable-glibtest --enable-introspection=yes --disable-visibility ",
'checksums': ['dbc69f90ddc821b8d1441f00374dc1da4323a2eafa9078e61edbe5eeefa852ec'],
}),
('hicolor-icon-theme', '0.17', {
'source_urls': ['https://icon-theme.freedesktop.org/releases/'],
'checksums': ['317484352271d18cbbcfac3868eab798d67fff1b8402e740baa6ff41d588a9d8'],
}),
('adwaita-icon-theme', '42.0', {
'preconfigopts': 'autoreconf -f -i && ',
'source_urls': ['https://ftp.gnome.org/pub/GNOME/sources/%(namelower)s/%(version_major)s'],
'patches': ['adwaita-icon-theme-3.34.3_disable-svg-conversion.patch'],
'checksums': [
'5e85b5adc8dee666900fcaf271ba717f7dcb9d0a03d96dae08f9cbd27e18b1e0',
# adwaita-icon-theme-3.34.3_disable-svg-conversion.patch
'f4b86855d50759ecfc1e8f6550ec0f3a7a4ea2c80b9f5fc1685fe8967d1c5342',
],
}),
]
postinstallcmds = ['gtk-update-icon-cache']
sanity_check_paths = {
'files': ['bin/%s' % x for x in ['gtk3-demo', 'gtk3-demo-application', 'gtk3-icon-browser', 'gtk3-widget-factory',
'gtk-builder-tool', 'gtk-launch', 'gtk-query-immodules-3.0', 'gtk-query-settings',
'gtk-update-icon-cache']] +
['lib/%s-%%(version_major)s.%s' % (x, SHLIB_EXT) for x in ['libgailutil', 'libgdk', 'libgtk']],
'dirs': ['include/%s-%%(version_major)s.0' % x for x in ['gail', 'gtk']] +
['share/icons/hicolor', 'share/icons/Adwaita'],
}
moduleclass = 'vis'
As we don't have SVG support we disable the search for the converter.
Author: Alexander Grund (TU Dresden)
diff -aur a/configure.ac b/configure.ac
--- a/configure.ac 2021-07-16 15:16:15.774630738 +0200
+++ b/configure.ac 2021-07-16 15:15:10.138814059 +0200
@@ -49,7 +49,7 @@
AM_CONDITIONAL(ALLOW_RENDERING, test "x$allow_rendering" = "xyes")
symbolic_encode_sizes="16x16 24x24 32x32 48x48 64x64 96x96"
-AC_PATH_PROG([GTK_ENCODE_SYMBOLIC_SVG], [gtk-encode-symbolic-svg], [false])
+GTK_ENCODE_SYMBOLIC_SVG="false"
if test "x$GTK_ENCODE_SYMBOLIC_SVG" = "xfalse"; then
symbolic_encode_sizes=""
fi
name = 'OpenSSL'
version = '1.1.1o'
homepage = 'https://www.openssl.org/'
description = """The OpenSSL Project is a collaborative effort to develop a robust, commercial-grade, full-featured,
and Open Source toolchain implementing the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1)
protocols as well as a full-strength general purpose cryptography library. """
toolchain = {'name': 'GCCcore', 'version': '11.1.0'}
toolchainopts = {'pic': True}
source_urls = ['https://www.openssl.org/source/']
sources = [SOURCELOWER_TAR_GZ]
# expired certificates
patches = ['https://patch-diff.githubusercontent.com/raw/openssl/openssl/pull/18446.patch']
checksums = ['9384a2b0570dd80358841464677115df785edb941c71211f75076d72fe6b438f']
dependencies = [('zlib', '1.2.11')]
builddependencies = [
('Perl', '5.32.1'),
('binutils', '2.36.1'),
]
runtest = 'test'
moduleclass = 'system'
easyblock = 'Bundle'
name = 'Qt6'
version = '6.3.0'
homepage = 'https://www.qt.io/'
description = """Qt is a comprehensive cross-platform C++ application framework."""
toolchain = {'name': 'GCCcore', 'version': '11.1.0'}
builddependencies = [
('CMake', '3.23.2'),
('Ninja', '1.10.2'),
# ('Vulkan-Headers', '1.3.213'), # Might work without vulkan?
]
dependencies = [
('X11', '20210331'),
('Mesa', '21.0.3'),
('fontconfig', '2.13.93'),
('SQLite', '3.35.3'),
# ('tslib', '1.22'), # Touchscreen access lib, maybe not necessary?
# ('libinput', '1.20.1'), # Let's see if we actually need this
# ('brotli', '1.0.9'),
('double-conversion', '3.1.5'),
# ('libb2', '0.98.1'), # BLAKE2
# ('md4c', '0.4.8'), # C Markdown parser
('PostgreSQL', '13.2'),
('OpenSSL', '1.1.1o'),
# ('MariaDB', '10.8.3'),
('ICU', '68.2'),
('AT-SPI2-core', '2.40.0'), # qtdeclarative
('GTK3', '3.24.34'),
# Might also need gstreamer, gtk3, unixodbc, libfbclient, libproxy, libcups and some others
]
default_easyblock = 'CMakeNinja'
components = [('base', version, {
'source_urls': ['https://download.qt.io/official_releases/qt/6.3/%(version)s/submodules'],
'sources': ['qt%(name)s-everywhere-src-%(version)s.tar.xz'],
'patches': [
('qt6-safe-readallstandarderror.patch', 'qt%(name)s-everywhere-src-%(version)s'), # https://code.qt.io/cgit/qt/qtbase.git/patch/?id=94751cbf
('qt6-fix-centos7.patch', 'qt%(name)s-everywhere-src-%(version)s'), # https://codereview.qt-project.org/c/qt/qtbase/+/405875
('qt6-base-cflags.patch', 'qt%(name)s-everywhere-src-%(version)s'),
('qt6-base-nostrip.patch', 'qt%(name)s-everywhere-src-%(version)s'),
],
'checksums': [
'b865aae43357f792b3b0a162899d9bf6a1393a55c4e5e4ede5316b157b1a0f99',
'cc71e75acbda998a1f8f25ad3abe380886eef34899063344ead4df6a46efbcc9',
'9760bdef0a3a037556ef88d5f6e1f0ec7e790a0f3278f13e3dc392adec2e304e',
'5411edbe215c24b30448fac69bd0ba7c882f545e8cf05027b2b6e2227abc5e78',
'4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094',
],
'srcdir': 'qt%(name)s-everywhere-src-%(version)s',
'configopts': (
" -DINSTALL_BINDIR=lib/qt6/bin "
" -DINSTALL_PUBLICBINDIR=usr/bin "
" -DINSTALL_LIBEXECDIR=lib/qt6 "
" -DINSTALL_DOCDIR=share/doc/qt6 "
" -DINSTALL_ARCHDATADIR=lib/qt6 "
" -DINSTALL_DATADIR=share/qt6 "
" -DINSTALL_INCLUDEDIR=include/qt6 "
" -DINSTALL_MKSPECSDIR=lib/qt6/mkspecs "
" -DINSTALL_EXAMPLESDIR=share/doc/qt6/examples "
" -DQT_FEATURE_openssl_linked=ON "
" -DQT_FEATURE_system_sqlite=ON "
" -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON "
)}),
('shadertools', version, {
'source_urls': ['https://download.qt.io/official_releases/qt/6.3/%(version)s/submodules'],
'sources': ['qt%(name)s-everywhere-src-%(version)s.tar.xz'],
'checksums': [
'5498959b9d37c254bd126ab1320cf86aeb8a31b3ea7e51db666a8f9698afbd6c',
],
'srcdir': 'qt%(name)s-everywhere-src-%(version)s'}),
('languageserver', version, {
'source_urls': ['https://download.qt.io/official_releases/qt/6.3/%(version)s/submodules'],
'sources': ['qt%(name)s-everywhere-src-%(version)s.tar.xz'],
'checksums': [
'70aad8f7060e1e0c40365cb3f0f5f572643a5390f59d8e5a327df6fc0a9eeeaa',
],
'srcdir': 'qt%(name)s-everywhere-src-%(version)s'}),
('declarative', version, {
'source_urls': ['https://download.qt.io/official_releases/qt/6.3/%(version)s/submodules'],
'sources': ['qt%(name)s-everywhere-src-%(version)s.tar.xz'],
'patches': [
('qtdeclarative-fix-qmlls-build.patch', 'qt%(name)s-everywhere-src-%(version)s') # https://code.qt.io/cgit/qt/qtdeclarative.git/patch/?id=95665d84
],
'checksums': [
'd294b029dc2b2d4f65da516fdc3b8088d32643eb7ff77db135a8b9ce904caa37',
'4efef4778b5ac0380c50e5980396d432fe46b4b2f563eed56e2d60b07e88a014',
],
'srcdir': 'qt%(name)s-everywhere-src-%(version)s'}),
('websockets', version, {
'source_urls': ['https://download.qt.io/official_releases/qt/6.3/%(version)s/submodules'],
'sources': ['qt%(name)s-everywhere-src-%(version)s.tar.xz'],
'checksums': [
'e018a09fe960b7d9560d6bbc9d3ca022fed6566e6ba6fc6d869a97482d4e6361',
],
'srcdir': 'qt%(name)s-everywhere-src-%(version)s'}),
]
local_libs = ['Core', 'DBus', 'Gui', 'OpenGL', 'OpenGLWidgets', 'Qml', 'QmlCore', 'Sql', 'Test', 'WebSockets', 'Widgets']
sanity_check_paths = {
'files': ['lib/libQt6%s.%s' % (lib, SHLIB_EXT) for lib in local_libs],
'dirs': ['include/qt6/Qt%s' % dir for dir in local_libs],
}
moduleclass = 'devel'
diff --git a/mkspecs/common/g++-unix.conf b/mkspecs/common/g++-unix.conf
index a493cd5984..41342f5020 100644
--- a/mkspecs/common/g++-unix.conf
+++ b/mkspecs/common/g++-unix.conf
@@ -10,5 +10,6 @@
include(g++-base.conf)
-QMAKE_LFLAGS_RELEASE += -Wl,-O1
+SYSTEM_LDFLAGS = $$(LDFLAGS)
+!isEmpty(SYSTEM_LDFLAGS) { eval(QMAKE_LFLAGS_RELEASE += $$(LDFLAGS)) } else { QMAKE_LFLAGS_RELEASE += -Wl,-O1 }
QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined
diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
index 1f919d270a..7ef6046326 100644
--- a/mkspecs/common/gcc-base.conf
+++ b/mkspecs/common/gcc-base.conf
@@ -40,9 +40,11 @@ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Os
QMAKE_CFLAGS_DEPS += -M
QMAKE_CFLAGS_WARN_ON += -Wall -Wextra
QMAKE_CFLAGS_WARN_OFF += -w
-QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE
-QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g
-QMAKE_CFLAGS_DEBUG += -g
+SYSTEM_CFLAGS = $$(CFLAGS)
+SYSTEM_DEBUG_CFLAGS = $$(DEBUG_CFLAGS)
+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE += $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
+!isEmpty(SYSTEM_CFLAGS) { eval(QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CFLAGS)) } else { QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
+!isEmpty(SYSTEM_DEBUG_CFLAGS) { eval(QMAKE_CFLAGS_DEBUG += $$(DEBUG_CFLAGS)) } else { QMAKE_CFLAGS_DEBUG += -g }
QMAKE_CFLAGS_SHLIB += $$QMAKE_CFLAGS_PIC
QMAKE_CFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_PIC
QMAKE_CFLAGS_APP += $$QMAKE_CFLAGS_PIC
@@ -59,9 +61,11 @@ QMAKE_CXXFLAGS += $$QMAKE_CFLAGS
QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS
QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON
QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF
-QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_RELEASE
-QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
-QMAKE_CXXFLAGS_DEBUG += $$QMAKE_CFLAGS_DEBUG
+SYSTEM_CXXFLAGS = $$(CXXFLAGS)
+SYSTEM_DEBUG_CXXFLAGS = $$(DEBUG_CXXFLAGS)
+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE += $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_OPTIMIZE }
+!isEmpty(SYSTEM_CXXFLAGS) { eval(QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g $$(CXXFLAGS)) } else { QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_OPTIMIZE -g }
+!isEmpty(SYSTEM_DEBUG_CXXFLAGS) { eval(QMAKE_CXXFLAGS_DEBUG += $$(DEBUG_CXXFLAGS)) } else { QMAKE_CXXFLAGS_DEBUG += -g }
QMAKE_CXXFLAGS_SHLIB += $$QMAKE_CFLAGS_SHLIB
QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB
QMAKE_CXXFLAGS_APP += $$QMAKE_CFLAGS_APP
diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
index 99d77156fd..fc840fe9f6 100644
--- a/mkspecs/common/gcc-base.conf
+++ b/mkspecs/common/gcc-base.conf
@@ -31,6 +31,8 @@
# you can use the manual test in tests/manual/mkspecs.
#
+CONFIG += nostrip
+
QMAKE_CFLAGS_OPTIMIZE = -O2
QMAKE_CFLAGS_OPTIMIZE_FULL = -O3
QMAKE_CFLAGS_OPTIMIZE_DEBUG = -Og
From f41cebbe5e826ba5d6f0820b01f8fad49cf865b8 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 12 Apr 2022 14:02:36 +0400
Subject: [PATCH] Fix build on CentOS 7
This little change fixes the build on CentOS 7
Change-Id: Ic9717147c10ca78e36d6311944de417c6420211d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 311d29d2261a7e0689340c4c1322138f8234da7b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
diff --git a/src/corelib/plugin/qelfparser_p.cpp b/src/corelib/plugin/qelfparser_p.cpp
index c6ccda9..def1e24 100644
--- a/src/corelib/plugin/qelfparser_p.cpp
+++ b/src/corelib/plugin/qelfparser_p.cpp
@@ -409,7 +409,9 @@
case EM_NONE: d << ", no machine"; break;
case EM_ARM: d << ", ARM"; break;
case EM_AARCH64: d << ", AArch64"; break;
+#ifdef EM_BLACKFIN
case EM_BLACKFIN: d << ", Blackfin"; break;
+#endif
case EM_IA_64: d << ", IA-64"; break;
case EM_MIPS: d << ", MIPS"; break;
case EM_PPC: d << ", PowerPC"; break;
From 94751cbfb54f98cf1b1be14c6e22a8b93547a177 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Thu, 31 Mar 2022 11:34:29 +0200
Subject: Ensure that readAllStandardError() doesn't crash on assert
Ensure that it's safe to call readAllStandardError()
when process channel mode is set to MergedChannels.
Task-number: QTBUG-102177
Task-number: QTCREATORBUG-27196
Change-Id: I01073255d9347dee4654d602802a12d341372b73
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit b49f7e064c648f7de9782f1a5bbd652429db8e5b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
src/corelib/io/qprocess.cpp | 14 ++++++++++----
tests/auto/corelib/io/qprocess/tst_qprocess.cpp | 10 ++++++++++
2 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp
index 3378412502..6d85d1e87e 100644
--- a/src/corelib/io/qprocess.cpp
+++ b/src/corelib/io/qprocess.cpp
@@ -1942,10 +1942,16 @@ QByteArray QProcess::readAllStandardOutput()
*/
QByteArray QProcess::readAllStandardError()
{
- ProcessChannel tmp = readChannel();
- setReadChannel(StandardError);
- QByteArray data = readAll();
- setReadChannel(tmp);
+ Q_D(QProcess);
+ QByteArray data;
+ if (d->processChannelMode == MergedChannels) {
+ qWarning("QProcess::readAllStandardError: Called with MergedChannels");
+ } else {
+ ProcessChannel tmp = readChannel();
+ setReadChannel(StandardError);
+ data = readAll();
+ setReadChannel(tmp);
+ }
return data;
}
diff --git a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp
index 80005a7284..16b7dc666f 100644
--- a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp
+++ b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp
@@ -1082,6 +1082,16 @@ void tst_QProcess::mergedChannels()
QVERIFY(process.waitForStarted(5000));
+ {
+ QCOMPARE(process.write("abc"), qlonglong(3));
+ while (process.bytesAvailable() < 6)
+ QVERIFY(process.waitForReadyRead(5000));
+ QCOMPARE(process.readAllStandardOutput(), QByteArray("aabbcc"));
+ QTest::ignoreMessage(QtWarningMsg,
+ "QProcess::readAllStandardError: Called with MergedChannels");
+ QCOMPARE(process.readAllStandardError(), QByteArray());
+ }
+
for (int i = 0; i < 100; ++i) {
QCOMPARE(process.write("abc"), qlonglong(3));
while (process.bytesAvailable() < 6)
--
cgit v1.2.1
From 95665d84fbe3f0a8ef47458bfbd7a3b8837869bc Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <christophe@krop.fr>
Date: Sun, 27 Mar 2022 11:33:31 +0200
Subject: CMake: Look for QtLanguageServerPrivate
The module was renamed to match the CMake target name.
Change-Id: I67e2191b91ed2293dc652432c0fd786d43052cf4
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 9ebd7caa207ad211dc20df66868d53adb0f6a3c7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7269350837..f3bf7d25cd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,7 @@ project(QtDeclarative # special case
)
find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core) # special case
-find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS Gui Network Widgets OpenGL OpenGLWidgets Sql Concurrent Test LanguageServer)
+find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS Gui Network Widgets OpenGL OpenGLWidgets Sql Concurrent Test LanguageServerPrivate)
# Set up QT_HOST_PATH as an extra root path to look for the ShaderToolsTools package
# when cross-compiling.
--
cgit v1.2.1
......@@ -39,7 +39,7 @@ dependencies = [
('Tcl', '8.6.11'),
]
parallel = 1
buildopts = 'CC="$CC" CFLAGS="$CFLAGS -DSQLITE_ENABLE_COLUMN_METADATA"'
sanity_check_paths = {
'files': ['bin/sqlite3', 'include/sqlite3ext.h', 'include/sqlite3.h', 'lib/libsqlite3.a', 'lib/libsqlite3.%s' % SHLIB_EXT],
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment