Skip to content

backport: merge bitcoin#25643, #23583, #23618, #23603, #23817, #24520, #24508, #25639, #26018, #25437, #25484, #23585, #24549, #24733, #21991, #22526, #25633, #24597, #24955, #25099, #24552, #21851, #25389, #25357, partial #22318 (guix backports: part 3)#5426

Merged
PastaPastaPasta merged 26 commits into
dashpay:developfrom
kwvg:guix_p3
Jun 29, 2023
Merged

Conversation

@kwvg
Copy link
Copy Markdown
Collaborator

@kwvg kwvg commented Jun 11, 2023 •
edited
Loading

@kwvg kwvg changed the base branch from master to develop June 11, 2023 15:39
This was referenced Jun 11, 2023
Merged
Merged
@github-actions
Copy link
Copy Markdown

github-actions Bot commented Jun 18, 2023

This pull request has conflicts, please rebase.

@kwvg kwvg changed the title backport: merge bitcoin#24508, #25639, #26018, #25437, #25484, #25357, #27029, #22930, #27668 (guix backports: part 3) backport: merge bitcoin#23603, #23817, #24520, #24508, #25639, #26018, #25437, #25484, #23585, #24549, #24733, #24597, #24955, #25099, #24603, #24552, #21851, #25389, #24031, #25357 (guix backports: part 3) Jun 20, 2023
@kwvg kwvg force-pushed the guix_p3 branch 3 times, most recently from d691505 to 3b1f55a Compare June 20, 2023 10:39
@kwvg kwvg changed the title backport: merge bitcoin#23603, #23817, #24520, #24508, #25639, #26018, #25437, #25484, #23585, #24549, #24733, #24597, #24955, #25099, #24603, #24552, #21851, #25389, #24031, #25357 (guix backports: part 3) backport: merge bitcoin#23603, #23817, #24520, #24508, #25639, #26018, #25437, #25484, #23585, #24549, #24733, #21991, #22526, #25633, #24597, #24955, #25099, #24603, #24552, #21851, #25389, #24031, #25357 (guix backports: part 3) Jun 20, 2023
@kwvg kwvg changed the title backport: merge bitcoin#23603, #23817, #24520, #24508, #25639, #26018, #25437, #25484, #23585, #24549, #24733, #21991, #22526, #25633, #24597, #24955, #25099, #24603, #24552, #21851, #25389, #24031, #25357 (guix backports: part 3) backport: merge bitcoin#23583, #23618, #23603, #23817, #24520, #24508, #25639, #26018, #25437, #25484, #23585, #24549, #24733, #21991, #22526, #25633, #24597, #24955, #25099, #24603, #24552, #21851, #25389, #24031, #25357 (guix backports: part 3) Jun 20, 2023
@kwvg kwvg marked this pull request as ready for review June 20, 2023 14:09
@kwvg
Copy link
Copy Markdown
Collaborator Author

kwvg commented Jun 20, 2023

Binaries:

