Commit 0cc7e71c authored by Mulas, Giacomo's avatar Mulas, Giacomo
Browse files

remove explicit openblas detection, pkg-config for openblas64 is broken

parent f3d2d5e0

build/configure

+8 −24
Original line number Diff line number Diff line
@@ -25227,20 +25227,12 @@ then : 
        export LAPACKLDFLAGS=$(pkg-config --libs ${MKL_BUILD})

      else

        # MKL was not found, so configuration searches for BLAS

        declare -a pkg_array=$(pkg-config --list-all | grep openblas${LAPACK_LDSPEC})

        for i in "${pkg_array[@]}"; do echo "$i" | cut --delimiter=" " -f1; done | grep openblas${LAPACK_LDSPEC} > /dev/null

        result=$?

        if test "x$result" = "x0"; then

          # OpenBLAS was found

	  export BLASLDFLAGS=$(pkg-config --libs openblas${LAPACK_LDSPEC})

	else

        declare -a pkg_array=$(pkg-config --list-all | grep blas${LAPACK_LDSPEC})

        for i in "${pkg_array[@]}"; do echo "$i" | cut --delimiter=" " -f1; done | grep blas${LAPACK_LDSPEC} > /dev/null

        result=$?

        if test "x$result" = "x0"; then

          # BLAS was found

	  export BLASLDFLAGS=$(pkg-config --libs blas${LAPACK_LDSPEC})

	  fi

        fi # end of BLAS decision tree

        # search for LAPACKe

        declare -a pkg_array=$(pkg-config --list-all | grep lapacke${LAPACK_LDSPEC})
@@ -25337,20 +25329,12 @@ else case e in #( 
        export LAPACKLDFLAGS=$(pkg-config --libs ${MKL_BUILD})

      else

        # MKL was not found, so configuration searches for BLAS

        declare -a pkg_array=$(pkg-config --list-all | grep openblas${LAPACK_LDSPEC})

        for i in "${pkg_array[@]}"; do echo "$i" | cut --delimiter=" " -f1; done | grep openblas${LAPACK_LDSPEC} > /dev/null

        result=$?

        if test "x$result" = "x0"; then

          # OpenBLAS was found

	  export BLASLDFLAGS=$(pkg-config --libs openblas${LAPACK_LDSPEC})

	else

        declare -a pkg_array=$(pkg-config --list-all | grep blas${LAPACK_LDSPEC})

        for i in "${pkg_array[@]}"; do echo "$i" | cut --delimiter=" " -f1; done | grep blas${LAPACK_LDSPEC} > /dev/null

        result=$?

        if test "x$result" = "x0"; then

          # BLAS was found

	  export BLASLDFLAGS=$(pkg-config --libs blas${LAPACK_LDSPEC})

	  fi

        fi # end of BLAS decision tree

        # search for LAPACKe

        declare -a pkg_array=$(pkg-config --list-all | grep lapacke${LAPACK_LDSPEC})

build/configure.ac

+4 −12
Original line number Diff line number Diff line
@@ -108,20 +108,12 @@ m4_define( 
        export LAPACKLDFLAGS=$(pkg-config --libs ${MKL_BUILD})

      else

        # MKL was not found, so configuration searches for BLAS

        declare -a pkg_array=$(pkg-config --list-all | grep openblas${LAPACK_LDSPEC})

        for i in "${pkg_array[[@]]}"; do echo "$i" | cut --delimiter=" " -f1; done | grep openblas${LAPACK_LDSPEC} > /dev/null

        result=$?

        if test "x$result" = "x0"; then

          # OpenBLAS was found

	  export BLASLDFLAGS=$(pkg-config --libs openblas${LAPACK_LDSPEC})

	else

        declare -a pkg_array=$(pkg-config --list-all | grep blas${LAPACK_LDSPEC})

        for i in "${pkg_array[[@]]}"; do echo "$i" | cut --delimiter=" " -f1; done | grep blas${LAPACK_LDSPEC} > /dev/null

        result=$?

        if test "x$result" = "x0"; then

          # BLAS was found

	  export BLASLDFLAGS=$(pkg-config --libs blas${LAPACK_LDSPEC})

	  fi

        fi # end of BLAS decision tree

        # search for LAPACKe

        declare -a pkg_array=$(pkg-config --list-all | grep lapacke${LAPACK_LDSPEC})