boost147: remove, seemed unneeded
This commit is contained in:
parent
0415253eaf
commit
fa42471a2f
@ -1,90 +0,0 @@
|
||||
{ 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.47.0";
|
||||
|
||||
meta = {
|
||||
homepage = "http://boost.org/";
|
||||
description = "Boost C++ Library Collection";
|
||||
license = "boost-license";
|
||||
|
||||
maintainers = [ stdenv.lib.maintainers.simons ];
|
||||
};
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/boost/boost_1_47_0.tar.bz2";
|
||||
sha256 = "815a5d9faac4dbd523fbcf3fe1065e443c0bbf43427c44aa423422c6ec4c2e31";
|
||||
};
|
||||
|
||||
# See <http://svn.boost.org/trac/boost/ticket/4688>.
|
||||
patches = [ ./boost_filesystem_1_47_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.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=${finalLayout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install
|
||||
'';
|
||||
};
|
||||
}
|
@ -1,24 +0,0 @@
|
||||
diff -ubr boost_1_47_0/libs/filesystem/v2/src/v2_path.cpp boost_1_47_0-patched/libs/filesystem/v2/src/v2_path.cpp
|
||||
--- boost_1_47_0/libs/filesystem/v2/src/v2_path.cpp 2011-01-11 22:39:33.000000000 +0100
|
||||
+++ boost_1_47_0-patched/libs/filesystem/v2/src/v2_path.cpp 2011-07-21 01:06:26.000000000 +0200
|
||||
@@ -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."
|
||||
diff -ubr boost_1_47_0/libs/filesystem/v3/src/path.cpp boost_1_47_0-patched/libs/filesystem/v3/src/path.cpp
|
||||
--- boost_1_47_0/libs/filesystem/v3/src/path.cpp 2011-07-05 16:49:42.000000000 +0200
|
||||
+++ boost_1_47_0-patched/libs/filesystem/v3/src/path.cpp 2011-07-21 01:06:26.000000000 +0200
|
||||
@@ -767,7 +767,7 @@
|
||||
// or LANG are wrong, for example), so dynamic initialization is used to ensure
|
||||
// that exceptions can be caught.
|
||||
|
||||
- return std::locale("");
|
||||
+ return std::locale();
|
||||
|
||||
# endif
|
||||
}
|
@ -3395,7 +3395,6 @@ let
|
||||
boolstuff = callPackage ../development/libraries/boolstuff { };
|
||||
|
||||
boost144 = callPackage ../development/libraries/boost/1.44.nix { };
|
||||
boost147 = callPackage ../development/libraries/boost/1.47.nix { };
|
||||
boost149 = callPackage ../development/libraries/boost/1.49.nix { };
|
||||
boost153 = callPackage ../development/libraries/boost/1.53.nix { };
|
||||
boost = boost153;
|
||||
@ -8423,7 +8422,7 @@ let
|
||||
kipi_plugins = callPackage ../applications/graphics/kipi-plugins { };
|
||||
|
||||
koffice = callPackage ../applications/office/koffice {
|
||||
boost = boost147;
|
||||
boost = boost149;
|
||||
};
|
||||
|
||||
konq_plugins = callPackage ../applications/networking/browsers/konq-plugins { };
|
||||
|
Loading…
Reference in New Issue
Block a user