--- configure.orig 2019-04-29 06:51:49.000000000 +0800 +++ configure 2023-07-11 13:23:08.000000000 +0800 @@ -2721,7 +2721,7 @@ ## we know this one is bad can_use_openmp="no" ;; - 5.4*|5.5*|5.6*|5.7*|5.8*|5.9*|6.*|7.*|8.*|9.*|10.*) + 5.4*|5.5*|5.6*|5.7*|5.8*|5.9*|6.*|7.*|8.*|9.*|10.*|11.*|12.*|13.*|14.*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, with OpenMP as version ${gxx_version}" >&5 $as_echo "yes, with OpenMP as version ${gxx_version}" >&6; } ## we know this one is good, yay @@ -2738,63 +2738,6 @@ esac fi -## Check for Apple LLVM - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for macOS" >&5 -$as_echo_n "checking for macOS... " >&6; } -RSysinfoName=$("${R_HOME}/bin/Rscript" --vanilla -e 'cat(Sys.info()["sysname"])') - -if test x"${RSysinfoName}" == x"Darwin"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 -$as_echo "found" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for macOS Apple compiler" >&5 -$as_echo_n "checking for macOS Apple compiler... " >&6; } - - apple_compiler=$($CXX --version 2>&1 | grep -i -c -e 'apple llvm') - - if test x"${apple_compiler}" == x"1"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 -$as_echo "found" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OpenMP unavailable and turned off." >&5 -$as_echo "$as_me: WARNING: OpenMP unavailable and turned off." >&2;} - can_use_openmp="no" - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -$as_echo "not found" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clang compiler" >&5 -$as_echo_n "checking for clang compiler... " >&6; } - clang_compiler=$($CXX --version 2>&1 | grep -i -c -e 'clang ') - - if test x"${clang_compiler}" == x"1"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 -$as_echo "found" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenMP compatible version of clang" >&5 -$as_echo_n "checking for OpenMP compatible version of clang... " >&6; } - clang_version=$(${CXX} -v 2>&1 | awk '/^.*clang version/ {print $3}') - - case ${clang_version} in - 4.*|5.*|6.*|7.*|8.*) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found and suitable" >&5 -$as_echo "found and suitable" >&6; } - can_use_openmp="yes" - ;; - *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -$as_echo "not found" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OpenMP unavailable and turned off." >&5 -$as_echo "$as_me: WARNING: OpenMP unavailable and turned off." >&2;} - can_use_openmp="no" - ;; - esac - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -$as_echo "not found" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unsupported macOS build detected; if anything breaks, you keep the pieces." >&5 -$as_echo "$as_me: WARNING: unsupported macOS build detected; if anything breaks, you keep the pieces." >&2;} - fi - fi -fi - ## Check for suitable LAPACK_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: checking LAPACK_LIBS" >&5 $as_echo_n "checking LAPACK_LIBS... " >&6; } @@ -2821,30 +2764,8 @@ arma_lapack="#define ARMA_CRIPPLED_LAPACK 1" fi -## Default the OpenMP flag to the empty string. -## If and only if OpenMP is found, expand to $(SHLIB_OPENMP_CXXFLAGS) -openmp_flag="" -## Set the fallback, by default it is nope -arma_have_openmp="#define ARMA_DONT_USE_OPENMP 1" - -if test x"${can_use_openmp}" == x"yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenMP" >&5 -$as_echo_n "checking for OpenMP... " >&6; } - ## if R has -fopenmp we should be good - allldflags=$(${R_HOME}/bin/R CMD config --ldflags) - hasOpenMP=$(echo ${allldflags} | grep -- -fopenmp) - if test x"${hasOpenMP}" == x""; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: missing" >&5 -$as_echo "missing" >&6; } - arma_have_openmp="#define ARMA_DONT_USE_OPENMP 1" - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found and suitable" >&5 -$as_echo "found and suitable" >&6; } - arma_have_openmp="#define ARMA_USE_OPENMP 1" - openmp_flag='$(SHLIB_OPENMP_CXXFLAGS)' - fi -fi - +arma_have_openmp="#define ARMA_USE_OPENMP 1" +openmp_flag='$(SHLIB_OPENMP_CXXFLAGS)' ## now use all these ARMA_LAPACK="${arma_lapack}"