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

Merge pull request #8307 from dezgeg/pr-gmp

Browse Source 
[WIP] gmp6: Fix build on ARM
This commit is contained in:
William A. Kennington III 2015-06-13 03:04:49 -07:00
commit 8c2a8661eb
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/libraries/gmp/5.1.x.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, m4, cxx ? true, withStatic ? true }: { stdenv, fetchurl, m4, cxx ? true, withStatic ? true }:
with { inherit (stdenv.lib) optional; }; with { inherit (stdenv.lib) optional optionalString; };
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gmp-5.1.3"; name = "gmp-5.1.3";
@ -28,6 +28,13 @@ stdenv.mkDerivation rec {
++ optional stdenv.is64bit "--with-pic" ++ optional stdenv.is64bit "--with-pic"
; ;
# The config.guess in GMP tries to runtime-detect various
# ARM optimization flags via /proc/cpuinfo (and is also
# broken on multicore CPUs). Avoid this impurity.
preConfigure = optionalString stdenv.isArm ''
configureFlagsArray+=("--build=$(./configfsf.guess)")
'';
doCheck = true; doCheck = true;
dontDisableStatic = withStatic; dontDisableStatic = withStatic;

9
pkgs/development/libraries/gmp/6.x.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, m4, cxx ? true, withStatic ? true }: { stdenv, fetchurl, m4, cxx ? true, withStatic ? true }:
with { inherit (stdenv.lib) optional; }; with { inherit (stdenv.lib) optional optionalString; };
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gmp-6.0.0a"; name = "gmp-6.0.0a";
@ -26,6 +26,13 @@ stdenv.mkDerivation rec {
++ optional stdenv.is64bit "--with-pic" ++ optional stdenv.is64bit "--with-pic"
; ;
# The config.guess in GMP tries to runtime-detect various
# ARM optimization flags via /proc/cpuinfo (and is also
# broken on multicore CPUs). Avoid this impurity.
preConfigure = optionalString stdenv.isArm ''
configureFlagsArray+=("--build=$(./configfsf.guess)")
'';
doCheck = true; doCheck = true;
dontDisableStatic = withStatic; dontDisableStatic = withStatic;