Merge branch 'bugfixes_current_release'

.gitlab-ci.yml

@@ -1816,6 +1816,16 @@ gfortran-set-kernel-via-environment-variable-nompi-noopenmp-job:
     paths:
       - coverage_data
 
+static-build:
+  tags:
+    - cpu
+  script:
+    - ./autogen.sh
+    - ./configure CFLAGS="-O3 -mavx" CXXFLAGS="-O3 -mavx" FCFLAGS="-O3 -mavx" SCALAPACK_LDFLAGS="$MKL_INTEL_SCALAPACK_NO_MPI_NO_OMP" SCALAPACK_FCFLAGS="$MKL_INTEL_SCALAPACK_FCFLAGS_NO_MPI_NO_OMP"  --with-mpi=no FC=ifort --enable-shared=no --enable-static=yes
+    - make -j 8
+    - export LD_LIBRARY_PATH=$MKL_HOME/lib/intel64:$LD_LIBRARY_PATH
+    - make check TEST_FLAGS='1500 50 16' || { cat test-suite.log; exit 1; }
+
 # test distcheck
 distcheck:
   tags:

Makefile.am

@@ -238,7 +238,7 @@ noinst_PROGRAMS = \
   elpa2_test_complex_c_version@SUFFIX@
 
 
-build_lib = libelpa@SUFFIX@.la libelpatest@SUFFIX@.la
+build_lib = libelpatest@SUFFIX@.la libelpa@SUFFIX@.la
 
 # library with shared sources for the test files
 noinst_LTLIBRARIES += libelpatest@SUFFIX@.la