diff options
| author | Wladimir J. van der Laan <laanwj@protonmail.com> | 2019-09-26 13:19:16 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@protonmail.com> | 2019-09-26 13:19:20 +0200 |
| commit | 003f2d20b1c7403689286ee96f1dec80075c2cdd (patch) | |
| tree | 06fda02c7a8dcb34d5c40d2a76d36cb876f2c6be | |
| parent | fdfaeb67de3694b436656f57ff65f1dc94b893f0 (diff) | |
| parent | 1b4030e26450b0f9320d64714d8e8dee37b050d2 (diff) | |
| download | bitcoin-003f2d20b1c7403689286ee96f1dec80075c2cdd.tar.xz | |
Merge #16837: depends: qt: Fix {C{,XX},LD}FLAGS pickup
1b4030e26450b0f9320d64714d8e8dee37b050d2 depends: qt: Fix LDFLAGS pickup (Carl Dong)
6eb12ffcbdca53fac304d8fedcfc69effab63b0d depends: qt: Fix C{,XX}FLAGS pickup (Carl Dong)
Pull request description:
Note: ~~Will~~ [Did](https://github.com/bitcoin/bitcoin/issues/16838) open issue about robustness of `sed` calls in `depends`.
ACKs for top commit:
laanwj:
ACK 1b4030e26450b0f9320d64714d8e8dee37b050d2
Tree-SHA512: d0bfc8ea32118cd90bb323efab58661f2218a2cb0f150e716cfd5355c7e2a1eba70298a144b159941248170e2894659c376219edac2c79a9d777f6ada5fa6b2f
| -rw-r--r-- | depends/packages/qt.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk index 56045ade50..f4832b6168 100644 --- a/depends/packages/qt.mk +++ b/depends/packages/qt.mk @@ -176,9 +176,9 @@ define $(package)_preprocess_cmds patch -p1 -i $($(package)_patch_dir)/no-xlib.patch &&\ echo "QMAKE_LINK_OBJECT_MAX = 10" >> qtbase/mkspecs/win32-g++/qmake.conf &&\ echo "QMAKE_LINK_OBJECT_SCRIPT = object_script" >> qtbase/mkspecs/win32-g++/qmake.conf &&\ - sed -i.old "s|QMAKE_CFLAGS = |!host_build: QMAKE_CFLAGS = $($(package)_cflags) $($(package)_cppflags) |" qtbase/mkspecs/win32-g++/qmake.conf && \ - sed -i.old "s|QMAKE_LFLAGS = |!host_build: QMAKE_LFLAGS = $($(package)_ldflags) |" qtbase/mkspecs/win32-g++/qmake.conf && \ - sed -i.old "s|QMAKE_CXXFLAGS = |!host_build: QMAKE_CXXFLAGS = $($(package)_cxxflags) $($(package)_cppflags) |" qtbase/mkspecs/win32-g++/qmake.conf && \ + sed -i.old "s|QMAKE_CFLAGS += |!host_build: QMAKE_CFLAGS = $($(package)_cflags) $($(package)_cppflags) |" qtbase/mkspecs/win32-g++/qmake.conf && \ + sed -i.old "s|QMAKE_CXXFLAGS += |!host_build: QMAKE_CXXFLAGS = $($(package)_cxxflags) $($(package)_cppflags) |" qtbase/mkspecs/win32-g++/qmake.conf && \ + sed -i.old "0,/^QMAKE_LFLAGS_/s|^QMAKE_LFLAGS_|!host_build: QMAKE_LFLAGS = $($(package)_ldflags)\n&|" qtbase/mkspecs/win32-g++/qmake.conf && \ sed -i.old "s/LIBRARY_PATH/(CROSS_)?\0/g" qtbase/mkspecs/features/toolchain.prf endef |