/bitcoin

[0.11] Important backports for 0.11.3 (updated to v0.12.0) #7743

Merged
merged 4 commits into from Mar 31, 2016
+138 −26

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
5 participants
@luke-jr @btcdrak @laanwj @sipa @theuni
@luke-jr
Member

luke-jr commented Mar 24, 2016

These seem fairly important even for a softfork-deployment 0.11.3.

theuni and others added some commits Nov 10, 2015

@theuni @luke-jr theuni build: Split hardening/fPIE options out 
This allows for fPIE to be used selectively.

Github-Pull: #6978
Rebased-From: 17c4d9d
 90de0e1
@theuni @luke-jr theuni build: Use fPIC rather than fPIE for qt objects. 
But only if qt was built with reduced relocations.

Github-Pull: #6978
Rebased-From: 69d0513
 5c0b357
@luke-jr luke-jr Merge commit '5c0b357' into backports-for-0.11.3 d626faa
@theuni @luke-jr theuni build: Set osx permissions in the dmg to make Gatekeeper happy 
Github-Pull: #7092
Rebased-From: 392d3c5
e979f09
@btcdrak
Member

btcdrak commented Mar 25, 2016

Backport of #6978 and #7092
@laanwj
Owner

laanwj commented Mar 28, 2016

utACK
@sipa
Owner

sipa commented Mar 28, 2016

Why the merge commit?
@luke-jr
Member

luke-jr commented Mar 28, 2016

Cleaner grouping of the two related commits together.

@laanwj laanwj merged commit e979f09 into bitcoin:0.11 Mar 31, 2016
1 check passed

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@laanwj laanwj added a commit that referenced this pull request Mar 31, 2016

@laanwj laanwj Merge #7743: [0.11] Important backports for 0.11.3 (updated to v0.12.0) 
e979f09 build: Set osx permissions in the dmg to make Gatekeeper happy (Cory Fields)
5c0b357 build: Use fPIC rather than fPIE for qt objects. (Cory Fields)
90de0e1 build: Split hardening/fPIE options out (Cory Fields)
This commit was signed with a verified signature.
@laanwj laanwj Wladimir J. van der Laan
GPG key ID: 74810B012346C9A6 Learn about signing commits
ecaa178
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment