only filter Autotools & co (build) dependencies for EESSI 2023.06

Author: boegel

EESSI-extend-easybuild.eb

@@ -44,11 +44,19 @@ description = """
 
 toolchain = SYSTEM
 
+eessi_version = os.getenv("EESSI_VERSION") or "2023.06"
+
 # All the dependencies we filter in EESSI
-local_deps_to_filter = "Autoconf,Automake,Autotools,binutils,bzip2,DBus,flex,gettext,gperf,help2man,intltool,libreadline,libtool,M4,makeinfo,ncurses,ParMETIS,util-linux,XZ,zlib"
+local_deps_to_filter = "binutils,bzip2,DBus,flex,gettext,gperf,help2man,intltool,libreadline,libtool,makeinfo,ncurses,ParMETIS,util-linux,XZ,zlib"
+
+# filter extra dependencies based on CPU family
 local_arch_specific_deps_to_filter = {'aarch64': ',Yasm', 'riscv64': ',Yasm', 'x86_64': ''}
 local_deps_to_filter += local_arch_specific_deps_to_filter[ARCH]
 
+# only filter Autotools & co for EESSI 2023.06
+if eessi_version == '2023.06':
+    local_deps_to_filter += ",Autoconf,Automake,Autotools,libtool,M4"
+
 # Set the universal EasyBuild variables
 modextravars = {
     'EASYBUILD_FILTER_DEPS': local_deps_to_filter,
@@ -209,7 +217,6 @@ if not ( isloaded("EasyBuild") ) then
     load(latest("EasyBuild"))
 end
 easybuild_version = os.getenv("EBVERSIONEASYBUILD") or easybuild_version
-eessi_version = os.getenv("EESSI_VERSION") or "2023.06"
 
 -- Set environment variables that are EasyBuild version specific
 -- Do unload unconditionally, so that even if EB versions were switched in the meantime, this gets unset