Skip to content

Commit fd0e8df

Browse files
fanquakehebasto
authored andcommitted
qt: use patch over sed for guix CROSS_LIBRARY_PATH change
1 parent ecb617f commit fd0e8df

File tree

2 files changed

+20
-2
lines changed

2 files changed

+20
-2
lines changed

depends/packages/qt.mk

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ $(package)_patches += use_android_ndk23.patch
2121
$(package)_patches += rcc_hardcode_timestamp.patch
2222
$(package)_patches += duplicate_lcqpafonts.patch
2323
$(package)_patches += fast_fixed_dtoa_no_optimize.patch
24+
$(package)_patches += guix_cross_lib_path.patch
2425

2526
$(package)_qttranslations_file_name=qttranslations-$($(package)_suffix)
2627
$(package)_qttranslations_sha256_hash=c92af4171397a0ed272330b4fa0669790fcac8d050b07c8b8cc565ebeba6735e
@@ -252,6 +253,7 @@ define $(package)_preprocess_cmds
252253
patch -p1 -i $($(package)_patch_dir)/rcc_hardcode_timestamp.patch && \
253254
patch -p1 -i $($(package)_patch_dir)/duplicate_lcqpafonts.patch && \
254255
patch -p1 -i $($(package)_patch_dir)/fast_fixed_dtoa_no_optimize.patch && \
256+
patch -p1 -i $($(package)_patch_dir)/guix_cross_lib_path.patch && \
255257
mkdir -p qtbase/mkspecs/macx-clang-linux &&\
256258
cp -f qtbase/mkspecs/macx-clang/qplatformdefs.h qtbase/mkspecs/macx-clang-linux/ &&\
257259
cp -f $($(package)_patch_dir)/mac-qmake.conf qtbase/mkspecs/macx-clang-linux/qmake.conf && \
@@ -261,8 +263,7 @@ define $(package)_preprocess_cmds
261263
echo "!host_build: QMAKE_CXXFLAGS += $($(package)_cxxflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
262264
echo "!host_build: QMAKE_LFLAGS += $($(package)_ldflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
263265
sed -i.old "s|QMAKE_CC = \$$$$\$$$${CROSS_COMPILE}clang|QMAKE_CC = $($(package)_cc)|" qtbase/mkspecs/common/clang.conf && \
264-
sed -i.old "s|QMAKE_CXX = \$$$$\$$$${CROSS_COMPILE}clang++|QMAKE_CXX = $($(package)_cxx)|" qtbase/mkspecs/common/clang.conf && \
265-
sed -i.old "s/LIBRARY_PATH/(CROSS_)?\0/g" qtbase/mkspecs/features/toolchain.prf
266+
sed -i.old "s|QMAKE_CXX = \$$$$\$$$${CROSS_COMPILE}clang++|QMAKE_CXX = $($(package)_cxx)|" qtbase/mkspecs/common/clang.conf
266267
endef
267268

268269
define $(package)_config_cmds
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
Facilitate guix building with CROSS_LIBRARY_PATH
2+
3+
See discussion in https://github.com/bitcoin/bitcoin/pull/15277.
4+
5+
--- a/qtbase/mkspecs/features/toolchain.prf
6+
+++ b/qtbase/mkspecs/features/toolchain.prf
7+
@@ -231,8 +231,8 @@ isEmpty($${target_prefix}.INCDIRS) {
8+
add_libraries = false
9+
for (line, output) {
10+
line ~= s/^[ \\t]*// # remove leading spaces
11+
- contains(line, "LIBRARY_PATH=.*") {
12+
- line ~= s/^LIBRARY_PATH=// # remove leading LIBRARY_PATH=
13+
+ contains(line, "(CROSS_)?LIBRARY_PATH=.*") {
14+
+ line ~= s/^(CROSS_)?LIBRARY_PATH=// # remove leading (CROSS_)?LIBRARY_PATH=
15+
equals(QMAKE_HOST.os, Windows): \
16+
paths = $$split(line, ;)
17+
else: \

0 commit comments

Comments
 (0)