Skip to content

Commit c883653

Browse files
author
MarcoFalke
committed
Merge #13750: depends: use MacOS friendly sed syntax in qt.mk
12c93cb depends: use MacOS friendly sed syntax in qt.mk (Sjors Provoost) Pull request description: I just got this error on master: ``` make clean-all make -j5 [...] /bitcoin/depends/sources/qttools-opensource-src-5.9.6.tar.xz: OK Preprocessing qt... sed: 1: "qtbase/mkspecs/bitcoin- ...": extra characters at the end of q command make: *** /bitcoin/depends/work/build/x86_64-apple-darwin17.7.0/qt/5.9.6-b48df1b490b/.stamp_preprocessed] Error 1 ``` Tree-SHA512: 1eaee535c0d637a67801c7dd48e9cd5a037823f4e162a6f50e375787045fdb95929f409a88c7d000d8781a4edc497b5ccb1fd23a24e29324ec633157fadd371e
2 parents cf7f9ae + 12c93cb commit c883653

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

depends/packages/qt.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ define $(package)_preprocess_cmds
129129
cp -f qtbase/mkspecs/macx-clang/qplatformdefs.h qtbase/mkspecs/macx-clang-linux/ &&\
130130
cp -f $($(package)_patch_dir)/mac-qmake.conf qtbase/mkspecs/macx-clang-linux/qmake.conf && \
131131
cp -r qtbase/mkspecs/linux-arm-gnueabi-g++ qtbase/mkspecs/bitcoin-linux-g++ && \
132-
sed -i s/arm-linux-gnueabi-/$(host)-/g qtbase/mkspecs/bitcoin-linux-g++/qmake.conf && \
132+
sed -i.old "s/arm-linux-gnueabi-/$(host)-/g" qtbase/mkspecs/bitcoin-linux-g++/qmake.conf && \
133133
patch -p1 -i $($(package)_patch_dir)/fix_qt_pkgconfig.patch &&\
134134
patch -p1 -i $($(package)_patch_dir)/fix_configure_mac.patch &&\
135135
patch -p1 -i $($(package)_patch_dir)/fix_no_printer.patch &&\

0 commit comments

Comments
 (0)