Compare commits
	
		
			5 Commits
		
	
	
		
			85d50f346c
			...
			32ecd3014d
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 32ecd3014d | |||
| 28da2f62ef | |||
| 987b9bdaff | |||
| a9c8885535 | |||
| d1e43dba34 | 
| @ -20,6 +20,7 @@ | ||||
| #, python3Packages | ||||
| , installShellFiles | ||||
| , symlinkJoin | ||||
| , enablePapi ? stdenv.hostPlatform == stdenv.buildPlatform # Disabled when cross-compiling | ||||
| }: | ||||
| 
 | ||||
| let | ||||
| @ -87,7 +88,7 @@ stdenv.mkDerivation rec { | ||||
|       --enable-sampling | ||||
|       --with-unwind=${libunwind.dev} | ||||
|       --with-xml-prefix=${libxml2.dev} | ||||
|       --with-papi=${papi} | ||||
|       ${lib.optionalString enablePapi "--with-papi=${papi}"} | ||||
|       ${if (mpi != null) then ''--with-mpi=${mpi}'' | ||||
|         else ''--without-mpi''} | ||||
|       --without-dyninst) | ||||
|  | ||||
| @ -22,7 +22,11 @@ stdenv.mkDerivation rec { | ||||
|   ''; | ||||
| 
 | ||||
|   buildInputs = [ libtirpc ]; | ||||
|   patches = [ ./fix-install.patch ./gcc-14.patch ]; | ||||
|   patches = [ | ||||
|     ./fix-install.patch | ||||
|     ./gcc-14.patch | ||||
|     ./fix-cross.patch | ||||
|   ]; | ||||
| 
 | ||||
|   hardeningDisable = [ "all" ]; | ||||
| 
 | ||||
| @ -35,6 +39,8 @@ stdenv.mkDerivation rec { | ||||
|       CFLAGS=-Wno-implicit-int | ||||
|       CPPFLAGS=-I${libtirpc.dev}/include/tirpc | ||||
|       LDFLAGS=-ltirpc | ||||
|       CC=${stdenv.cc.targetPrefix}cc | ||||
|       AR=${stdenv.cc.targetPrefix}ar | ||||
|     ) | ||||
|   ''; | ||||
| 
 | ||||
|  | ||||
							
								
								
									
										13
									
								
								pkgs/lmbench/fix-cross.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										13
									
								
								pkgs/lmbench/fix-cross.patch
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,13 @@ | ||||
| diff --git a/src/Makefile b/src/Makefile
 | ||||
| index 2555014..356eeb3 100644
 | ||||
| --- a/src/Makefile
 | ||||
| +++ b/src/Makefile
 | ||||
| @@ -36,7 +36,7 @@ SHELL=/bin/sh
 | ||||
|   | ||||
|  CC=`../scripts/compiler` | ||||
|  MAKE=`../scripts/make` | ||||
| -AR=ar
 | ||||
| +AR?=ar
 | ||||
|  ARCREATE=cr | ||||
|   | ||||
|  # base of installation location | ||||
| @ -16,6 +16,7 @@ | ||||
| , jemallocNanos6 ? null | ||||
| , cachelineBytes ? 64 | ||||
| , enableGlibcxxDebug ? false | ||||
| , enablePapi ? stdenv.hostPlatform == stdenv.buildPlatform # Disabled when cross-compiling | ||||
| , useGit ? false | ||||
| , gitUrl ? "ssh://git@bscpm04.bsc.es/nanos6/nanos6" | ||||
| , gitBranch ? "master" | ||||
| @ -47,6 +48,8 @@ let | ||||
|   }; | ||||
| 
 | ||||
|   source = if (useGit) then git else release; | ||||
| 
 | ||||
|   isCross = stdenv.hostPlatform != stdenv.buildPlatform; | ||||
| in | ||||
|   stdenv.mkDerivation (source // { | ||||
|     pname = "nanos6"; | ||||
| @ -71,9 +74,11 @@ in | ||||
|       "--disable-all-instrumentations" | ||||
|       "--enable-ovni-instrumentation" | ||||
|       "--with-ovni=${ovni}" | ||||
|       "--with-boost=${boost.dev}" | ||||
|     ] ++ | ||||
|       (optional enableJemalloc "--with-jemalloc=${jemallocNanos6}") ++ | ||||
|       (optional enableGlibcxxDebug "CXXFLAGS=-D_GLIBCXX_DEBUG"); | ||||
|       (optional enableGlibcxxDebug "CXXFLAGS=-D_GLIBCXX_DEBUG") ++ | ||||
|       (optional isCross "--with-symbol-resolution=ifunc"); | ||||
| 
 | ||||
|     postConfigure = lib.optionalString (!enableDebug) '' | ||||
|       # Disable debug | ||||
| @ -97,16 +102,14 @@ in | ||||
|       # TODO: papi_version is needed for configure: | ||||
|       # ./configure: line 27378: papi_version: command not found | ||||
|       # This probably breaks cross-compilation | ||||
|       papi | ||||
|     ]; | ||||
|     ] ++ lib.optionals enablePapi [ papi ]; | ||||
| 
 | ||||
|     buildInputs = [ | ||||
|       boost | ||||
|       numactl | ||||
|       hwloc | ||||
|       papi | ||||
|       ovni | ||||
|     ]; | ||||
|     ] ++ lib.optionals enablePapi [ papi ]; | ||||
| 
 | ||||
|     # Create a script that sets NANOS6_HOME | ||||
|     postInstall = '' | ||||
|  | ||||
| @ -7,7 +7,7 @@ | ||||
| , numactl | ||||
| , hwloc | ||||
| , papi | ||||
| , enablePapi ? true | ||||
| , enablePapi ? stdenv.hostPlatform == stdenv.buildPlatform # Disabled when cross-compiling | ||||
| , cacheline ? 64 # bits | ||||
| , ovni ? null | ||||
| , useGit ? false | ||||
|  | ||||
		Reference in New Issue
	
	Block a user