@@ -203,23 +203,20 @@ endef
203
203
#
204
204
# 1. Apply our patches to the extracted source. See each patch for more info.
205
205
#
206
- # 2. Point to lrelease in qttools/bin/lrelease; otherwise Qt will look for it in
207
- # $(host)/native/bin/lrelease and not find it.
206
+ # 2. Create a macOS-Clang-Linux mkspec using our mac-qmake.conf.
208
207
#
209
- # 3. Create a macOS-Clang-Linux mkspec using our mac-qmake.conf.
210
- #
211
- # 4. After making a copy of the mkspec for the linux-arm-gnueabi host, named
208
+ # 3. After making a copy of the mkspec for the linux-arm-gnueabi host, named
212
209
# bitcoin-linux-g++, replace instances of linux-arm-gnueabi with $(host). This
213
210
# way we can generically support hosts like riscv64-linux-gnu, which Qt doesn't
214
211
# ship a mkspec for. See it's usage in config_opts_* above.
215
212
#
216
- # 5 . Put our C, CXX and LD FLAGS into gcc-base.conf. Only used for non-host builds.
213
+ # 4 . Put our C, CXX and LD FLAGS into gcc-base.conf. Only used for non-host builds.
217
214
#
218
- # 6 . Do similar for the win32-g++ mkspec.
215
+ # 5 . Do similar for the win32-g++ mkspec.
219
216
#
220
- # 7 . In clang.conf, swap out clang & clang++, for our compiler + flags. See #17466.
217
+ # 6 . In clang.conf, swap out clang & clang++, for our compiler + flags. See #17466.
221
218
#
222
- # 8 . Adjust a regex in toolchain.prf, to accommodate Guix's usage of
219
+ # 7 . Adjust a regex in toolchain.prf, to accommodate Guix's usage of
223
220
# CROSS_LIBRARY_PATH. See #15277.
224
221
define $(package)_preprocess_cmds
225
222
cp $($(package ) _patch_dir) /qt.pro qt.pro && \
@@ -235,7 +232,6 @@ define $(package)_preprocess_cmds
235
232
patch -p1 -i $($(package ) _patch_dir) /fix_lib_paths.patch && \
236
233
patch -p1 -i $($(package ) _patch_dir) /qtbase-moc-ignore-gcc-macro.patch && \
237
234
patch -p1 -i $($(package ) _patch_dir) /fix_limits_header.patch && \
238
- sed -i.old "s|updateqm.commands = \$$$$\$$$$LRELEASE|updateqm.commands = $($(package ) _extract_dir) /qttools/bin/lrelease|" qttranslations/translations/translations.pro && \
239
235
mkdir -p qtbase/mkspecs/macx-clang-linux &&\
240
236
cp -f qtbase/mkspecs/macx-clang/qplatformdefs.h qtbase/mkspecs/macx-clang-linux/ &&\
241
237
cp -f $($(package ) _patch_dir) /mac-qmake.conf qtbase/mkspecs/macx-clang-linux/qmake.conf && \
0 commit comments