Merge pull request #20428 from bedroge/ucx_dont_use_configure_wrapper

use regular `configure` instead of wrapper script for recent UCX easyconfigs
easybuilders · May 3, 2024 · a080c2f · a080c2f
2 parents f37ff45 + 538ab2a
commit a080c2f
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 18 deletions.
diff --git a/easybuild/easyconfigs/u/UCX/UCX-1.13.1-GCCcore-12.2.0.eb b/easybuild/easyconfigs/u/UCX/UCX-1.13.1-GCCcore-12.2.0.eb
@@ -40,10 +40,10 @@ dependencies = [
     ('numactl', '2.0.16'),
 ]
 
-configure_cmd = "contrib/configure-release"
-
 configopts = '--enable-optimizations --enable-cma --enable-mt --with-verbs '
 configopts += '--without-java --without-go --disable-doxygen-doc '
+# include the configure options from contrib/configure-release
+configopts += '--disable-logging --disable-debug --disable-assertions --disable-params-check '
 
 buildopts = 'V=1'
 

diff --git a/easybuild/easyconfigs/u/UCX/UCX-1.14.0-GCCcore-12.2.0.eb b/easybuild/easyconfigs/u/UCX/UCX-1.14.0-GCCcore-12.2.0.eb
@@ -37,10 +37,10 @@ dependencies = [
     ('numactl', '2.0.16'),
 ]
 
-configure_cmd = "contrib/configure-release"
-
 configopts = '--enable-optimizations --enable-cma --enable-mt --with-verbs '
 configopts += '--without-java --without-go --disable-doxygen-doc '
+# include the configure options from contrib/configure-release
+configopts += '--disable-logging --disable-debug --disable-assertions --disable-params-check '
 
 buildopts = 'V=1'
 

diff --git a/easybuild/easyconfigs/u/UCX/UCX-1.14.1-GCCcore-12.3.0.eb b/easybuild/easyconfigs/u/UCX/UCX-1.14.1-GCCcore-12.3.0.eb
@@ -37,10 +37,10 @@ dependencies = [
     ('numactl', '2.0.16'),
 ]
 
-configure_cmd = "contrib/configure-release"
-
 configopts = '--enable-optimizations --enable-cma --enable-mt --with-verbs '
 configopts += '--without-java --without-go --disable-doxygen-doc '
+# include the configure options from contrib/configure-release
+configopts += '--disable-logging --disable-debug --disable-assertions --disable-params-check '
 
 buildopts = 'V=1'
 

diff --git a/easybuild/easyconfigs/u/UCX/UCX-1.15.0-GCCcore-13.2.0.eb b/easybuild/easyconfigs/u/UCX/UCX-1.15.0-GCCcore-13.2.0.eb
@@ -43,10 +43,10 @@ if ARCH == "riscv64":
                    '700640d469f441f3ee2c9d42e3a533f78f0c892c1d3c221aebd41279668d118e'}]
     preconfigopts = 'autoreconf -fi && '
 
-configure_cmd = "contrib/configure-release"
-
 configopts = '--enable-optimizations --enable-cma --enable-mt --with-verbs '
 configopts += '--without-java --without-go --disable-doxygen-doc '
+# include the configure options from contrib/configure-release
+configopts += '--disable-logging --disable-debug --disable-assertions --disable-params-check '
 
 buildopts = 'V=1'
 

diff --git a/easybuild/easyconfigs/u/UCX/UCX-1.16.0-rc4-GCCcore-11.2.0.eb b/easybuild/easyconfigs/u/UCX/UCX-1.16.0-rc4-GCCcore-11.2.0.eb
@@ -35,10 +35,10 @@ dependencies = [
     ('numactl', '2.0.14'),
 ]
 
-configure_cmd = "contrib/configure-release"
-
 configopts = '--enable-optimizations --enable-cma --enable-mt --with-verbs '
 configopts += '--without-java --without-go --disable-doxygen-doc '
+# include the configure options from contrib/configure-release
+configopts += '--disable-logging --disable-debug --disable-assertions --disable-params-check '
 
 buildopts = 'V=1'
 

diff --git a/easybuild/easyconfigs/u/UCX/UCX-1.16.0-rc4-GCCcore-11.3.0.eb b/easybuild/easyconfigs/u/UCX/UCX-1.16.0-rc4-GCCcore-11.3.0.eb
@@ -35,10 +35,10 @@ dependencies = [
     ('numactl', '2.0.14'),
 ]
 
-configure_cmd = "contrib/configure-release"
-
 configopts = '--enable-optimizations --enable-cma --enable-mt --with-verbs '
 configopts += '--without-java --without-go --disable-doxygen-doc '
+# include the configure options from contrib/configure-release
+configopts += '--disable-logging --disable-debug --disable-assertions --disable-params-check '
 
 buildopts = 'V=1'
 

diff --git a/easybuild/easyconfigs/u/UCX/UCX-1.16.0-rc4-GCCcore-12.2.0.eb b/easybuild/easyconfigs/u/UCX/UCX-1.16.0-rc4-GCCcore-12.2.0.eb
@@ -35,10 +35,10 @@ dependencies = [
     ('numactl', '2.0.16'),
 ]
 
-configure_cmd = "contrib/configure-release"
-
 configopts = '--enable-optimizations --enable-cma --enable-mt --with-verbs '
 configopts += '--without-java --without-go --disable-doxygen-doc '
+# include the configure options from contrib/configure-release
+configopts += '--disable-logging --disable-debug --disable-assertions --disable-params-check '
 
 buildopts = 'V=1'
 

diff --git a/easybuild/easyconfigs/u/UCX/UCX-1.16.0-rc4-GCCcore-12.3.0.eb b/easybuild/easyconfigs/u/UCX/UCX-1.16.0-rc4-GCCcore-12.3.0.eb
@@ -35,10 +35,10 @@ dependencies = [
     ('numactl', '2.0.16'),
 ]
 
-configure_cmd = "contrib/configure-release"
-
 configopts = '--enable-optimizations --enable-cma --enable-mt --with-verbs '
 configopts += '--without-java --without-go --disable-doxygen-doc '
+# include the configure options from contrib/configure-release
+configopts += '--disable-logging --disable-debug --disable-assertions --disable-params-check '
 
 buildopts = 'V=1'
 

diff --git a/easybuild/easyconfigs/u/UCX/UCX-1.16.0-rc4-GCCcore-13.2.0.eb b/easybuild/easyconfigs/u/UCX/UCX-1.16.0-rc4-GCCcore-13.2.0.eb
@@ -35,10 +35,10 @@ dependencies = [
     ('numactl', '2.0.16'),
 ]
 
-configure_cmd = "contrib/configure-release"
-
 configopts = '--enable-optimizations --enable-cma --enable-mt --with-verbs '
 configopts += '--without-java --without-go --disable-doxygen-doc '
+# include the configure options from contrib/configure-release
+configopts += '--disable-logging --disable-debug --disable-assertions --disable-params-check '
 
 buildopts = 'V=1'