Author: simons
Date: Sat Feb 25 19:22:06 2012
New Revision: 32562
URL: https://nixos.org/websvn/nix/?rev=32562&sc=1
Log:
boost: updated to version 1.49
Added:
nixpkgs/trunk/pkgs/development/libraries/boost/1.49.nix
nixpkgs/trunk/pkgs/development/libraries/boost/boost_filesystem_post_1_49_0.patch
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added: nixpkgs/trunk/pkgs/development/libraries/boost/1.49.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/boost/1.49.nix Sat Feb 25
19:22:06 2012 (r32562)
@@ -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
+}:
+
+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
+ finalLayout = if ((enableRelease && enableDebug) ||
+ (enableSingleThreaded && enableMultiThreaded) ||
+ (enableShared && enableStatic)) 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.49.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_49_0.tar.bz2";
+ sha256 = "0g0d33942rm073jgqqvj3znm3rk45b2y2lplfjpyg9q7amzqlx6x";
+ };
+
+ # See <http://svn.boost.org/trac/boost/ticket/4688>.
+ patches = [ ./boost_filesystem_post_1_49_0.patch ];
+
+ 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=${finalLayout} variant=${variant}
threading=${threading} link=${link} ${cflags} install";
+
+ installPhase = ":";
+
+ 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=${finalLayout}
--user-config=user-config.jam toolset=gcc-cross variant=${variant}
threading=${threading} link=${link} ${cflags} --without-python install
+ '';
+ };
+}
Added:
nixpkgs/trunk/pkgs/development/libraries/boost/boost_filesystem_post_1_49_0.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/trunk/pkgs/development/libraries/boost/boost_filesystem_post_1_49_0.patch
Sat Feb 25 19:22:06 2012 (r32562)
@@ -0,0 +1,12 @@
+diff -ubr boost_1_49_0/libs/filesystem/v2/src/v2_path.cpp
boost_1_49_0-patched/libs/filesystem/v2/src/v2_path.cpp
+--- boost_1_49_0/libs/filesystem/v2/src/v2_path.cpp 2011-01-11
22:39:33.000000000 +0100
++++ boost_1_49_0-patched/libs/filesystem/v2/src/v2_path.cpp 2012-02-25
20:00:33.628767485 +0100
+@@ -45,7 +45,7 @@
+ {
+ #if !defined(macintosh) && !defined(__APPLE__) && !defined(__APPLE_CC__)
+ // ISO C calls this "the locale-specific native environment":
+- static std::locale lc("");
++ static std::locale lc;
+ #else // Mac OS
+ // "All BSD system functions expect their string parameters to be in
UTF-8 encoding
+ // and nothing else."
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Feb 25 18:29:30
2012 (r32561)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Feb 25 19:22:06
2012 (r32562)
@@ -3260,7 +3260,8 @@
boost146 = callPackage ../development/libraries/boost/1.46.nix { };
boost147 = callPackage ../development/libraries/boost/1.47.nix { };
boost148 = callPackage ../development/libraries/boost/1.48.nix { };
- boost = boost148;
+ boost149 = callPackage ../development/libraries/boost/1.49.nix { };
+ boost = boost149;
# A Boost build with all library variants enabled. Very large (about 250
MB).
boostFull = appendToName "full" (boost.override {
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
