Commit 76b59040 authored by John Ericson's avatar John Ericson
Browse files

boost: Clean, reducing duplication 

This was motivated originally by my cross work, but that goal requires a
few more commits to other things. Still, it's good to start the cleanup
now / get things out of the way.
parent cc44e044

pkgs/development/libraries/boost/1.59.nix

+29 −29
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ callPackage ./generic.nix (args // rec { 
    sha256 = "1jj1aai5rdmd72g90a3pd8sw9vi32zad46xv5av8fhnr48ir6ykj";

  };



  patches = if stdenv.isCygwin then [

  patches = stdenv.lib.optionals stdenv.isCygwin [

    ./cygwin-fedora-boost-1.50.0-fix-non-utf8-files.patch

    ./cygwin-fedora-boost-1.50.0-pool.patch

    ./cygwin-fedora-boost-1.57.0-mpl-print.patch
@@ -36,5 +36,5 @@ callPackage ./generic.nix (args // rec { 
    ./cygwin-1.57.0-system-cygwin.patch

    ./cygwin-1.45.0-jam-cygwin.patch

    ./cygwin-1.50.0-jam-pep3149.patch

    ] else null;

  ];

})

pkgs/development/libraries/boost/generic.nix

+54 −96
Original line number Diff line number Diff line 
{ stdenv, fetchurl, icu, expat, zlib, bzip2, python, fixDarwinDylibNames, libiconv

, buildPlatform, hostPlatform

, toolset ? if stdenv.cc.isClang then "clang" else null

, which

, buildPackages, buildPlatform, hostPlatform

, toolset ? /**/ if stdenv.cc.isClang                                then "clang"

            else if stdenv.cc.isGNU && hostPlatform != buildPlatform then "gcc-cross"

            else null

, enableRelease ? true

, enableDebug ? false

, enableSingleThreaded ? false

, enableMultiThreaded ? true

, enableShared ? !(hostPlatform.libc == "msvcrt") # problems for now

, enableStatic ? !enableShared

, enablePIC ? false

, enableExceptions ? false

, enablePython ? hostPlatform == buildPlatform

, enableNumpy ? false

, taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic))

, patches ? null

, patches ? []

, mpi ? null



# Attributes inherit from specific versions
@@ -21,8 +22,9 @@ 
}:



# We must build at least one type of libraries

assert !enableShared -> enableStatic;

assert enableShared || enableStatic;



# Python isn't supported when cross-compiling

assert enablePython -> hostPlatform == buildPlatform;

assert enableNumpy -> enablePython;
@@ -46,86 +48,41 @@ let 
  # 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 = [

  b2Args = concatStringsSep " " ([

    "--includedir=$dev/include"

    "--libdir=$out/lib"

    "-j$NIX_BUILD_CORES"

    "--layout=${layout}"

    "variant=${variant}"

    "threading=${threading}"

  ] ++ optional (link != "static") "runtime-link=${runtime-link}" ++ [

    "runtime-link=${runtime-link}"

    "link=${link}"

    "${cflags}"

  ] ++ optional (variant == "release") "debug-symbols=off"

    ++ optional (!enablePython) "--without-python";



  nativeB2Flags = [

    "-sEXPAT_INCLUDE=${expat.dev}/include"

    "-sEXPAT_LIBPATH=${expat.out}/lib"

  ] ++ optional (toolset != null) "toolset=${toolset}"

    ++ optional (mpi != null) "--user-config=user-config.jam";

  nativeB2Args = concatStringsSep " " (genericB2Flags ++ nativeB2Flags);



  crossB2Flags = [

    "-sEXPAT_INCLUDE=${expat.crossDrv}/include"

    "-sEXPAT_LIBPATH=${expat.crossDrv}/lib"

    "--user-config=user-config.jam"

    "toolset=gcc-cross"

  ] ++ optionals (hostPlatform.libc == "msvcrt") [

  ] ++ optional (variant == "release") "debug-symbols=off"

    ++ optional (toolset != null) "toolset=${toolset}"

    ++ optional (mpi != null || hostPlatform != buildPlatform) "--user-config=user-config.jam"

    ++ optionals (hostPlatform.libc == "msvcrt") [

    "target-os=windows"

    "threadapi=win32"

    "binary-format=pe"

    "address-model=${toString hostPlatform.parsed.cpu.bits}"

    "architecture=x86"

  ];

  crossB2Args = concatStringsSep " " (genericB2Flags ++ crossB2Flags);



  builder = b2Args: ''

    ./b2 ${b2Args}

  '';



  installer = b2Args: ''

    # boostbook is needed by some applications

    mkdir -p $dev/share/boostbook

    cp -a tools/boostbook/{xsl,dtd} $dev/share/boostbook/



    # Let boost install everything else

    ./b2 ${b2Args} install

  '';



  commonConfigureFlags = [

    "--includedir=$(dev)/include"

    "--libdir=$(out)/lib"

  ];



  fixup = ''

    # Make boost header paths relative so that they are not runtime dependencies

    (

      cd "$dev"

      find include \( -name '*.hpp' -or -name '*.h' -or -name '*.ipp' \) \

        -exec sed '1i#line 1 "{}"' -i '{}' \;

    )

  '' + optionalString (hostPlatform.libc == "msvcrt") ''

    ${stdenv.cc.targetPrefix}ranlib "$out/lib/"*.a

  '';

  ]);



