build, qt, refactor: Get rid of some sed command instances #21593
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
|
Concept ACK. Removing more If this is a no-op then you should also be able to show that before and after (Windows) builds of the Qt libs are identical. Is this still a work in progress? |
Member
Author
You are right. The hashes of unarchived contents of the built Qt packages for master (590e49c) and this PR (b95f7f8) are identical.
Ready for review now. |
fanquake
approved these changes
May 12, 2021
Member
fanquake
left a comment
fanquake
left a comment
There was a problem hiding this comment.
ACK b95f7f8
Did a Guix build with master (6754e19) and compared that to master (6754e19) + b95f7f8. The diff in the bitcoin-qt.exes produced was just the following:
@@ -7,15 +7,15 @@
00000060: 7420 6265 2072 756e 2069 6e20 444f 5320 t be run in DOS
00000070: 6d6f 6465 2e0d 0d0a 2400 0000 0000 0000 mode....$.......
00000080: 5045 0000 6486 0e00 0000 0000 0082 e601 PE..d...........
00000090: 0000 0000 f000 2e00 0b02 0222 00e6 4501 ..........."..E.
000000a0: 007c e601 0018 0100 b014 0000 0010 0000 .|..............
000000b0: 0000 4000 0000 0000 0010 0000 0002 0000 ..@.............
000000c0: 0400 0000 0000 0000 0600 0100 0000 0000 ................
-000000d0: 0020 e801 0004 0000 ae64 e701 0200 6001 . .......d....`.
+000000d0: 0020 e801 0004 0000 daf3 e601 0200 6001 . ............`.
000000e0: 0000 2000 0000 0000 0010 0000 0000 0000 .. .............
000000f0: 0000 1000 0000 0000 0010 0000 0000 0000 ................
00000100: 0000 0000 1000 0000 0030 e401 2509 0000 .........0..%...
00000110: 0040 e401 6c6c 0000 00d0 e401 f0c9 0100 [email protected]..........
00000120: 0020 c701 a4e8 0900 0000 0000 0000 0000 . ..............
00000130: 00a0 e601 6462 0100 0000 0000 0000 0000 ....db..........
00000140: 0000 0000 0000 0000 0000 0000 0000 0000 ................
@@ -1624806,17 +1624806,17 @@
018cae50: 2e25 6400 2f00 3a00 7469 6e79 666f 726d .%d./.:.tinyform
018cae60: 6174 3a20 4e6f 7420 656e 6f75 6768 2063 at: Not enough c
018cae70: 6f6e 7665 7273 696f 6e20 7370 6563 6966 onversion specif
018cae80: 6965 7273 2069 6e20 666f 726d 6174 2073 iers in format s
018cae90: 7472 696e 6700 6d5f 666f 726d 6174 496d tring.m_formatIm
018caea0: 706c 0028 003b 2000 2900 5361 746f 7368 pl.(.; .).Satosh
018caeb0: 6900 0000 0000 0000 7632 312e 3939 2e30 i.......v21.99.0
-018caec0: 2d67 3832 6363 6138 3336 3139 3134 3539 -g82cca836191459
-018caed0: 6365 6431 6338 3562 6233 3764 3737 3036 ced1c85bb37d7706
-018caee0: 6139 3330 3733 3238 3864 0000 0000 0000 a93073288d......
+018caec0: 2d67 3637 3534 6531 3932 3862 3030 3866 -g6754e1928b008f
+018caed0: 6230 3565 6266 3737 6362 3639 3533 3436 b05ebf77cb695346
+018caee0: 6537 6566 3038 3631 6136 0000 0000 0000 e7ef0861a6......
018caef0: 6765 6e65 7269 6300 7379 7374 656d 004d generic.system.M
018caf00: 6573 7361 6765 2074 6578 7420 756e 6176 essage text unav
018caf10: 6169 6c61 626c 6500 556e 6b6e 6f77 6e20 ailable.Unknown
018caf20: 6572 726f 7200 6261 7369 635f 7374 7269 error.basic_stri
018caf30: 6e67 3a3a 5f4d 5f63 7265 6174 6500 556e ng::_M_create.Un
018caf40: 6b6e 6f77 6e20 6572 726f 7220 2825 6429 known error (%d)
018caf50: 0066 732e 6370 7000 6261 7365 2e69 735f .fs.cpp.base.is_
@@ -1992699,15 +1992699,15 @@
01e67fa0: 0000 0000 0000 0000 0000 0000 0000 0000 ................
01e67fb0: 0000 0000 0000 0000 0000 0000 0000 0000 ................
01e67fc0: 0000 0000 0000 0000 0000 0000 0000 0000 ................
01e67fd0: 0000 0000 0000 0000 0000 0000 0000 0000 ................
01e67fe0: 0000 0000 0000 0000 0000 0000 0000 0000 ................
01e67ff0: 0000 0000 0000 0000 0000 0000 0000 0000 ................
01e68000: 6269 7463 6f69 6e2d 7174 2e65 7865 2e64 bitcoin-qt.exe.d
-01e68010: 6267 0000 1407 6ae7 0000 0000 0000 0000 bg....j.........
+01e68010: 6267 0000 bf5c d8fd 0000 0000 0000 0000 bg...\..........
01e68020: 0000 0000 0000 0000 0000 0000 0000 0000 ................
01e68030: 0000 0000 0000 0000 0000 0000 0000 0000 ................
01e68040: 0000 0000 0000 0000 0000 0000 0000 0000 ................
01e68050: 0000 0000 0000 0000 0000 0000 0000 0000 ................
01e68060: 0000 0000 0000 0000 0000 0000 0000 0000 ................
01e68070: 0000 0000 0000 0000 0000 0000 0000 0000 ................
01e68080: 0000 0000 0000 0000 0000 0000 0000 0000 ................
sidhujag
pushed a commit
to syscoin/syscoin
that referenced
this pull request
May 12, 2021
… instances b95f7f8 build, qt, refactor: Drop sed commands for win32-g++/qmake.conf (Hennadii Stepanov) Pull request description: Such possibility is [available](https://codereview.qt-project.org/c/qt/qtbase/+/165348) since Qt 5.8.0. ACKs for top commit: fanquake: ACK b95f7f8 Tree-SHA512: e56a3d208a6bd5d42c722f8b344010fe7d1b6f7a28486613dfcb03f0403a47cee8476e2366eeaac401a19836cd09f782e8741a1e781ab4d78f72c500a30e4929
PastaPastaPasta
pushed a commit
to PastaPastaPasta/dash
that referenced
this pull request
Apr 28, 2022
… instances b95f7f8 build, qt, refactor: Drop sed commands for win32-g++/qmake.conf (Hennadii Stepanov) Pull request description: Such possibility is [available](https://codereview.qt-project.org/c/qt/qtbase/+/165348) since Qt 5.8.0. ACKs for top commit: fanquake: ACK b95f7f8 Tree-SHA512: e56a3d208a6bd5d42c722f8b344010fe7d1b6f7a28486613dfcb03f0403a47cee8476e2366eeaac401a19836cd09f782e8741a1e781ab4d78f72c500a30e4929
gwillen
pushed a commit
to ElementsProject/elements
that referenced
this pull request
Jun 1, 2022
laanwj
added a commit
to bitcoin-core/gui
that referenced
this pull request
Jun 20, 2022
…on for `mingw32` host 71d33bf build, qt: Fix `QMAKE_CXXFLAGS` expression for `mingw32` host (Hennadii Stepanov) Pull request description: A "copy-paste typo" was introduced in bitcoin/bitcoin#21593. I'm sorry about that. ACKs for top commit: laanwj: Code review ACK 71d33bf Tree-SHA512: 9433d9e51d7772d4ac1579aab75d184bb486e575ec216933b1a5171b0b68718943c96bd3669fe239b1d1ed17ec82bc5d14e777d4ff8b6fae370352864da88534
sidhujag
pushed a commit
to syscoin/syscoin
that referenced
this pull request
Jun 20, 2022
…mingw32` host 71d33bf build, qt: Fix `QMAKE_CXXFLAGS` expression for `mingw32` host (Hennadii Stepanov) Pull request description: A "copy-paste typo" was introduced in bitcoin#21593. I'm sorry about that. ACKs for top commit: laanwj: Code review ACK 71d33bf Tree-SHA512: 9433d9e51d7772d4ac1579aab75d184bb486e575ec216933b1a5171b0b68718943c96bd3669fe239b1d1ed17ec82bc5d14e777d4ff8b6fae370352864da88534
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Such possibility is available since Qt 5.8.0.