From af9747c1ef1af07c76ba107f8099e4bd5cf1e1d0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 6 Feb 2013 12:33:55 +0100 Subject: [PATCH] boost: add version 1.53.0 The default 'boost' attribute has not been updated yet as this needs further testing. --- .../libraries/boost/1.53-headers.nix | 26 ++++++ pkgs/development/libraries/boost/1.53.nix | 91 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 119 insertions(+) create mode 100644 pkgs/development/libraries/boost/1.53-headers.nix create mode 100644 pkgs/development/libraries/boost/1.53.nix diff --git a/pkgs/development/libraries/boost/1.53-headers.nix b/pkgs/development/libraries/boost/1.53-headers.nix new file mode 100644 index 00000000000..04bad16bd70 --- /dev/null +++ b/pkgs/development/libraries/boost/1.53-headers.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "boost-headers-1.53.0"; + + src = fetchurl { + url = "mirror://sourceforge/boost/boost_1_53_0.tar.bz2"; + sha256 = "15livg6y1l3gdsg6ybvp3y4gp0w3xh1rdcq5bjf0qaw804dh92pq"; + }; + + phases = [ "installPhase" ]; + + installPhase = '' + mkdir -p $out/include + tar xf $src -C $out/include --strip-components=1 boost_1_53_0/boost + ''; + + meta = { + homepage = "http://boost.org/"; + description = "Boost C++ Library Collection"; + license = "boost-license"; + + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.viric stdenv.lib.maintainers.simons ]; + }; +} diff --git a/pkgs/development/libraries/boost/1.53.nix b/pkgs/development/libraries/boost/1.53.nix new file mode 100644 index 00000000000..7de750efd91 --- /dev/null +++ b/pkgs/development/libraries/boost/1.53.nix @@ -0,0 +1,91 @@ +{ stdenv, fetchurl, icu, expat, zlib, bzip2, python +, 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 + ""; +in + +stdenv.mkDerivation { + name = "boost-1.53.0"; + + meta = { + homepage = "http://boost.org/"; + description = "Boost C++ Library Collection"; + license = "boost-license"; + + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; + + src = fetchurl { + url = "mirror://sourceforge/boost/boost_1_53_0.tar.bz2"; + sha256 = "15livg6y1l3gdsg6ybvp3y4gp0w3xh1rdcq5bjf0qaw804dh92pq"; + }; + + enableParallelBuilding = true; + + buildInputs = [icu expat zlib bzip2 python]; + + configureScript = "./bootstrap.sh"; + configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python"; + + buildPhase = "./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${layout} variant=${variant} threading=${threading} link=${link} ${cflags} install"; + + # normal install does not install bjam, this is a separate step + installPhase = '' + cd tools/build/v2 + sh bootstrap.sh + ./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${layout} variant=${variant} threading=${threading} link=${link} ${cflags} install + ''; + + crossAttrs = rec { + buildInputs = [ expat.hostDrv zlib.hostDrv bzip2.hostDrv ]; + # 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.hostDrv}/include -sEXPAT_LIBPATH=${expat.hostDrv}/lib --layout=${layout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install + ''; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9f33fa6c1bf..7425d68a9cc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3435,11 +3435,13 @@ let boost149 = callPackage ../development/libraries/boost/1.49.nix { }; boost151 = callPackage ../development/libraries/boost/1.51.nix { }; boost152 = callPackage ../development/libraries/boost/1.52.nix { }; + boost153 = callPackage ../development/libraries/boost/1.53.nix { }; boost = boost152; boostHeaders149 = callPackage ../development/libraries/boost/1.49-headers.nix { }; boostHeaders151 = callPackage ../development/libraries/boost/1.51-headers.nix { }; boostHeaders152 = callPackage ../development/libraries/boost/1.52-headers.nix { }; + boostHeaders153 = callPackage ../development/libraries/boost/1.53-headers.nix { }; boostHeaders = boostHeaders152; botan = callPackage ../development/libraries/botan { };