From d03ec7d4694b6422e113c1a8166113ed62b1da1a Mon Sep 17 00:00:00 2001 From: vsc46128 Date: Mon, 30 Oct 2023 10:36:46 +0100 Subject: [PATCH 1/2] Only set flag --enable-asmjit when installing on x86_64 --- easybuild/easyconfigs/p/PLUMED/PLUMED-2.6.2-foss-2020b.eb | 3 ++- easybuild/easyconfigs/p/PLUMED/PLUMED-2.7.0-foss-2020b.eb | 3 ++- easybuild/easyconfigs/p/PLUMED/PLUMED-2.7.2-foss-2021a.eb | 3 ++- easybuild/easyconfigs/p/PLUMED/PLUMED-2.7.3-foss-2021b.eb | 3 ++- easybuild/easyconfigs/p/PLUMED/PLUMED-2.8.0-foss-2021b.eb | 3 ++- easybuild/easyconfigs/p/PLUMED/PLUMED-2.8.1-foss-2022a.eb | 3 ++- easybuild/easyconfigs/p/PLUMED/PLUMED-2.9.0-foss-2022b.eb | 3 ++- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/easybuild/easyconfigs/p/PLUMED/PLUMED-2.6.2-foss-2020b.eb b/easybuild/easyconfigs/p/PLUMED/PLUMED-2.6.2-foss-2020b.eb index da1d6cc2774..dd7b7837215 100644 --- a/easybuild/easyconfigs/p/PLUMED/PLUMED-2.6.2-foss-2020b.eb +++ b/easybuild/easyconfigs/p/PLUMED/PLUMED-2.6.2-foss-2020b.eb @@ -35,7 +35,8 @@ dependencies = [ preconfigopts = 'env FC=$MPIF90 LIBS="$LIBLAPACK $LIBS" ' configopts = '--exec-prefix=%(installdir)s --enable-gsl --enable-modules=all --enable-python ' configopts += '--enable-boost_graph --enable-boost_serialization ' -configopts += '--enable-asmjit ' +if ARCH == 'x86_64': + configopts += '--enable-asmjit ' prebuildopts = 'source sourceme.sh && ' # make sure that ld.gold linker is used diff --git a/easybuild/easyconfigs/p/PLUMED/PLUMED-2.7.0-foss-2020b.eb b/easybuild/easyconfigs/p/PLUMED/PLUMED-2.7.0-foss-2020b.eb index efbec7485f0..10d4af1198f 100644 --- a/easybuild/easyconfigs/p/PLUMED/PLUMED-2.7.0-foss-2020b.eb +++ b/easybuild/easyconfigs/p/PLUMED/PLUMED-2.7.0-foss-2020b.eb @@ -33,7 +33,8 @@ dependencies = [ preconfigopts = 'env FC=$MPIF90 LIBS="$LIBLAPACK $LIBS" ' configopts = '--exec-prefix=%(installdir)s --enable-gsl --enable-modules=all --enable-python ' configopts += '--enable-boost_graph --enable-boost_serialization ' -configopts += '--enable-asmjit ' +if ARCH == 'x86_64': + configopts += '--enable-asmjit ' prebuildopts = 'source sourceme.sh && ' # make sure that ld.gold linker is used diff --git a/easybuild/easyconfigs/p/PLUMED/PLUMED-2.7.2-foss-2021a.eb b/easybuild/easyconfigs/p/PLUMED/PLUMED-2.7.2-foss-2021a.eb index 886f07ba021..e3a435b4dd6 100644 --- a/easybuild/easyconfigs/p/PLUMED/PLUMED-2.7.2-foss-2021a.eb +++ b/easybuild/easyconfigs/p/PLUMED/PLUMED-2.7.2-foss-2021a.eb @@ -33,7 +33,8 @@ dependencies = [ preconfigopts = 'env FC=$MPIF90 LIBS="$LIBLAPACK $LIBS" ' configopts = '--exec-prefix=%(installdir)s --enable-gsl --enable-modules=all --enable-python ' configopts += '--enable-boost_graph --enable-boost_serialization ' -configopts += '--enable-asmjit ' +if ARCH == 'x86_64': + configopts += '--enable-asmjit ' prebuildopts = 'source sourceme.sh && ' # make sure that ld.gold linker is used diff --git a/easybuild/easyconfigs/p/PLUMED/PLUMED-2.7.3-foss-2021b.eb b/easybuild/easyconfigs/p/PLUMED/PLUMED-2.7.3-foss-2021b.eb index c7f467034e0..b28de440469 100644 --- a/easybuild/easyconfigs/p/PLUMED/PLUMED-2.7.3-foss-2021b.eb +++ b/easybuild/easyconfigs/p/PLUMED/PLUMED-2.7.3-foss-2021b.eb @@ -33,7 +33,8 @@ dependencies = [ preconfigopts = 'env FC=$MPIF90 LIBS="$LIBLAPACK $LIBS" ' configopts = '--exec-prefix=%(installdir)s --enable-gsl --enable-modules=all --enable-python ' configopts += '--enable-boost_graph --enable-boost_serialization ' -configopts += '--enable-asmjit ' +if ARCH == 'x86_64': + configopts += '--enable-asmjit ' prebuildopts = 'source sourceme.sh && ' # make sure that ld.gold linker is used diff --git a/easybuild/easyconfigs/p/PLUMED/PLUMED-2.8.0-foss-2021b.eb b/easybuild/easyconfigs/p/PLUMED/PLUMED-2.8.0-foss-2021b.eb index 675fa899a60..8e04ba57a68 100644 --- a/easybuild/easyconfigs/p/PLUMED/PLUMED-2.8.0-foss-2021b.eb +++ b/easybuild/easyconfigs/p/PLUMED/PLUMED-2.8.0-foss-2021b.eb @@ -33,7 +33,8 @@ dependencies = [ preconfigopts = 'env FC=$MPIF90 LIBS="$LIBLAPACK $LIBS" ' configopts = '--exec-prefix=%(installdir)s --enable-gsl --enable-modules=all --enable-python ' configopts += '--enable-boost_graph --enable-boost_serialization ' -configopts += '--enable-asmjit ' +if ARCH == 'x86_64': + configopts += '--enable-asmjit ' prebuildopts = 'source sourceme.sh && ' # make sure that ld.gold linker is used diff --git a/easybuild/easyconfigs/p/PLUMED/PLUMED-2.8.1-foss-2022a.eb b/easybuild/easyconfigs/p/PLUMED/PLUMED-2.8.1-foss-2022a.eb index 39272200991..67da6c4a802 100644 --- a/easybuild/easyconfigs/p/PLUMED/PLUMED-2.8.1-foss-2022a.eb +++ b/easybuild/easyconfigs/p/PLUMED/PLUMED-2.8.1-foss-2022a.eb @@ -33,7 +33,8 @@ dependencies = [ preconfigopts = 'env FC=$MPIF90 LIBS="$LIBLAPACK $LIBS" ' configopts = '--exec-prefix=%(installdir)s --enable-gsl --enable-modules=all --enable-python ' configopts += '--enable-boost_graph --enable-boost_serialization ' -configopts += '--enable-asmjit ' +if ARCH == 'x86_64': + configopts += '--enable-asmjit ' prebuildopts = 'source sourceme.sh && ' # make sure that ld.gold linker is used diff --git a/easybuild/easyconfigs/p/PLUMED/PLUMED-2.9.0-foss-2022b.eb b/easybuild/easyconfigs/p/PLUMED/PLUMED-2.9.0-foss-2022b.eb index c0b69eef9b1..b959eaf678f 100644 --- a/easybuild/easyconfigs/p/PLUMED/PLUMED-2.9.0-foss-2022b.eb +++ b/easybuild/easyconfigs/p/PLUMED/PLUMED-2.9.0-foss-2022b.eb @@ -33,7 +33,8 @@ dependencies = [ preconfigopts = 'env FC=$MPIF90 LIBS="$LIBLAPACK $LIBS" ' configopts = '--exec-prefix=%(installdir)s --enable-gsl --enable-modules=all --enable-python ' configopts += '--enable-boost_graph --enable-boost_serialization ' -configopts += '--enable-asmjit ' +if ARCH == 'x86_64': + configopts += '--enable-asmjit ' prebuildopts = 'source sourceme.sh && ' # make sure that ld.gold linker is used From 410e26ab8a3421bf7f584a1723b5c63c4b207041 Mon Sep 17 00:00:00 2001 From: vsc46128 Date: Mon, 30 Oct 2023 16:01:43 +0100 Subject: [PATCH 2/2] remove flag since it is auto-enabled since version 2.8 --- easybuild/easyconfigs/p/PLUMED/PLUMED-2.6.2-foss-2020b.eb | 1 + easybuild/easyconfigs/p/PLUMED/PLUMED-2.7.0-foss-2020b.eb | 1 + easybuild/easyconfigs/p/PLUMED/PLUMED-2.7.2-foss-2021a.eb | 1 + easybuild/easyconfigs/p/PLUMED/PLUMED-2.7.3-foss-2021b.eb | 1 + easybuild/easyconfigs/p/PLUMED/PLUMED-2.8.0-foss-2021b.eb | 2 -- easybuild/easyconfigs/p/PLUMED/PLUMED-2.8.1-foss-2022a.eb | 2 -- easybuild/easyconfigs/p/PLUMED/PLUMED-2.9.0-foss-2022b.eb | 2 -- 7 files changed, 4 insertions(+), 6 deletions(-) diff --git a/easybuild/easyconfigs/p/PLUMED/PLUMED-2.6.2-foss-2020b.eb b/easybuild/easyconfigs/p/PLUMED/PLUMED-2.6.2-foss-2020b.eb index dd7b7837215..73cd893be22 100644 --- a/easybuild/easyconfigs/p/PLUMED/PLUMED-2.6.2-foss-2020b.eb +++ b/easybuild/easyconfigs/p/PLUMED/PLUMED-2.6.2-foss-2020b.eb @@ -36,6 +36,7 @@ preconfigopts = 'env FC=$MPIF90 LIBS="$LIBLAPACK $LIBS" ' configopts = '--exec-prefix=%(installdir)s --enable-gsl --enable-modules=all --enable-python ' configopts += '--enable-boost_graph --enable-boost_serialization ' if ARCH == 'x86_64': + # the flag is not supported on aarch64 configopts += '--enable-asmjit ' prebuildopts = 'source sourceme.sh && ' diff --git a/easybuild/easyconfigs/p/PLUMED/PLUMED-2.7.0-foss-2020b.eb b/easybuild/easyconfigs/p/PLUMED/PLUMED-2.7.0-foss-2020b.eb index 10d4af1198f..dc860859939 100644 --- a/easybuild/easyconfigs/p/PLUMED/PLUMED-2.7.0-foss-2020b.eb +++ b/easybuild/easyconfigs/p/PLUMED/PLUMED-2.7.0-foss-2020b.eb @@ -34,6 +34,7 @@ preconfigopts = 'env FC=$MPIF90 LIBS="$LIBLAPACK $LIBS" ' configopts = '--exec-prefix=%(installdir)s --enable-gsl --enable-modules=all --enable-python ' configopts += '--enable-boost_graph --enable-boost_serialization ' if ARCH == 'x86_64': + # the flag is not supported on aarch64 configopts += '--enable-asmjit ' prebuildopts = 'source sourceme.sh && ' diff --git a/easybuild/easyconfigs/p/PLUMED/PLUMED-2.7.2-foss-2021a.eb b/easybuild/easyconfigs/p/PLUMED/PLUMED-2.7.2-foss-2021a.eb index e3a435b4dd6..3a0b31731ee 100644 --- a/easybuild/easyconfigs/p/PLUMED/PLUMED-2.7.2-foss-2021a.eb +++ b/easybuild/easyconfigs/p/PLUMED/PLUMED-2.7.2-foss-2021a.eb @@ -34,6 +34,7 @@ preconfigopts = 'env FC=$MPIF90 LIBS="$LIBLAPACK $LIBS" ' configopts = '--exec-prefix=%(installdir)s --enable-gsl --enable-modules=all --enable-python ' configopts += '--enable-boost_graph --enable-boost_serialization ' if ARCH == 'x86_64': + # the flag is not supported on aarch64 configopts += '--enable-asmjit ' prebuildopts = 'source sourceme.sh && ' diff --git a/easybuild/easyconfigs/p/PLUMED/PLUMED-2.7.3-foss-2021b.eb b/easybuild/easyconfigs/p/PLUMED/PLUMED-2.7.3-foss-2021b.eb index b28de440469..c653aa77c5b 100644 --- a/easybuild/easyconfigs/p/PLUMED/PLUMED-2.7.3-foss-2021b.eb +++ b/easybuild/easyconfigs/p/PLUMED/PLUMED-2.7.3-foss-2021b.eb @@ -34,6 +34,7 @@ preconfigopts = 'env FC=$MPIF90 LIBS="$LIBLAPACK $LIBS" ' configopts = '--exec-prefix=%(installdir)s --enable-gsl --enable-modules=all --enable-python ' configopts += '--enable-boost_graph --enable-boost_serialization ' if ARCH == 'x86_64': + # the flag is not supported on aarch64 configopts += '--enable-asmjit ' prebuildopts = 'source sourceme.sh && ' diff --git a/easybuild/easyconfigs/p/PLUMED/PLUMED-2.8.0-foss-2021b.eb b/easybuild/easyconfigs/p/PLUMED/PLUMED-2.8.0-foss-2021b.eb index 8e04ba57a68..8dcdc9293d7 100644 --- a/easybuild/easyconfigs/p/PLUMED/PLUMED-2.8.0-foss-2021b.eb +++ b/easybuild/easyconfigs/p/PLUMED/PLUMED-2.8.0-foss-2021b.eb @@ -33,8 +33,6 @@ dependencies = [ preconfigopts = 'env FC=$MPIF90 LIBS="$LIBLAPACK $LIBS" ' configopts = '--exec-prefix=%(installdir)s --enable-gsl --enable-modules=all --enable-python ' configopts += '--enable-boost_graph --enable-boost_serialization ' -if ARCH == 'x86_64': - configopts += '--enable-asmjit ' prebuildopts = 'source sourceme.sh && ' # make sure that ld.gold linker is used diff --git a/easybuild/easyconfigs/p/PLUMED/PLUMED-2.8.1-foss-2022a.eb b/easybuild/easyconfigs/p/PLUMED/PLUMED-2.8.1-foss-2022a.eb index 67da6c4a802..846670014d4 100644 --- a/easybuild/easyconfigs/p/PLUMED/PLUMED-2.8.1-foss-2022a.eb +++ b/easybuild/easyconfigs/p/PLUMED/PLUMED-2.8.1-foss-2022a.eb @@ -33,8 +33,6 @@ dependencies = [ preconfigopts = 'env FC=$MPIF90 LIBS="$LIBLAPACK $LIBS" ' configopts = '--exec-prefix=%(installdir)s --enable-gsl --enable-modules=all --enable-python ' configopts += '--enable-boost_graph --enable-boost_serialization ' -if ARCH == 'x86_64': - configopts += '--enable-asmjit ' prebuildopts = 'source sourceme.sh && ' # make sure that ld.gold linker is used diff --git a/easybuild/easyconfigs/p/PLUMED/PLUMED-2.9.0-foss-2022b.eb b/easybuild/easyconfigs/p/PLUMED/PLUMED-2.9.0-foss-2022b.eb index b959eaf678f..a2971db49f7 100644 --- a/easybuild/easyconfigs/p/PLUMED/PLUMED-2.9.0-foss-2022b.eb +++ b/easybuild/easyconfigs/p/PLUMED/PLUMED-2.9.0-foss-2022b.eb @@ -33,8 +33,6 @@ dependencies = [ preconfigopts = 'env FC=$MPIF90 LIBS="$LIBLAPACK $LIBS" ' configopts = '--exec-prefix=%(installdir)s --enable-gsl --enable-modules=all --enable-python ' configopts += '--enable-boost_graph --enable-boost_serialization ' -if ARCH == 'x86_64': - configopts += '--enable-asmjit ' prebuildopts = 'source sourceme.sh && ' # make sure that ld.gold linker is used