in



stdenv.mkDerivation {

  name = "boost-${version}";



  inherit src patches version;

  inherit src;



  patchFlags = optionalString (hostPlatform.libc == "msvcrt") "-p0";

  patches = patches ++ optional (hostPlatform.libc == "msvcrt") (fetchurl {

    url = "https://svn.boost.org/trac/boost/raw-attachment/tickaet/7262/"

        + "boost-mingw.patch";

    sha256 = "0s32kwll66k50w6r5np1y5g907b7lcpsjhfgr7rsw7q5syhzddyj";

  });



  meta = {

    homepage = http://boost.org/;
@@ -142,9 +99,13 @@ stdenv.mkDerivation { 
          --replace '@rpath/$(<[1]:D=)' "$out/lib/\$(<[1]:D=)";

    fi;

  '' + optionalString (mpi != null) ''

    cat << EOF > user-config.jam

    cat << EOF >> user-config.jam

    using mpi : ${mpi}/bin/mpiCC ;

    EOF

  '' + optionalString (hostPlatform != buildPlatform) ''

    cat << EOF >> user-config.jam

    using gcc : cross : ${stdenv.cc.targetPrefix}c++ ;

    EOF

  '';



  NIX_CFLAGS_LINK = stdenv.lib.optionalString stdenv.isDarwin
@@ -152,6 +113,7 @@ stdenv.mkDerivation { 


  enableParallelBuilding = true;



  nativeBuildInputs = [ which buildPackages.stdenv.cc ];

  buildInputs = [ expat zlib bzip2 libiconv ]

    ++ optional (hostPlatform == buildPlatform) icu

    ++ optional stdenv.isDarwin fixDarwinDylibNames
@@ -159,39 +121,35 @@ stdenv.mkDerivation { 
    ++ optional enableNumpy python.pkgs.numpy;



  configureScript = "./bootstrap.sh";

  configureFlags = commonConfigureFlags

    ++ [ "--with-python=${python.interpreter}" ]

    ++ optional (hostPlatform == buildPlatform) "--with-icu=${icu.dev}"

    ++ optional (toolset != null) "--with-toolset=${toolset}";



  buildPhase = builder nativeB2Args;

  configurePlatforms = [];

  configureFlags = [

    "--includedir=$(dev)/include"

    "--libdir=$(out)/lib"

    (if enablePython then "--with-python=${python.interpreter}" else "--without-python")

    (if hostPlatform == buildPlatform then "--with-icu=${icu.dev}" else  "--without-icu")

  ] ++ optional (toolset != null) "--with-toolset=${toolset}";



  installPhase = installer nativeB2Args;

  buildPhase = ''

    ./b2 ${b2Args}

  '';



  postFixup = fixup;

  installPhase = ''

    # boostbook is needed by some applications

    mkdir -p $dev/share/boostbook

    cp -a tools/boostbook/{xsl,dtd} $dev/share/boostbook/



  outputs = [ "out" "dev" ];

  setOutputFlags = false;

    # Let boost install everything else

    ./b2 ${b2Args} install

  '';



  crossAttrs = rec {

    # We want to substitute the contents of configureFlags, removing thus the

    # usual --build and --host added on cross building.

    preConfigure = ''

      export configureFlags="--without-icu ${concatStringsSep " " commonConfigureFlags}"

      cat << EOF > user-config.jam

      using gcc : cross : $crossConfig-g++ ;

      EOF

  postFixup = ''

    # Make boost header paths relative so that they are not runtime dependencies

    find "$dev/include" \( -name '*.hpp' -or -name '*.h' -or -name '*.ipp' \) \

      -exec sed '1i#line 1 "{}"' -i '{}' \;

  '' + optionalString (hostPlatform.libc == "msvcrt") ''

    $RANLIB "$out/lib/"*.a

  '';

    buildPhase = builder crossB2Args;

    installPhase = installer crossB2Args;

    postFixup = fixup;

  } // optionalAttrs (hostPlatform.libc == "msvcrt") {

    patches = fetchurl {

      url = "https://svn.boost.org/trac/boost/raw-attachment/ticket/7262/"

          + "boost-mingw.patch";

      sha256 = "0s32kwll66k50w6r5np1y5g907b7lcpsjhfgr7rsw7q5syhzddyj";

    };



    patchFlags = "-p0";

  };

  outputs = [ "out" "dev" ];

  setOutputFlags = false;

}