public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request from r-burns/ppc64le-boost-segfault 

boost: fix segfaults on ppc64
This commit is contained in:
Sandro 2020-12-13 08:16:16 +01:00 committed by GitHub
parent 5a59f5aaa9 ca89e801ea
commit 7fdab2fb1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 0 deletions
pkgs/development/libraries/boost
generic.nix

9
pkgs/development/libraries/boost/generic.nix
View File

@ -1,4 +1,5 @@
{ stdenv, icu, expat, zlib, bzip2, python, fixDarwinDylibNames, libiconv { stdenv, icu, expat, zlib, bzip2, python, fixDarwinDylibNames, libiconv
, fetchpatch
, which , which
, buildPackages , buildPackages
, toolset ? /**/ if stdenv.cc.isClang then "clang" , toolset ? /**/ if stdenv.cc.isClang then "clang"
@ -113,6 +114,14 @@ stdenv.mkDerivation {
if version == "1.55.0" if version == "1.55.0"
then ./darwin-1.55-no-system-python.patch then ./darwin-1.55-no-system-python.patch
else ./darwin-no-system-python.patch) else ./darwin-no-system-python.patch)
# Fix boost-context segmentation faults on ppc64 due to ABI violation
++ optional (versionAtLeast version "1.61" &&
versionOlder version "1.71") (fetchpatch {
url = "https://github.com/boostorg/context/commit/2354eca9b776a6739112833f64754108cc0d1dc5.patch";
sha256 = "067m4bjpmcanqvg28djax9a10avmdwhlpfx6gn73kbqqq70dnz29";
stripLen = 1;
extraPrefix = "libs/context/";
})
++ optional (and (versionAtLeast version "1.70") (!versionAtLeast version "1.73")) ./cmake-paths.patch ++ optional (and (versionAtLeast version "1.70") (!versionAtLeast version "1.73")) ./cmake-paths.patch
++ optional (versionAtLeast version "1.73") ./cmake-paths-173.patch; ++ optional (versionAtLeast version "1.73") ./cmake-paths-173.patch;