From 785e9630f0dbdefed74327adbdc2530fc9502cf9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 29 Jun 2009 11:01:10 +0000
Subject: [PATCH] gmp: use standard GNU config.guess
libgmp comes with an extended config.guess script that features more
accurate CPU detection. Unfortunately, use of that script causes the
configure phase to choose fairly aggressive optimization flags and the
resulting binaries might not work on architectures other than the
machine those binaries were built on.
The standard GNU config.guess script, however, recognizes a CPU type of
'x86' only. Thus, libgmp chooses the following settings:
ABI="32"
CC="gcc"
CFLAGS="-m32 -O2 -pedantic -fomit-frame-pointer -mtune=pentiumpro -march=pentiumpro"
CPPFLAGS=""
MPN_PATH=" x86/p6 x86 generic"
svn path=/nixpkgs/branches/stdenv-updates/; revision=16084
---
pkgs/development/libraries/gmp/default.nix | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/libraries/gmp/default.nix b/pkgs/development/libraries/gmp/default.nix
index fd9534f6dc91..541fabddd441 100644
--- a/pkgs/development/libraries/gmp/default.nix
+++ b/pkgs/development/libraries/gmp/default.nix
@@ -9,9 +9,11 @@ stdenv.mkDerivation rec {
};
buildInputs = [m4];
-
+
+ preConfigure = "ln -sf configfsf.guess config.guess";
+
configureFlags = if cxx then "--enable-cxx" else "--disable-cxx";
-
+
doCheck = true;
meta = {