guix: Remove ssp spec file hack #16810

pull dongcarl wants to merge 2 commits into bitcoin:master from dongcarl:2019-09-guix-remove-ssp-spec changing 1 files +25 −17

dongcarl commented at 6:54 PM on September 5, 2019: member

See commit messages for more details

contrib: guix: More robust search paths, add checks

- store_path() previously only worked for cross compilation packages, we
  remove this assumption here
- Add CROSS_GCC_LIB variable which points to where gcc libs/headers are
  located
- Add gcc libs/headers to our CROSS_*_PATH environment variables
- Check that all directories in CROSS_*_PATH are sane

0093a5869a

contrib: guix: Remove ssp spec file hack

This hack is no longer needed after fixing our cross-compilation search
paths.

0065ead5eb

dongcarl added the label Build system on Sep 5, 2019

fanquake commented at 5:15 AM on September 7, 2019: member

ACK 0065ead5ebdad9f743d89ee2558c93253a597967

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256

ACK 0065ead5ebdad9f743d89ee2558c93253a597967

Ran a GUIX build (results below) and checked that __stack_chk_fail & __stack_chk_guard were present in the produced binaries. i.e:

nm distsrc-riscv64-linux-gnu/src/bitcoind | grep __stack_chk
                 U __stack_chk_fail@@GLIBC_2.27
                 U __stack_chk_guard@@GLIBC_2.27
nm distsrc-riscv64-linux-gnu/src/qt/bitcoin-qt | grep __stack_chk
                 U __stack_chk_fail@@GLIBC_2.27
                 U __stack_chk_guard@@GLIBC_2.27

find output/ -type f -print0 | sort -z | xargs -r0 sha256sum
d27757d356cc2dfe6eb5b1cadf83619cf33393741a1792343dcaa54fa6bb97a3  output/bitcoin-0.18.99-aarch64-linux-gnu-debug.tar.gz
c48c075e6095df0dd9a4b7fc8d2c7000797227fb3241a60f197fa2ea0957bf23  output/bitcoin-0.18.99-aarch64-linux-gnu.tar.gz
aa4ef8d7cbd5c5fb7591fa48d19f78eb6febfedd12c333a4832af4b1dff67784  output/bitcoin-0.18.99-arm-linux-gnueabihf-debug.tar.gz
87a809888b24435b03058e23444b78714bd4b978f08286bcd23a70f007b8f562  output/bitcoin-0.18.99-arm-linux-gnueabihf.tar.gz
0bc117a362157dc79d550d8cd33f63523dd63f751f8f0fd971923f911e620473  output/bitcoin-0.18.99-i686-linux-gnu-debug.tar.gz
48b4c19c88ab40b9097dd3056e004a2d6994971c00961a9c2131a024c348ff6b  output/bitcoin-0.18.99-i686-linux-gnu.tar.gz
7f42ea49ae3e5af6b293c0c5112f059ef88bf5ff6cb61de12c31e628819e0751  output/bitcoin-0.18.99-riscv64-linux-gnu-debug.tar.gz
ae3b21fb2a547ddbf721e5d9aa08761cb03922861cac8659c4eeb6cc5c9de152  output/bitcoin-0.18.99-riscv64-linux-gnu.tar.gz
f545e05aa2ae3749d34470d2d9312e82bed31ea7f1270cdb1a05a17736f8fe00  output/bitcoin-0.18.99-x86_64-linux-gnu-debug.tar.gz
356fe030e4d7c3da280ef46bc2654b336e719b68a09442fe2d02490b04eff50e  output/bitcoin-0.18.99-x86_64-linux-gnu.tar.gz
f278fd734ae6d186413297ae399e9615b42992d6116eb2c74d32305872e00b2e  output/src/bitcoin-0.18.99.tar.gz

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCAAdFiEEz7FuIclQ9n+pXlWPLuufXMCVJsEFAl1zO0MACgkQLuufXMCV JsFChA//clikQINt2GrB8MvyDhyaj7zmORi0Pgy9X1zTsYSsRrTuhZAlKSDewFuN GQOib1kPnA12c6zCKHZVQdeaerceBU9KfTSY7WPqVhhKHwOCg4DgA0NF2VdvFIkj zv4QaI8mxvnoMLmQBYDXfUAPj4/fISikBaeFo9urN0zIkDqaMbu0ZPqAn6qTLP4S EvJEFRGBueRxbj3g0Ox+EFqB0jIINTYtDEWAaQSCJqmgCuqJBHWeYhEWFznEbXms JQIP89r37ARaF4Or9kkNVM+O2A3TjBpeVtExsgtPf7P2QdAClElwPyB1gHQwYYZI 5YTuXFoYeo+TTYQTc88a/7WruOTivK/QzCFN+zBztXRcnCxnBycKcYe1sM0VzX/z iRkmFX1cyHIJr7zwtubvMOug0oxPh7E0ohMYTkzgmQTBgf9oE2WeQFSXEQGhUkCa YG+aWVlFvQlEpy6AYeESOYP8PPPMnPJfWjCQvMfXshgrBvSLc5XCRN76Ta+xYdhp ixNfXO4x8gZ3Gr/mCj6VOGp/qJcKo/WeyLYkC8hov5vhHiqgmEVfxbTRkrI6n/Eb zzRpGhXFBF1IMREOcftfa5bieJfut0lfm7Ch/bjecmdW/7OakyRvsSaBglJMVfTK GQeHxheQq6fiWQ9Gl6DWhrfvEm28PE7UpiOQxinV8Ge4z0cnNOo= =XCDM -----END PGP SIGNATURE-----

fanquake referenced this in commit e4b974830e on Sep 7, 2019
fanquake merged this on Sep 7, 2019
fanquake closed this on Sep 7, 2019
DrahtBot locked this on Dec 16, 2021

Contributors

dongcarl

fanquake

Labels

Build system