chn/bscpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update nanos6 to last release

Browse Source
This commit is contained in:
Rodrigo Arias Mallo 2023-05-30 09:41:17 +02:00
parent 933cd1e3c7
commit df32aa62d0
2 changed files with 7 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bsc/nanos6/default.nix
View File

@ -4,7 +4,6 @@
, fetchFromGitHub
, automake
, autoconf
, autoreconfHook
, libtool
, pkg-config
, numactl
@ -24,28 +23,31 @@ with lib;
stdenv.mkDerivation rec {
pname = "nanos6";
version = "2.8";
version = "3.0";
src = fetchFromGitHub {
owner = "bsc-pm";
repo = "nanos6";
rev = "version-${version}";
sha256 = "YGj/cubqXaNt4lR2CnSU+nXvi+SdB56EXLhfN/ufjHs=";
sha256 = "sha256-XEG8/8yQv5/OdSyK9Kig8xuWe6mTZ1eQKhXx3fXlQ1Y=";
};
patches = [ ./fpic.patch ];
prePatch = ''
patchShebangs scripts/generate_config.sh
patchShebangs autogen.sh
'';
enableParallelBuilding = true;
preConfigure = ''
export CACHELINE_WIDTH=${toString cachelineBytes}
./autogen.sh
'';
configureFlags = [
"--with-hwloc=${hwloc}"
"--disable-all-instrumentations"
"--enable-ovni-instrumentation"
"--with-ovni=${ovni}"
] ++
(optional enableJemalloc "--with-jemalloc=${jemalloc}") ++
@ -59,7 +61,6 @@ stdenv.mkDerivation rec {
dontStrip = true;
buildInputs = [
autoreconfHook
autoconf
automake
libtool

57
bsc/nanos6/fpic.patch
View File

@ -1,57 +0,0 @@
diff --git a/Makefile.am b/Makefile.am
index 5718226456dcf0e422200d1289a14816f51bd39d..c4d49a80f3899b6439184837555c03337b832018 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -115,7 +115,7 @@ lib_LTLIBRARIES = \
libnanos6-optimized-discrete-verbose.la \
libnanos6-optimized-regions-verbose.la
-noinst_LIBRARIES = libnanos6-main-wrapper.a libnanos6-library-mode.a
+noinst_LTLIBRARIES = libnanos6-main-wrapper.la libnanos6-library-mode.la
lib_OBJECTS = nanos6-main-wrapper.o nanos6-library-mode.o
@@ -139,7 +139,7 @@ if ANDROID
main_interception += loader/intercept-main-android.c
endif
-libnanos6_main_wrapper_a_SOURCES = \
+libnanos6_main_wrapper_la_SOURCES = \
$(main_interception) \
loader/api-versions.c \
loader/api-versions.h \
@@ -150,25 +150,27 @@ libnanos6_main_wrapper_a_SOURCES = \
loader/main-wrapper.c \
loader/main-wrapper.h
-libnanos6_main_wrapper_a_CPPFLAGS = $(CUDA_CFLAGS) $(MPI_CXXFLAGS) $(MCMODEL_FLAGS)
+libnanos6_main_wrapper_la_CPPFLAGS = $(CUDA_CFLAGS) $(MPI_CXXFLAGS) $(MCMODEL_FLAGS)
+libnanos6_main_wrapper_la_LDFLAGS = -static
-nanos6-main-wrapper.o: libnanos6-main-wrapper.a
- $(AM_V_LD)$(LD) -r --whole-archive libnanos6-main-wrapper.a -o nanos6-main-wrapper.o
+nanos6-main-wrapper.o: libnanos6-main-wrapper.la
+ $(AM_V_LD)$(LD) -r --whole-archive $(top_builddir)/.libs/libnanos6-main-wrapper.a -o nanos6-main-wrapper.o
-libnanos6_library_mode_a_SOURCES = \
+libnanos6_library_mode_la_SOURCES = \
$(library_interception) \
loader/api-versions.c \
loader/api-versions.h \
loader/device_strings.c \
loader/library-mode-init.c
-libnanos6_library_mode_a_CPPFLAGS = $(CUDA_CFLAGS) $(MPI_CXXFLAGS) $(MCMODEL_FLAGS)
+libnanos6_library_mode_la_CPPFLAGS = $(CUDA_CFLAGS) $(MPI_CXXFLAGS) $(MCMODEL_FLAGS)
+libnanos6_library_mode_la_LDFLAGS = -static
-nanos6-library-mode.o: libnanos6-library-mode.a
- $(AM_V_LD)$(LD) -r --whole-archive libnanos6-library-mode.a -o nanos6-library-mode.o
+nanos6-library-mode.o: libnanos6-library-mode.la
+ $(AM_V_LD)$(LD) -r --whole-archive $(top_builddir)/.libs/libnanos6-library-mode.a -o nanos6-library-mode.o
#