1a724b9dbfc53bd517fa7ddd75d6041f1ae3c2176de7a7f354af0d424d55bfa1  guix-build-65203669f641/distsrc-65203669f641-aarch64-linux-gnu/src/dash-cli
f0ccb724687e0ebd120d0d4da0f784cd29b5c06a10d931aacb7d9b4c49507c56  guix-build-65203669f641/distsrc-65203669f641-aarch64-linux-gnu/src/dash-tx
9eaf1af657117a9c9ad522e1b95c7f33cd12f1dced1e471651d4036fabb91a7b  guix-build-65203669f641/distsrc-65203669f641-aarch64-linux-gnu/src/dash-wallet
aa851a6daaf3e00e19287ef84682f458448fcbb5d2f1a324e593861db673a0d7  guix-build-65203669f641/distsrc-65203669f641-aarch64-linux-gnu/src/dashd
3fcdeb8f4666e362060f9d7e671578b7c0d3e54a60400eff55940e29a5241614  guix-build-65203669f641/distsrc-65203669f641-aarch64-linux-gnu/src/qt/dash-qt
116ab6b12482b22d00a6be6cecb65ca30fe7220eb7541a6d998d0cb5a2176520  guix-build-65203669f641/distsrc-65203669f641-aarch64-linux-gnu/src/test/test_dash
b48363561bee9c6a467a1800999c1a25288ba93945a621b453e5e0eef62b1492  guix-build-65203669f641/distsrc-65203669f641-arm-linux-gnueabihf/src/dash-cli
06b35bbe8e5bb369e855b52d09d933f4cb75e6b002f0b7bb8aa3fc2b21841ec2  guix-build-65203669f641/distsrc-65203669f641-arm-linux-gnueabihf/src/dash-tx
20b3d8e1a548ca0b8e21862f4c3e7228ff1e83cbd75605d4919254cc06613bd1  guix-build-65203669f641/distsrc-65203669f641-arm-linux-gnueabihf/src/dash-wallet
7c46c1a83881f8e3389134d54214c6449863480dbf0dd8bc957975c6c6f8aa7f  guix-build-65203669f641/distsrc-65203669f641-arm-linux-gnueabihf/src/dashd
e7e5f7f9a11ae850badeb2eec8b06d3992251b444bbf3dfa6e4fe0c6a61984dc  guix-build-65203669f641/distsrc-65203669f641-arm-linux-gnueabihf/src/qt/dash-qt
4b12bda5afad42599abe401f32936267559ad2e2e60180ef4552188037a2bd3f  guix-build-65203669f641/distsrc-65203669f641-arm-linux-gnueabihf/src/test/test_dash
a0814d14bd5adf94c5b5325e4115997df25175adc97f73833b85568417fd10fe  guix-build-65203669f641/distsrc-65203669f641-arm64-apple-darwin/src/dash-cli
d4be212bcba3c8719a3d497d23600d062a305c39056e43ac9bb9b29f57771d35  guix-build-65203669f641/distsrc-65203669f641-arm64-apple-darwin/src/dash-tx
852a607f0c8566121b49ac3d07720d52e5a949951478c823467f8edd560f3e9f  guix-build-65203669f641/distsrc-65203669f641-arm64-apple-darwin/src/dash-wallet
c8f7acc9869c573e2c4ac2a3b69794b4d08111b8281c9e793d7c4f0a7030d577  guix-build-65203669f641/distsrc-65203669f641-arm64-apple-darwin/src/dashd
89ab6da17f1a5e45a970c7450e977448f4180e2a0406bb7cd8509f3bb54721aa  guix-build-65203669f641/distsrc-65203669f641-arm64-apple-darwin/src/qt/dash-qt
389fe3e582d59e876b2c5fe7371ad005787a91111e895dee6d1cf71cdff370de  guix-build-65203669f641/distsrc-65203669f641-arm64-apple-darwin/src/test/test_dash
96374616ab16599cc45bfc181f6eb6e9608ddce0c62280788101a93b9d1f2391  guix-build-65203669f641/distsrc-65203669f641-riscv64-linux-gnu/src/dash-cli
09443b5fa9dbcf4eaffb004586ca997655384bface9f8d9f3717596abfc6d8ea  guix-build-65203669f641/distsrc-65203669f641-riscv64-linux-gnu/src/dash-tx
982168d3372093b7893f265d93ad9c340ded98ee6a573e419b7bdee1420d7575  guix-build-65203669f641/distsrc-65203669f641-riscv64-linux-gnu/src/dash-wallet
bdb92b30dce40c325004eeb54b4e92650966edca3ff7ec9778929c6b72a952b8  guix-build-65203669f641/distsrc-65203669f641-riscv64-linux-gnu/src/dashd
cf9e1fe8fcb387b2b4fadefb0ffb88306c3544d72f308f7a89fb46c19c79b0b8  guix-build-65203669f641/distsrc-65203669f641-riscv64-linux-gnu/src/qt/dash-qt
fb742e01a93a8f427ab0a58c338390ff4fc6f14125a03443d169d33aa6cc5388  guix-build-65203669f641/distsrc-65203669f641-riscv64-linux-gnu/src/test/test_dash
198e621b2d7d8f933d9e37c325204a1655ae8f9db087623ec23d9436beee4cd8  guix-build-65203669f641/distsrc-65203669f641-x86_64-apple-darwin/src/dash-cli
c35a510dd17bc0502ad6ba625f98f1e392237633b2e9e3ba4d7f03ce80e802e2  guix-build-65203669f641/distsrc-65203669f641-x86_64-apple-darwin/src/dash-tx
bdf89b98189eddd8f93d2ef72aab82f33e1b1b52a5f06d6c84bd0c81aa03c682  guix-build-65203669f641/distsrc-65203669f641-x86_64-apple-darwin/src/dash-wallet
a1b21cc46262e7047ba181372ebe27d832162dba5bdd50afe00ece0c60667dfb  guix-build-65203669f641/distsrc-65203669f641-x86_64-apple-darwin/src/dashd
5f17fc1c77ca9876b97397ec7154d45805b2148298ba92a81afe871ea3e2c148  guix-build-65203669f641/distsrc-65203669f641-x86_64-apple-darwin/src/qt/dash-qt
029c958130b9eaa19f8a74cd9bce056c67ad7f9c7282a2e01d8d90f2076364f4  guix-build-65203669f641/distsrc-65203669f641-x86_64-apple-darwin/src/test/test_dash
c5ebeda371957cffcede5434af3a52e5490144ca00adfc478a3525fdd183ac95  guix-build-65203669f641/distsrc-65203669f641-x86_64-linux-gnu/src/dash-cli
7e75ebfdb4322be02d06ff139e850a882512b8ff8bf26215a335baab7c37d018  guix-build-65203669f641/distsrc-65203669f641-x86_64-linux-gnu/src/dash-tx
dfc9c2a65e716f54d7d5bbbe4345b0b07a735f7efa4d3283ff4a22fdeb0ce6e8  guix-build-65203669f641/distsrc-65203669f641-x86_64-linux-gnu/src/dash-wallet
620eb4516a8273c5468ec8205cf4fba5f38249cd1948b9a4c5366c767d0a3373  guix-build-65203669f641/distsrc-65203669f641-x86_64-linux-gnu/src/dashd
d099dfb43d636d1e4c2b653899166ceacbb76078fa971d99f81da5d5d4562d7c  guix-build-65203669f641/distsrc-65203669f641-x86_64-linux-gnu/src/qt/dash-qt
9bd15042a87b8c1fab16ceda5bc9752a31aaba388c417aba67a432cc184974ef  guix-build-65203669f641/distsrc-65203669f641-x86_64-linux-gnu/src/test/test_dash
798d1b53ded6211b92d6902e7e52708827b504e70597063d6bfca0adf6f79be0  guix-build-65203669f641/distsrc-65203669f641-x86_64-w64-mingw32/src/dash-cli.exe
98d920c505fd73f99f48c86880c0dd53ae06ac65d08d4aaa5354f704df8c604d  guix-build-65203669f641/distsrc-65203669f641-x86_64-w64-mingw32/src/dash-tx.exe
abb7db8be4f6ebbede2ac78d8ec7fd90d1de7791a952885894e8be552ea89001  guix-build-65203669f641/distsrc-65203669f641-x86_64-w64-mingw32/src/dash-wallet.exe
0642a89345c0129aa09ba2747311de670647fbeb8c2b0af6f45ac782185f13c0  guix-build-65203669f641/distsrc-65203669f641-x86_64-w64-mingw32/src/dashd.exe
57adf0ffe33adb772a7f333ef72e54b9a58296bb29476e059847beba9f3f6254  guix-build-65203669f641/distsrc-65203669f641-x86_64-w64-mingw32/src/qt/dash-qt.exe
5535c88e089eecc24a12b83549e0b1898448092595929b9f2af07e99b988dc6f  guix-build-65203669f641/distsrc-65203669f641-x86_64-w64-mingw32/src/test/test_dash.exe

