diff options
author | Shea Levy <shea@shealevy.com> | 2012-07-02 01:05:52 -0400 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2012-07-02 01:05:52 -0400 |
commit | 4f8d6d0ee2601494bcdda0e2bb6ed6b4dc829793 (patch) | |
tree | f64c23e11a7df464eb9117121649514168b6d7b0 /pkgs/development/libraries/boost | |
parent | d068dbb933d5c5285031b8fc080a7e15aaf988b7 (diff) | |
parent | 42faecad0d85d02b3da5b608ac8b4b7282836e63 (diff) | |
download | nixpkgs-4f8d6d0ee2601494bcdda0e2bb6ed6b4dc829793.tar nixpkgs-4f8d6d0ee2601494bcdda0e2bb6ed6b4dc829793.tar.gz nixpkgs-4f8d6d0ee2601494bcdda0e2bb6ed6b4dc829793.tar.bz2 nixpkgs-4f8d6d0ee2601494bcdda0e2bb6ed6b4dc829793.tar.lz nixpkgs-4f8d6d0ee2601494bcdda0e2bb6ed6b4dc829793.tar.xz nixpkgs-4f8d6d0ee2601494bcdda0e2bb6ed6b4dc829793.tar.zst nixpkgs-4f8d6d0ee2601494bcdda0e2bb6ed6b4dc829793.zip |
Merge remote-tracking branch 'peti/boost-cleanup'
Keep boost-1.49 for now.
Diffstat (limited to 'pkgs/development/libraries/boost')
-rw-r--r-- | pkgs/development/libraries/boost/1.42.nix | 80 | ||||
-rw-r--r-- | pkgs/development/libraries/boost/1.48.nix | 91 |
2 files changed, 0 insertions, 171 deletions
diff --git a/pkgs/development/libraries/boost/1.42.nix b/pkgs/development/libraries/boost/1.42.nix deleted file mode 100644 index 3dbc699da4d..00000000000 --- a/pkgs/development/libraries/boost/1.42.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ stdenv, fetchurl, icu, expat, zlib, bzip2, python -, enableRelease ? true -, enableDebug ? false -, enableSingleThreaded ? false -, enableMultiThreaded ? true -, enableShared ? true -, enableStatic ? false -, enablePIC ? 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) then "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC" else ""; - -in - -stdenv.mkDerivation { - name = "boost-1.42.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_42_0.tar.bz2"; - sha256 = "02g6m6f7m11ig93p5sx7sfq75c15y9kn2pa3csn1bkjhs9dvj7jb"; - }; - - enableParallelBuilding = true; - - buildInputs = [icu expat zlib bzip2 python]; - - configureScript = "./bootstrap.sh"; - configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python"; - - buildPhase = "./bjam -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 - ./bjam -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 - ''; - }; -} diff --git a/pkgs/development/libraries/boost/1.48.nix b/pkgs/development/libraries/boost/1.48.nix deleted file mode 100644 index 2adc0191cc0..00000000000 --- a/pkgs/development/libraries/boost/1.48.nix +++ /dev/null @@ -1,91 +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.48.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_48_0.tar.bz2"; - sha256 = "1njsircy5xfj5rws10w8vq2s0603z2i31p9wgbawr4wkssr59whv"; - }; - - # See <http://svn.boost.org/trac/boost/ticket/4688>. - patches = [ ./boost_filesystem.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 - ''; - }; -} |