treewide: Make explicit that 'dev' output of gmp is used

This commit is contained in:
Tuomas Tynkkynen 2016-04-16 19:58:41 +03:00 committed by Vladimír Čunát
parent f81af4e6f0
commit 47c45e2041
15 changed files with 15 additions and 15 deletions

View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
configureScript = "./Configure";
configureFlags =
"--with-gmp=${gmp} " +
"--with-gmp=${gmp.dev} " +
"--with-readline=${readline}";
meta = with stdenv.lib; {

View File

@ -39,7 +39,7 @@ stdenv.mkDerivation {
'';
buildPhase = ''
gmp="${gmp}" zlib="${zlib}" PATH=$PATH:`pwd`/seam-support/install/bin make -C make all PREFIX="$out"
gmp="${gmp.dev}" zlib="${zlib}" PATH=$PATH:`pwd`/seam-support/install/bin make -C make all PREFIX="$out"
'';
meta = {

View File

@ -28,7 +28,7 @@ stdenv.mkDerivation {
};
configureFlags = [
"--enable-threads"
"--with-gmp-prefix=${gmp}"
"--with-gmp-prefix=${gmp.dev}"
"--with-libffi-prefix=${libffi}"
]
++

View File

@ -234,7 +234,7 @@ stdenv.mkDerivation ({
else ""}
${if javaAwtGtk then "--enable-java-awt=gtk" else ""}
${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""}
--with-gmp=${gmp}
--with-gmp=${gmp.dev}
--with-mpfr=${mpfr}
--with-mpc=${libmpc}
${if libelf != null then "--with-libelf=${libelf}" else ""}

View File

@ -295,7 +295,7 @@ stdenv.mkDerivation ({
else ""}
${if javaAwtGtk then "--enable-java-awt=gtk" else ""}
${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""}
--with-gmp=${gmp}
--with-gmp=${gmp.dev}
--with-mpfr=${mpfr}
--with-mpc=${libmpc}
${if libelf != null then "--with-libelf=${libelf}" else ""}

View File

@ -338,7 +338,7 @@ stdenv.mkDerivation ({
else ""}
${if javaAwtGtk then "--enable-java-awt=gtk" else ""}
${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""}
--with-gmp=${gmp}
--with-gmp=${gmp.dev}
--with-mpfr=${mpfr}
--with-mpc=${libmpc}
${if libelf != null then "--with-libelf=${libelf}" else ""}

View File

@ -345,7 +345,7 @@ stdenv.mkDerivation ({
else ""}
${if javaAwtGtk then "--enable-java-awt=gtk" else ""}
${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""}
--with-gmp=${gmp}
--with-gmp=${gmp.dev}
--with-mpfr=${mpfr}
--with-mpc=${libmpc}
${if libelf != null then "--with-libelf=${libelf}" else ""}

View File

@ -339,7 +339,7 @@ stdenv.mkDerivation ({
else ""}
${if javaAwtGtk then "--enable-java-awt=gtk" else ""}
${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""}
--with-gmp=${gmp}
--with-gmp=${gmp.dev}
--with-mpfr=${mpfr}
--with-mpc=${libmpc}
${if libelf != null then "--with-libelf=${libelf}" else ""}

View File

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
--enable-checking=release
--enable-languages=fortran
--with-cloog=${cloog}
--with-gmp=${gmp}
--with-gmp=${gmp.dev}
--with-isl=${isl_0_14}
--with-mpc=${libmpc}
--with-mpfr=${mpfr}

View File

@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
configurePhase = ''
./configure --prefix=$out \
--with-gmp-libraries=${gmp.out}/lib --with-gmp-includes=${gmp}/include \
--with-gmp-libraries=${gmp.out}/lib --with-gmp-includes=${gmp.dev}/include \
${stdenv.lib.optionalString stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"}
'';

View File

@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
configurePhase = ''
./configure --prefix=$out \
--with-gmp-libraries=${gmp.out}/lib --with-gmp-includes=${gmp}/include \
--with-gmp-libraries=${gmp.out}/lib --with-gmp-includes=${gmp.dev}/include \
${stdenv.lib.optionalString stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"}
'';

View File

@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
configureFlags = [
"--with-gcc=${stdenv.cc}/bin/cc"
"--with-gmp-includes=${gmp}/include" "--with-gmp-libraries=${gmp.out}/lib"
"--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
"--with-curses-includes=${ncurses}/include" "--with-curses-libraries=${ncurses.out}/lib"
] ++ stdenv.lib.optional stdenv.isDarwin [
"--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"

View File

@ -97,7 +97,7 @@
# /usr/include/mp.h from OpenSolaris. See
# <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html>
# for details.
"--with-libgmp-prefix=${gmp}"
"--with-libgmp-prefix=${gmp.dev}"
# Same for these (?).
"--with-libreadline-prefix=${readline}"

View File

@ -141,7 +141,7 @@ let
};
gmp = {
configureFlags = ["--with-gmp=${gmp}"];
configureFlags = ["--with-gmp=${gmp.dev}"];
buildInputs = [ gmp ];
};

View File

@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
configureFlags = with stdenv.lib;
[ "--with-gmp=${gmp}" "--with-mpfr=${mpfr}" "--with-system-readline"
[ "--with-gmp=${gmp.dev}" "--with-mpfr=${mpfr}" "--with-system-readline"
"--with-system-zlib" "--with-expat" "--with-libexpat-prefix=${expat.dev}"
"--with-separate-debug-dir=/run/current-system/sw/lib/debug"
]