Archives:

b9bb728bdea534c6a0965d841b3e815f3edb56edc606a656db2138dbd80f4787  guix-build-65203669f641/output/aarch64-linux-gnu/dashcore-65203669f641-aarch64-linux-gnu-debug.tar.gz
5e8aa9496c0698926c6e517637a3adf713004ebf38da0cec35165920cdf9e519  guix-build-65203669f641/output/aarch64-linux-gnu/dashcore-65203669f641-aarch64-linux-gnu.tar.gz
6a7b899cdbafcf3e6c5b2309c807fa9a5404dfa4d1ade3262f06b318c1633888  guix-build-65203669f641/output/arm-linux-gnueabihf/dashcore-65203669f641-arm-linux-gnueabihf-debug.tar.gz
418b4ec8bb7e2c1b84a61f442d794f1fbae19827b689fa78b9b67856adc54c29  guix-build-65203669f641/output/arm-linux-gnueabihf/dashcore-65203669f641-arm-linux-gnueabihf.tar.gz
8cc99afb3d8beba69e1cf5b43059fa5dd80953bfc6c85d4749bee0d89bd3e86a  guix-build-65203669f641/output/arm64-apple-darwin/dashcore-65203669f641-arm64-apple-darwin-unsigned.dmg
80fae086f3069c81fe7001dfeb1a42c970de0865015384a20b3f2d18d404cc17  guix-build-65203669f641/output/arm64-apple-darwin/dashcore-65203669f641-arm64-apple-darwin-unsigned.tar.gz
d7aee681b1aedcd47a08e641a553c815377874671eaa52f74ce599cc70867fe0  guix-build-65203669f641/output/arm64-apple-darwin/dashcore-65203669f641-arm64-apple-darwin.tar.gz
081d556f14e8be18e2e184b0ab2f3798bdf490275659f037130c64dff076c2d3  guix-build-65203669f641/output/dist-archive/dashcore-65203669f641.tar.gz
deb49baf87ce35143d3070e2a216af42d7bb82cdb781d34fb5fff091942c3447  guix-build-65203669f641/output/riscv64-linux-gnu/dashcore-65203669f641-riscv64-linux-gnu-debug.tar.gz
af5c96ba69e8df5f28ee92f9df40a11165837ec795a7c1122a48506361ae83ad  guix-build-65203669f641/output/riscv64-linux-gnu/dashcore-65203669f641-riscv64-linux-gnu.tar.gz
261801849bcadabd24d36644b456121b8fd76fdd34554e698022c7e285df94b1  guix-build-65203669f641/output/x86_64-apple-darwin/dashcore-65203669f641-x86_64-apple-darwin-unsigned.dmg
e2afd742745f58d6ed875c068b38c3d562a16b9a38fc06f772f1bc9abeb77f17  guix-build-65203669f641/output/x86_64-apple-darwin/dashcore-65203669f641-x86_64-apple-darwin-unsigned.tar.gz
49759df106c3d7feb8848dedef36a9547885dd7b31f558bd7b7a20d7658b8942  guix-build-65203669f641/output/x86_64-apple-darwin/dashcore-65203669f641-x86_64-apple-darwin.tar.gz
ca31b31be29a62f351b028fcd215ac5613506845dfaef9ba77b45be751321527  guix-build-65203669f641/output/x86_64-linux-gnu/dashcore-65203669f641-x86_64-linux-gnu-debug.tar.gz
08ff9c0399a0f4c3ba2010e9be07f3be76ad3b5831680f783abd3c627c8e9aca  guix-build-65203669f641/output/x86_64-linux-gnu/dashcore-65203669f641-x86_64-linux-gnu.tar.gz
243977b0eda5784309cfafc6e845aac4c495a0ab8fbddad3d4c3e08475e32487  guix-build-65203669f641/output/x86_64-w64-mingw32/dashcore-65203669f641-win64-debug.zip
79983e76b072e946595f45fe1ea8285ea564d8a5f14ca9cdd1505fd4358729cd  guix-build-65203669f641/output/x86_64-w64-mingw32/dashcore-65203669f641-win64-setup-unsigned.exe
f9490cffe0f24984e5f64cce83f56563aea9673f9835d2d9143096e673eea1f7  guix-build-65203669f641/output/x86_64-w64-mingw32/dashcore-65203669f641-win64-unsigned.tar.gz
6e7ffa69a218fc15b5e631cc787b47bb489cc28b76034eac1ee6e1cd543dec41  guix-build-65203669f641/output/x86_64-w64-mingw32/dashcore-65203669f641-win64.zip

