fix missing spaces in Graphviz configure options

jfgrimm · Jan 23, 2024 · b32132e · b32132e
1 parent 5030f4c
commit b32132e
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 33 deletions.
diff --git a/easybuild/easyconfigs/g/Graphviz/Graphviz-5.0.0-GCCcore-11.3.0.eb b/easybuild/easyconfigs/g/Graphviz/Graphviz-5.0.0-GCCcore-11.3.0.eb
@@ -51,17 +51,21 @@ dependencies = [
 
 preconfigopts = './autogen.sh NOCONFIG && '
 
-configopts = '--enable-python%s=yes ' % local_pyver_major
-configopts += '--enable-guile=no --enable-lua=no --enable-ocaml=no '
-configopts += '--enable-r=no --enable-ruby=no --enable-php=no '
-# Use ltdl from libtool in EB
-configopts += '--enable-ltdl --without-included-ltdl --disable-ltdl-install '
-configopts += '--with-ltdl-include=$EBROOTLIBTOOL/include --with-ltdl-lib=$EBROOTLIBTOOL/lib '
-# Override the hardcoded paths to Java libraries
-configopts += '--with-javaincludedir=$JAVA_HOME/include --with-javaincludedir=$JAVA_HOME/include/linux '
-configopts += '--with-javalibdir=$JAVA_HOME/lib'
-configopts += '--with-expatincludedir=$EBROOTEXPAT/include --with-expatlibdir=$EBROOTEXPAT/lib'
-configopts += '--with-zincludedir=$EBROOTZLIB/include --with-zlibdir=$EBROOTZLIB/lib'
+_copts = [
+    '--enable-python%s=yes' % local_pyver_major,
+    '--enable-guile=no --enable-lua=no --enable-ocaml=no',
+    '--enable-r=no --enable-ruby=no --enable-php=no',
+    # Use ltdl from libtool in EB
+    '--enable-ltdl --without-included-ltdl --disable-ltdl-install',
+    '--with-ltdl-include=$EBROOTLIBTOOL/include --with-ltdl-lib=$EBROOTLIBTOOL/lib',
+    # Override the hardcoded paths to Java libraries
+    '--with-javaincludedir=$JAVA_HOME/include --with-javaincludedir=$JAVA_HOME/include/linux',
+    '--with-javalibdir=$JAVA_HOME/lib',
+    '--with-expatincludedir=$EBROOTEXPAT/include --with-expatlibdir=$EBROOTEXPAT/lib',
+    '--with-zincludedir=$EBROOTZLIB/include --with-zlibdir=$EBROOTZLIB/lib',
+]
+
+configopts = ' '.join(_copts)
 
 prebuildopts = 'qmake -o cmd/gvedit/qMakefile cmd/gvedit/gvedit.pro && '
 

diff --git a/easybuild/easyconfigs/g/Graphviz/Graphviz-8.1.0-GCCcore-12.2.0.eb b/easybuild/easyconfigs/g/Graphviz/Graphviz-8.1.0-GCCcore-12.2.0.eb
@@ -50,17 +50,21 @@ dependencies = [
 
 preconfigopts = './autogen.sh NOCONFIG && '
 
-configopts = '--enable-python%s=yes ' % local_pyver_major
-configopts += '--enable-guile=no --enable-lua=no --enable-ocaml=no '
-configopts += '--enable-r=no --enable-ruby=no --enable-php=no '
-# Use ltdl from libtool in EB
-configopts += '--enable-ltdl --without-included-ltdl --disable-ltdl-install '
-configopts += '--with-ltdl-include=$EBROOTLIBTOOL/include --with-ltdl-lib=$EBROOTLIBTOOL/lib '
-# Override the hardcoded paths to Java libraries
-configopts += '--with-javaincludedir=$JAVA_HOME/include --with-javaincludedir=$JAVA_HOME/include/linux '
-configopts += '--with-javalibdir=$JAVA_HOME/lib'
-configopts += '--with-expatincludedir=$EBROOTEXPAT/include --with-expatlibdir=$EBROOTEXPAT/lib'
-configopts += '--with-zincludedir=$EBROOTZLIB/include --with-zlibdir=$EBROOTZLIB/lib'
+_copts = [
+    '--enable-python%s=yes' % local_pyver_major,
+    '--enable-guile=no --enable-lua=no --enable-ocaml=no',
+    '--enable-r=no --enable-ruby=no --enable-php=no',
+    # Use ltdl from libtool in EB
+    '--enable-ltdl --without-included-ltdl --disable-ltdl-install',
+    '--with-ltdl-include=$EBROOTLIBTOOL/include --with-ltdl-lib=$EBROOTLIBTOOL/lib',
+    # Override the hardcoded paths to Java libraries
+    '--with-javaincludedir=$JAVA_HOME/include --with-javaincludedir=$JAVA_HOME/include/linux',
+    '--with-javalibdir=$JAVA_HOME/lib',
+    '--with-expatincludedir=$EBROOTEXPAT/include --with-expatlibdir=$EBROOTEXPAT/lib',
+    '--with-zincludedir=$EBROOTZLIB/include --with-zlibdir=$EBROOTZLIB/lib',
+]
+
+configopts = ' '.join(_copts)
 
 prebuildopts = 'qmake -o cmd/gvedit/qMakefile cmd/gvedit/gvedit.pro && '
 

diff --git a/easybuild/easyconfigs/g/Graphviz/Graphviz-8.1.0-GCCcore-12.3.0.eb b/easybuild/easyconfigs/g/Graphviz/Graphviz-8.1.0-GCCcore-12.3.0.eb
@@ -50,17 +50,21 @@ dependencies = [
 
 preconfigopts = './autogen.sh NOCONFIG && '
 
-configopts = '--enable-python%s=yes ' % local_pyver_major
-configopts += '--enable-guile=no --enable-lua=no --enable-ocaml=no '
-configopts += '--enable-r=no --enable-ruby=no --enable-php=no '
-# Use ltdl from libtool in EB
-configopts += '--enable-ltdl --without-included-ltdl --disable-ltdl-install '
-configopts += '--with-ltdl-include=$EBROOTLIBTOOL/include --with-ltdl-lib=$EBROOTLIBTOOL/lib '
-# Override the hardcoded paths to Java libraries
-configopts += '--with-javaincludedir=$JAVA_HOME/include --with-javaincludedir=$JAVA_HOME/include/linux '
-configopts += '--with-javalibdir=$JAVA_HOME/lib'
-configopts += '--with-expatincludedir=$EBROOTEXPAT/include --with-expatlibdir=$EBROOTEXPAT/lib'
-configopts += '--with-zincludedir=$EBROOTZLIB/include --with-zlibdir=$EBROOTZLIB/lib'
+_copts = [
+    '--enable-python%s=yes' % local_pyver_major,
+    '--enable-guile=no --enable-lua=no --enable-ocaml=no',
+    '--enable-r=no --enable-ruby=no --enable-php=no',
+    # Use ltdl from libtool in EB
+    '--enable-ltdl --without-included-ltdl --disable-ltdl-install',
+    '--with-ltdl-include=$EBROOTLIBTOOL/include --with-ltdl-lib=$EBROOTLIBTOOL/lib',
+    # Override the hardcoded paths to Java libraries
+    '--with-javaincludedir=$JAVA_HOME/include --with-javaincludedir=$JAVA_HOME/include/linux',
+    '--with-javalibdir=$JAVA_HOME/lib',
+    '--with-expatincludedir=$EBROOTEXPAT/include --with-expatlibdir=$EBROOTEXPAT/lib',
+    '--with-zincludedir=$EBROOTZLIB/include --with-zlibdir=$EBROOTZLIB/lib',
+]
+
+configopts = ' '.join(_copts)
 
 prebuildopts = 'qmake -o cmd/gvedit/qMakefile cmd/gvedit/gvedit.pro && '