Skip to content

guix: Remove ssp spec file hack #16810

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
fanquake merged 2 commits into from
Sep 7, 2019
Merged

guix: Remove ssp spec file hack #16810

fanquake merged 2 commits into from
Sep 7, 2019

Conversation

@dongcarl
Copy link
Contributor

@dongcarl dongcarl commented Sep 5, 2019

See commit messages for more details

@dongcarl
contrib: guix: More robust search paths, add checks
0093a58 
- 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
@dongcarl
contrib: guix: Remove ssp spec file hack
0065ead 
This hack is no longer needed after fixing our cross-compilation search
paths.
@fanquake
Copy link
Member

fanquake commented Sep 7, 2019

ACK 0065ead

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

ACK 0065ead

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 added a commit that referenced this pull request Sep 7, 2019
@fanquake
Merge #16810: guix: Remove ssp spec file hack
e4b9748 
0065ead contrib: guix: Remove ssp spec file hack (Carl Dong)
0093a58 contrib: guix: More robust search paths, add checks (Carl Dong)

Pull request description:

  See commit messages for more details

ACKs for top commit:
  fanquake:
    ACK 0065ead

Tree-SHA512: fde04005fb31cd4b75b80da4936a7c394f63f0b3bdcc33c20c99e05604a63efd9c850a8d097030ff0bf4b4e83f1a9997fc4621ce291ebcecd8397893447600a7
@fanquake fanquake merged commit 0065ead into bitcoin:master Sep 7, 2019
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Dec 16, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

No one assigned

Labels

Build system

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@dongcarl @fanquake