mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 00:12:56 +00:00
boost: 1.55 -> 1.56
This commit is contained in:
William A. Kennington III
parent
768fe6ed06
commit
89cf0e4fea
@ -1,99 +0,0 @@
|
||||
{ stdenv, fetchurl, icu, expat, zlib, bzip2, python, fixDarwinDylibNames
|
||||
, toolset ? null
|
||||
, enableRelease ? true
|
||||
, enableDebug ? false
|
||||
, enableSingleThreaded ? false
|
||||
, enableMultiThreaded ? true
|
||||
, enableShared ? true
|
||||
, enableStatic ? false
|
||||
, enablePIC ? false
|
||||
, enableExceptions ? false
|
||||
, taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic))
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
variant = stdenv.lib.concatStringsSep ","
|
||||
(stdenv.lib.optional enableRelease "release" ++
|
||||
stdenv.lib.optional enableDebug "debug");
|
||||
|
||||
threading = stdenv.lib.concatStringsSep ","
|
||||
(stdenv.lib.optional enableSingleThreaded "single" ++
|
||||
stdenv.lib.optional enableMultiThreaded "multi");
|
||||
|
||||
link = stdenv.lib.concatStringsSep ","
|
||||
(stdenv.lib.optional enableShared "shared" ++
|
||||
stdenv.lib.optional enableStatic "static");
|
||||
|
||||
# To avoid library name collisions
|
||||
layout = if taggedLayout then "tagged" else "system";
|
||||
|
||||
cflags = if enablePIC && enableExceptions then
|
||||
"cflags=\"-fPIC -fexceptions\" cxxflags=-fPIC linkflags=-fPIC"
|
||||
else if enablePIC then
|
||||
"cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC"
|
||||
else if enableExceptions then
|
||||
"cflags=-fexceptions"
|
||||
else
|
||||
"";
|
||||
|
||||
withToolset = stdenv.lib.optionalString (toolset != null) " --with-toolset=${toolset}";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "boost-1.55.0";
|
||||
|
||||
meta = {
|
||||
homepage = "http://boost.org/";
|
||||
description = "Collection of C++ libraries";
|
||||
license = "boost-license";
|
||||
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
maintainers = [ stdenv.lib.maintainers.simons ];
|
||||
};
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/boost/boost_1_55_0.tar.bz2";
|
||||
sha256 = "0lkv5dzssbl5fmh2nkaszi8x9qbj80pr4acf9i26sj3rvlih1w7z";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
buildInputs =
|
||||
[ icu expat zlib bzip2 python ]
|
||||
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
|
||||
|
||||
configureScript = "./bootstrap.sh";
|
||||
configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python" + withToolset;
|
||||
|
||||
buildPhase = "${stdenv.lib.optionalString (toolset == "clang") "unset NIX_ENFORCE_PURITY; "}./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${layout} variant=${variant} threading=${threading} link=${link} ${cflags} install${withToolset}";
|
||||
|
||||
# normal install does not install bjam, this is a separate step
|
||||
installPhase = ''
|
||||
cd tools/build/v2
|
||||
sh bootstrap.sh${withToolset}
|
||||
./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${layout} variant=${variant} threading=${threading} link=${link} ${cflags} install${withToolset}
|
||||
rm $out/bin/bjam
|
||||
ln -s $out/bin/b2 $out/bin/bjam
|
||||
rm -rf $out/share/boost-build/example
|
||||
'';
|
||||
|
||||
crossAttrs = rec {
|
||||
buildInputs = [ expat.crossDrv zlib.crossDrv bzip2.crossDrv ];
|
||||
# all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to
|
||||
# override them.
|
||||
propagatedBuildInputs = buildInputs;
|
||||
# We want to substitute the contents of configureFlags, removing thus the
|
||||
# usual --build and --host added on cross building.
|
||||
preConfigure = ''
|
||||
export configureFlags="--prefix=$out --without-icu"
|
||||
'';
|
||||
buildPhase = ''
|
||||
set -x
|
||||
cat << EOF > user-config.jam
|
||||
using gcc : cross : $crossConfig-g++ ;
|
||||
EOF
|
||||
./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.crossDrv}/include -sEXPAT_LIBPATH=${expat.crossDrv}/lib --layout=${layout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install
|
||||
'';
|
||||
};
|
||||
}
|
||||
146
pkgs/development/libraries/boost/1.56.nix
Normal file
146
pkgs/development/libraries/boost/1.56.nix
Normal file
@ -0,0 +1,146 @@
|
||||
{ stdenv, fetchurl, icu, expat, zlib, bzip2, python, fixDarwinDylibNames
|
||||
, toolset ? null
|
||||
, enableRelease ? true
|
||||
, enableDebug ? false
|
||||
, enableSingleThreaded ? false
|
||||
, enableMultiThreaded ? true
|
||||
, enableShared ? true
|
||||
, enableStatic ? false
|
||||
, enablePIC ? false
|
||||
, enableExceptions ? false
|
||||
, taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic))
|
||||
}:
|
||||
|
||||
# We must build at least one type of libraries
|
||||
assert !enableShared -> enableStatic;
|
||||
|
||||
with stdenv.lib;
|
||||
let
|
||||
|
||||
variant = concatStringsSep ","
|
||||
(optional enableRelease "release" ++
|
||||
optional enableDebug "debug");
|
||||
|
||||
threading = concatStringsSep ","
|
||||
(optional enableSingleThreaded "single" ++
|
||||
optional enableMultiThreaded "multi");
|
||||
|
||||
link = concatStringsSep ","
|
||||
(optional enableShared "shared" ++
|
||||
optional enableStatic "static");
|
||||
|
||||
runtime-link = if enableShared then "shared" else "static";
|
||||
|
||||
# To avoid library name collisions
|
||||
layout = if taggedLayout then "tagged" else "system";
|
||||
|
||||
cflags = if enablePIC && enableExceptions then
|
||||
"cflags=\"-fPIC -fexceptions\" cxxflags=-fPIC linkflags=-fPIC"
|
||||
else if enablePIC then
|
||||
"cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC"
|
||||
else if enableExceptions then
|
||||
"cflags=-fexceptions"
|
||||
else
|
||||
"";
|
||||
|
||||
withToolset = stdenv.lib.optionalString (toolset != null) "--with-toolset=${toolset}";
|
||||
|
||||
genericB2Flags = [
|
||||
"--prefix=$out"
|
||||
"--libdir=$lib/lib"
|
||||
"-j$NIX_BUILD_CORES"
|
||||
"--layout=${layout}"
|
||||
"variant=${variant}"
|
||||
"threading=${threading}"
|
||||
"runtime-link=${runtime-link}"
|
||||
"link=${link}"
|
||||
"${cflags}"
|
||||
] ++ optional (variant == "release") "debug-symbols=off";
|
||||
|
||||
nativeB2Flags = [
|
||||
"-sEXPAT_INCLUDE=${expat}/include"
|
||||
"-sEXPAT_LIBPATH=${expat}/lib"
|
||||
] ++ optional (toolset != null) "toolset=${toolset}";
|
||||
nativeB2Args = concatStringsSep " " (genericB2Flags ++ nativeB2Flags);
|
||||
|
||||
crossB2Flags = [
|
||||
"-sEXPAT_INCLUDE=${expat.crossDrv}/include"
|
||||
"-sEXPAT_LIBPATH=${expat.crossDrv}/lib"
|
||||
"--user-config=user-config.jam"
|
||||
"toolset=gcc-cross"
|
||||
"--without-python"
|
||||
];
|
||||
crossB2Args = concatMapStringsSep " " (genericB2Flags ++ crossB2Flags);
|
||||
|
||||
builder = b2Args: ''
|
||||
./b2 ${b2Args}
|
||||
'';
|
||||
|
||||
installer = b2Args: ''
|
||||
# boostbook is needed by some applications
|
||||
mkdir -p $out/share/boostbook
|
||||
cp -a tools/boostbook/{xsl,dtd} $out/share/boostbook/
|
||||
|
||||
# Let boost install everything else
|
||||
./b2 ${b2Args} install
|
||||
'';
|
||||
|
||||
commonConfigureFlags = [
|
||||
"--libdir=$(lib)/lib"
|
||||
];
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "boost-1.56.0";
|
||||
|
||||
meta = {
|
||||
homepage = "http://boost.org/";
|
||||
description = "Collection of C++ libraries";
|
||||
license = "boost-license";
|
||||
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ simons wkennington ];
|
||||
};
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/boost/boost_1_56_0.tar.bz2";
|
||||
sha256 = "07gz62nj767qzwqm3xjh11znpyph8gcii0cqhnx7wvismyn34iqk";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
buildInputs = [ icu expat zlib bzip2 python ]
|
||||
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
|
||||
|
||||
configureScript = "./bootstrap.sh";
|
||||
configureFlags = commonConfigureFlags ++ [
|
||||
"--with-icu=${icu}"
|
||||
"--with-python=${python}/bin/python"
|
||||
] ++ optional (toolset != null) "--with-toolset=${toolset}";
|
||||
|
||||
buildPhase = ''
|
||||
${stdenv.lib.optionalString (toolset == "clang") "unset NIX_ENFORCE_PURITY"}
|
||||
'' + builder nativeB2Args;
|
||||
|
||||
installPhase = installer nativeB2Args;
|
||||
|
||||
outputs = [ "out" "lib" ];
|
||||
|
||||
crossAttrs = rec {
|
||||
buildInputs = [ expat.crossDrv zlib.crossDrv bzip2.crossDrv ];
|
||||
# all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to
|
||||
# override them.
|
||||
propagatedBuildInputs = buildInputs;
|
||||
# We want to substitute the contents of configureFlags, removing thus the
|
||||
# usual --build and --host added on cross building.
|
||||
preConfigure = ''
|
||||
export configureFlags="--prefix=$out --without-icu ${concatStringsSep " " commonConfigureFlags}"
|
||||
set -x
|
||||
cat << EOF > user-config.jam
|
||||
using gcc : cross : $crossConfig-g++ ;
|
||||
EOF
|
||||
'';
|
||||
buildPhase = builder crossB2Args;
|
||||
installPhase = installer crossB2Args;
|
||||
};
|
||||
}
|
||||
@ -4578,8 +4578,8 @@ let
|
||||
|
||||
boost144 = callPackage ../development/libraries/boost/1.44.nix { };
|
||||
boost149 = callPackage ../development/libraries/boost/1.49.nix { };
|
||||
boost155 = callPackage ../development/libraries/boost/1.55.nix { };
|
||||
boost = boost155;
|
||||
boost156 = callPackage ../development/libraries/boost/1.56.nix { };
|
||||
boost = boost156;
|
||||
|
||||
boostHeaders = callPackage ../development/libraries/boost/header-only-wrapper.nix { };
|
||||
|
||||
@ -9456,7 +9456,6 @@ let
|
||||
inherit (perlPackages) ArchiveZip CompressZlib;
|
||||
inherit (gnome) GConf ORBit2 gnome_vfs;
|
||||
zip = zip.override { enableNLS = false; };
|
||||
boost = boost155;
|
||||
jdk = openjdk;
|
||||
fontsConf = makeFontsConf {
|
||||
fontDirectories = [
|
||||
|
||||
Loading…
Reference in New Issue
Block a user