@kwvg kwvg requested review from PastaPastaPasta, UdjinM6 and knst June 20, 2023 14:13
@kwvg kwvg mentioned this pull request Jun 20, 2023
Merged
@kwvg
Copy link
Copy Markdown
Collaborator Author

kwvg commented Jun 20, 2023 •
edited
Loading

Attempting to restart build due to permissions issues (unsafe directory), see build

EDIT: CI's still broken

@UdjinM6
Copy link
Copy Markdown

UdjinM6 commented Jun 20, 2023

  1. f56ff28c43d567ad02cd1bc2f7f09c2691059712 breaks my local build here on m1 mac
  2. 29739eb8b5d5a0f43aed72ce85a64a2e06b61745 and 840101abe639127b71bce471d263963d0d96cb2d break macos gitian build

reverting them helps, should be ok to drop (1) and postpone (2) imo

@PastaPastaPasta
Copy link
Copy Markdown
Member

PastaPastaPasta commented Jun 21, 2023

guix continues to work here: #5444

Not sure why the automation is broken here...

@kwvg kwvg changed the title backport: merge bitcoin#23583, #23618, #23603, #23817, #24520, #24508, #25639, #26018, #25437, #25484, #23585, #24549, #24733, #21991, #22526, #25633, #24597, #24955, #25099, #24603, #24552, #21851, #25389, #24031, #25357 (guix backports: part 3) backport: merge bitcoin#23583, #23618, #23603, #23817, #24520, #24508, #25639, #26018, #25437, #25484, #23585, #24549, #24733, #21991, #22526, #25633, #24597, #24955, #25099, #24552, #21851, #25389, #25357 (guix backports: part 3) Jun 21, 2023
PastaPastaPasta
PastaPastaPasta approved these changes Jun 29, 2023
View reviewed changes
Copy link
Copy Markdown
Member

