Skip to content

Commit ed0e1fc

Browse files
committed
depends: auto-detect Qt version for toolchain
1 parent 24f0e37 commit ed0e1fc

File tree

3 files changed

+38
-0
lines changed

3 files changed

+38
-0
lines changed

depends/Makefile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,10 @@ meta_depends = Makefile config.guess config.sub funcs.mk builders/default.mk hos
190190

191191
include funcs.mk
192192

193+
# Extract Qt major version
194+
include packages/qt_details.mk
195+
qt_major_version:=$(firstword $(subst ., ,$(qt_details_version)))
196+
193197
final_build_id_long+=$(shell $(build_SHA256SUM) toolchain.cmake.in)
194198
final_build_id+=$(shell echo -n "$(final_build_id_long)" | $(build_SHA256SUM) | cut -c-$(HASH_LENGTH))
195199
$(host_prefix)/.stamp_$(final_build_id): $(native_packages) $(packages)
@@ -235,6 +239,7 @@ $(host_prefix)/toolchain.cmake : toolchain.cmake.in $(host_prefix)/.stamp_$(fina
235239
-e 's|@LDFLAGS_RELEASE@|$(strip $(host_release_LDFLAGS))|' \
236240
-e 's|@LDFLAGS_DEBUG@|$(strip $(host_debug_LDFLAGS))|' \
237241
-e 's|@qt_packages@|$(qt_packages_)|' \
242+
-e 's|@qt_major_version@|$(qt_major_version)|' \
238243
-e 's|@qrencode_packages@|$(qrencode_packages_)|' \
239244
-e 's|@zmq_packages@|$(zmq_packages_)|' \
240245
-e 's|@wallet_packages@|$(wallet_packages_)|' \
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
package=libxcb_util_cursor
2+
$(package)_version=0.1.4
3+
$(package)_download_path=https://xcb.freedesktop.org/dist
4+
$(package)_file_name=xcb-util-cursor-$($(package)_version).tar.gz
5+
$(package)_sha256_hash=28dcfe90bcab7b3561abe0dd58eb6832aa9cc77b723753e1cb42dde3f023f057
6+
$(package)_dependencies=libxcb libxcb_util_render libxcb_util_image
7+
8+
define $(package)_set_vars
9+
$(package)_config_opts = --disable-shared --disable-devel-docs --without-doxygen
10+
$(package)_config_opts += --disable-dependency-tracking --enable-option-checking
11+
endef
12+
13+
define $(package)_preprocess_cmds
14+
cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub .
15+
endef
16+
17+
define $(package)_config_cmds
18+
$($(package)_autoconf)
19+
endef
20+
21+
define $(package)_build_cmds
22+
$(MAKE)
23+
endef
24+
25+
define $(package)_stage_cmds
26+
$(MAKE) DESTDIR=$($(package)_staging_dir) install
27+
endef
28+
29+
define $(package)_postprocess_cmds
30+
rm -rf share/man share/doc lib/*.la
31+
endef

depends/toolchain.cmake.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,8 @@ if("${qt_packages}" STREQUAL "")
122122
set(BUILD_GUI OFF CACHE BOOL "")
123123
else()
124124
set(BUILD_GUI ON CACHE BOOL "")
125+
# Set Qt version based on the depends build
126+
set(WITH_QT_VERSION "@qt_major_version@" CACHE STRING "")
125127
endif()
126128

127129
set(qrencode_packages @qrencode_packages@)

0 commit comments

Comments
 (0)