Commit c6323cdd authored by Stepan Nassyr's avatar Stepan Nassyr
Browse files

armlinux-install 22.0.1: still needs patching

parent af28f4d4
diff --color -urN a/modulefiles/acfl/22.0.1 b/modulefiles/acfl/22.0.1
--- a/modulefiles/acfl/22.0.1 2022-05-06 19:48:55.000000000 +0000
+++ b/modulefiles/acfl/22.0.1 2022-05-06 19:49:47.000000000 +0000
@@ -46,10 +46,7 @@
source $module_prefix/moduleglobals/compiler_functions/22.0.1
# Load modules on which this module depends
-set dependencies [list \
- binutils/11.2.0 \
- ]
-depends-on $dependencies
+depends-on binutils/11.2.0
# Install directory of this package
set package_prefix $install_prefix/arm-linux-compiler-22.0.1_Generic-AArch64_RHEL-8_aarch64-linux
diff --color -urN a/modulefiles/gnu/11.2.0 b/modulefiles/gnu/11.2.0
--- a/modulefiles/gnu/11.2.0 2022-05-06 19:48:55.000000000 +0000
+++ b/modulefiles/gnu/11.2.0 2022-05-06 19:50:09.000000000 +0000
@@ -46,10 +46,7 @@
source $module_prefix/moduleglobals/gcc_functions/11.2.0
# Load modules on which this module depends
-set dependencies [list \
- binutils/11.2.0 \
- ]
-depends-on $dependencies
+depends-on binutils/11.2.0
# Install directory of this package
set package_prefix $install_prefix/gcc-11.2.0_Generic-AArch64_RHEL-8_aarch64-linux
diff --color -urN a/moduledeps/acfl/22.0.1/armpl/22.0.1 b/moduledeps/acfl/22.0.1/armpl/22.0.1
--- a/moduledeps/acfl/22.0.1/armpl/22.0.1 2022-05-06 19:49:00.000000000 +0000
+++ b/moduledeps/acfl/22.0.1/armpl/22.0.1 2022-05-06 19:50:34.000000000 +0000
@@ -44,10 +44,7 @@
source $module_prefix/moduleglobals/compiler_functions/22.0.1
# Load modules on which this module depends
-set dependencies [list \
- acfl/22.0.1 \
- ]
-depends-on $dependencies
+depends-on acfl/22.0.1
# Install directory of this package
set package_prefix $install_prefix/armpl-22.0.1_AArch64_RHEL-8_arm-linux-compiler_aarch64-linux
diff --color -urN a/moduledeps/gnu/11.2.0/armpl/22.0.1 b/moduledeps/gnu/11.2.0/armpl/22.0.1
--- a/moduledeps/gnu/11.2.0/armpl/22.0.1 2022-05-06 19:49:00.000000000 +0000
+++ b/moduledeps/gnu/11.2.0/armpl/22.0.1 2022-05-06 19:50:57.000000000 +0000
@@ -44,10 +44,7 @@
source $module_prefix/moduleglobals/gcc_functions/11.2.0
# Load modules on which this module depends
-set dependencies [list \
- gnu/11.2.0 \
- ]
-depends-on $dependencies
+depends-on gnu/11.2.0
# Install directory of this package
set package_prefix $install_prefix/armpl-22.0.1_AArch64_RHEL-8_gcc_aarch64-linux
......@@ -15,10 +15,10 @@ sources = [{
'source_urls' : ['https://developer.arm.com/-/media/Files/downloads/hpc/arm-allinea-studio/%s/' % version.replace('.','-')],
'filename' : 'arm-compiler-for-linux_%(version)s_RHEL-8_%(arch)s.tar'
},
# {
# 'filename' : 'armlinux-module-fix-dependencies-for-lmod.patch',
# 'extract_cmd' : 'cp %s %(builddir)s'
# }
{
'filename' : 'armlinux-install-%(version)s-lmod-cant-tcl-list.patch',
'extract_cmd' : 'cp %s %(builddir)s'
}
]
#patches = []
# Don't patch sources, patch as postinstallcmd instead
......@@ -29,9 +29,9 @@ extract_sources = True
install_cmd = '%(builddir)s/arm-compiler-for-linux_%(version)s_RHEL-8/arm-compiler-for-linux_%(version)s_RHEL-8.sh -a -i %(installdir)s'
# Patch modulefiles so they work with LMod
#postinstallcmds = [
# 'cd %(installdir)s/modulefiles && patch -p1 < %(builddir)s/armlinux-module-fix-dependencies-for-lmod.patch'
#]
postinstallcmds = [
'cd %(installdir)s/ && patch -p1 < %(builddir)s/armlinux-install-%(version)s-lmod-cant-tcl-list.patch'
]
sanity_check_paths = {
'files' : ['arm-linux-compiler-%%(version)s_Generic-AArch64_RHEL-8_%%(arch)s-linux/bin/%s' % bin for bin in ['armclang','armclang++','armflang']],
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment