Update Nanos6 git with ./autogen.sh
This commit is contained in:
parent
0605bc4ceb
commit
9a500dd3d6
@ -10,7 +10,6 @@
|
|||||||
, hwloc
|
, hwloc
|
||||||
, papi
|
, papi
|
||||||
, boost
|
, boost
|
||||||
, autoreconfHook
|
|
||||||
, enableJemalloc ? true
|
, enableJemalloc ? true
|
||||||
, jemalloc ? null
|
, jemalloc ? null
|
||||||
, cachelineBytes ? 64
|
, cachelineBytes ? 64
|
||||||
@ -32,6 +31,7 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
prePatch = ''
|
prePatch = ''
|
||||||
patchShebangs scripts/generate_config.sh
|
patchShebangs scripts/generate_config.sh
|
||||||
|
patchShebangs autogen.sh
|
||||||
'';
|
'';
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
@ -41,9 +41,10 @@ stdenv.mkDerivation rec {
|
|||||||
export CACHELINE_WIDTH=${toString cachelineBytes}
|
export CACHELINE_WIDTH=${toString cachelineBytes}
|
||||||
export NANOS6_GIT_VERSION=${src.rev}
|
export NANOS6_GIT_VERSION=${src.rev}
|
||||||
export NANOS6_GIT_BRANCH=${gitBranch}
|
export NANOS6_GIT_BRANCH=${gitBranch}
|
||||||
|
./autogen.sh
|
||||||
'';
|
'';
|
||||||
|
|
||||||
configureFlags = []
|
configureFlags = [ "--with-hwloc=${hwloc}" ]
|
||||||
++ (optional enableJemalloc "--with-jemalloc=${jemalloc}")
|
++ (optional enableJemalloc "--with-jemalloc=${jemalloc}")
|
||||||
++ (optional enableGlibcxxDebug "CXXFLAGS=-D_GLIBCXX_DEBUG");
|
++ (optional enableGlibcxxDebug "CXXFLAGS=-D_GLIBCXX_DEBUG");
|
||||||
|
|
||||||
@ -52,7 +53,6 @@ stdenv.mkDerivation rec {
|
|||||||
hardeningDisable = [ "all" ];
|
hardeningDisable = [ "all" ];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
autoreconfHook
|
|
||||||
autoconf
|
autoconf
|
||||||
automake
|
automake
|
||||||
libtool
|
libtool
|
||||||
|
Loading…
Reference in New Issue
Block a user