@PastaPastaPasta PastaPastaPasta left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK for merging via merge commit

kwvg added 26 commits June 29, 2023 12:31
@kwvg @PastaPastaPasta
build: obey bitcoin#22993 by setting macOS target to Darwin 19
f686992
@kwvg @PastaPastaPasta
merge bitcoin#25643: compile FastFixedDtoa with -O1 to fix cross-arch…
30cd5ef 
… reproducibility for arm32
@kwvg @PastaPastaPasta
merge bitcoin#23583: Don't hard-code x86_64 as the arch when using qmake
2ed704b
@kwvg @PastaPastaPasta
merge bitcoin#23618: Ditch no_sdk_version_check.patch
7d9a5d6
@kwvg @PastaPastaPasta
merge bitcoin#23603: Fix x86_64 <-> arm64 cross-compiling for macOS
13c2a9b
@kwvg @PastaPastaPasta
merge bitcoin#23817: Fix regression introduced in PR23603
19a8164
@kwvg @PastaPastaPasta
merge bitcoin#24520: only check for the macOS SDK once
14f6e37
@kwvg @PastaPastaPasta
merge bitcoin#24508: Drop unneeded openssl dependency for signapple
6169e20
@kwvg @PastaPastaPasta
merge bitcoin#25639: Drop repetition of option's default value
a812926
@kwvg @PastaPastaPasta
merge bitcoin#26018: consistently use -ffile-prefix-map
9c5d657
@kwvg @PastaPastaPasta
merge bitcoin#25437: remove explicit glibc stack protector disabling
fc6252b
@kwvg @PastaPastaPasta
merge bitcoin#25484: enable toolchain hardening by default
205aa83
@kwvg @PastaPastaPasta
merge bitcoin#23585: Drop Darwin version for better maintainability
ab8c26a
@kwvg @PastaPastaPasta
merge bitcoin#24549: Use $HOST instead of generic osx{64} for macOS a…
9600020 
…rtifacts
@kwvg @PastaPastaPasta
merge bitcoin#24733: Fix "ERR: Unsigned tarballs do not exist"
b7d688e
@kwvg @PastaPastaPasta
merge bitcoin#21991: libevent 2.1.12-stable
96e8ad8
@kwvg @PastaPastaPasta
partial bitcoin#22318: Avoid @GLIBC_2.25 symbols for compatibility
f16a29a 
contains:
 - a4b0b34
@kwvg @PastaPastaPasta
merge bitcoin#22526: use newer config.guess & config.sub in depends
6751b13
@kwvg @PastaPastaPasta
merge bitcoin#25633: don't restrict --enable-lto to non-guix cctools
ba2f56d
@kwvg @PastaPastaPasta
merge bitcoin#24597: Include arm64-apple-darwin into codesigned archs
1a49f48
@kwvg @PastaPastaPasta
merge bitcoin#24955: Improve error message about missed macOS SDK
f3dd5d7
@kwvg @PastaPastaPasta
merge bitcoin#25099: bump time-machine to 998eda3067c7d21e0d9bb3310d2…
8dc99a4 
…f5a14b8f1c681
@kwvg @PastaPastaPasta
merge bitcoin#24552: make it possible to override gpg binary
be2eb53
@kwvg @PastaPastaPasta
merge bitcoin#21851: support cross-compiling for arm64-apple-darwin
66e1541
@kwvg @PastaPastaPasta
merge bitcoin#25389: use libtool 2.4.7
6243a71
@kwvg @PastaPastaPasta
merge bitcoin#25357: drop -z,noexecstack for PPC64
0a7b8bd
@PastaPastaPasta PastaPastaPasta merged commit bfb3f4b into dashpay:develop Jun 29, 2023
@UdjinM6 UdjinM6 added this to the 20 milestone Sep 6, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@knst knst knst approved these changes

@UdjinM6 UdjinM6 UdjinM6 approved these changes

@PastaPastaPasta PastaPastaPasta PastaPastaPasta approved these changes

Assignees

No one assigned

Labels

guix-build

Projects

None yet

Milestone

20

Development

Successfully merging this pull request may close these issues.

4 participants

@kwvg @UdjinM6 @PastaPastaPasta @knst