@@ -21,6 +21,7 @@ $(package)_patches += use_android_ndk23.patch
21
21
$(package)_patches += rcc_hardcode_timestamp.patch
22
22
$(package)_patches += duplicate_lcqpafonts.patch
23
23
$(package)_patches += fast_fixed_dtoa_no_optimize.patch
24
+ $(package)_patches += guix_cross_lib_path.patch
24
25
25
26
$(package)_qttranslations_file_name =qttranslations-$($(package ) _suffix)
26
27
$(package)_qttranslations_sha256_hash =c92af4171397a0ed272330b4fa0669790fcac8d050b07c8b8cc565ebeba6735e
@@ -252,6 +253,7 @@ define $(package)_preprocess_cmds
252
253
patch -p1 -i $($(package ) _patch_dir) /rcc_hardcode_timestamp.patch && \
253
254
patch -p1 -i $($(package ) _patch_dir) /duplicate_lcqpafonts.patch && \
254
255
patch -p1 -i $($(package ) _patch_dir) /fast_fixed_dtoa_no_optimize.patch && \
256
+ patch -p1 -i $($(package ) _patch_dir) /guix_cross_lib_path.patch && \
255
257
mkdir -p qtbase/mkspecs/macx-clang-linux &&\
256
258
cp -f qtbase/mkspecs/macx-clang/qplatformdefs.h qtbase/mkspecs/macx-clang-linux/ &&\
257
259
cp -f $($(package ) _patch_dir) /mac-qmake.conf qtbase/mkspecs/macx-clang-linux/qmake.conf && \
@@ -261,8 +263,7 @@ define $(package)_preprocess_cmds
261
263
echo "!host_build: QMAKE_CXXFLAGS += $($(package ) _cxxflags) $($(package ) _cppflags) " >> qtbase/mkspecs/common/gcc-base.conf && \
262
264
echo "!host_build: QMAKE_LFLAGS += $($(package ) _ldflags) " >> qtbase/mkspecs/common/gcc-base.conf && \
263
265
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
266
267
endef
267
268
268
269
define $(package)_config_cmds
0 commit comments