diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2018-07-25 06:59:08 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2018-07-25 06:59:10 -0400 |
| commit | c8836532024fa841d88dae6de91d662aba0f0cb7 (patch) | |
| tree | 875985bccf8d41ecc490902eec819b751e46eed1 /depends | |
| parent | cf7f9ae34e66450c23173f04012b3cabb5da6dc3 (diff) | |
| parent | 12c93cb85b6cb075d22323ff02acebbe05e42375 (diff) | |
| download | bitcoin-c8836532024fa841d88dae6de91d662aba0f0cb7.tar.xz | |
Merge #13750: depends: use MacOS friendly sed syntax in qt.mk
12c93cb85b 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
Diffstat (limited to 'depends')
| -rw-r--r-- | depends/packages/qt.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk index 22cf4f515b..c7982d4523 100644 --- a/depends/packages/qt.mk +++ b/depends/packages/qt.mk @@ -129,7 +129,7 @@ define $(package)_preprocess_cmds cp -f qtbase/mkspecs/macx-clang/qplatformdefs.h qtbase/mkspecs/macx-clang-linux/ &&\ cp -f $($(package)_patch_dir)/mac-qmake.conf qtbase/mkspecs/macx-clang-linux/qmake.conf && \ cp -r qtbase/mkspecs/linux-arm-gnueabi-g++ qtbase/mkspecs/bitcoin-linux-g++ && \ - sed -i s/arm-linux-gnueabi-/$(host)-/g qtbase/mkspecs/bitcoin-linux-g++/qmake.conf && \ + sed -i.old "s/arm-linux-gnueabi-/$(host)-/g" qtbase/mkspecs/bitcoin-linux-g++/qmake.conf && \ patch -p1 -i $($(package)_patch_dir)/fix_qt_pkgconfig.patch &&\ patch -p1 -i $($(package)_patch_dir)/fix_configure_mac.patch &&\ patch -p1 -i $($(package)_patch_dir)/fix_no_printer.patch &&\ |