Skip to content

Commit 5eb5553

Browse files
authored
Merge pull request #365 from trz42/rebuild_NESSI_extend_3rd
rebuild NESSI-extend (3rd attempt)
2 parents f7c8f79 + 63c15c5 commit 5eb5553

2 files changed

Lines changed: 3 additions & 14 deletions

File tree

EESSI-extend-2023.06-easybuild.eb

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ description = """
4242
toolchain = SYSTEM
4343

4444
# All the dependencies we filter in NESSI
45-
local_deps_to_filter = "Autoconf,Automake,Autotools,binutils,bzip2,DBus,flex,gettext,gperf,help2man,intltool,libreadline,libtool,M4,makeinfo,ncurses,util-linux,XZ,zlib"
45+
local_deps_to_filter = "Autoconf,Automake,Autotools,binutils,bzip2,DBus,flex,gettext,gperf,help2man,intltool,libreadline,libtool,M4,makeinfo,ncurses,util-linux,XZ,zlib,PSM2"
4646
local_arch_specific_deps_to_filter = {'aarch64': ',yasm', 'x86_64': ''}
4747
local_deps_to_filter += local_arch_specific_deps_to_filter[ARCH]
4848

@@ -95,19 +95,7 @@ elseif (os.getenv("NESSI_SITE_INSTALL") ~= nil) then
9595
if ((os.getenv("NESSI_PROJECT_INSTALL") ~= nil) or (os.getenv("NESSI_USER_INSTALL") ~= nil)) then
9696
LmodError("You cannot use NESSI_SITE_INSTALL in combination with any other NESSI_*_INSTALL environment variables")
9797
end
98-
site_install = os.getenv("NESSI_SITE_INSTALL")
99-
site_modulepath = nil
100-
if (site_install ~= nil) then
101-
-- Check the folder exists
102-
if not isDir(site_install) then
103-
LmodError("The location of NESSI_SITE_INSTALL (" .. site_install .. ") does not exist or is not a folder")
104-
end
105-
if (mode() == "load") then
106-
LmodMessage("Configuring for use of NESSI_SITE_INSTALL under " .. site_install)
107-
end
108-
easybuild_installpath = string.gsub(os.getenv("EESSI_SOFTWARE_PATH"), os.getenv("EESSI_CVMFS_REPO"), site_install)
109-
site_modulepath = pathJoin(easybuild_installpath, 'modules', 'all')
110-
end
98+
easybuild_installpath = string.gsub(os.getenv("EESSI_SOFTWARE_PATH"), 'versions', 'host_injections')
11199
else
112100
-- Deal with user and project installs
113101
project_install = os.getenv("NESSI_PROJECT_INSTALL")

easystacks/pilot.nessi.no/2023.06/eessi-2023.06-eb-4.9.1-001-system.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ easyconfigs:
33
options:
44
from-pr: 20299
55
- EESSI-extend-2023.06-easybuild.eb
6+
# comment to trigger rebuild

0 commit comments

Comments
 (0)