Skip to content

Commit 03bacf1

Browse files
author
ripley
committed
reduce external LAPACK requirement to 3.9.0
git-svn-id: https://svn.r-project.org/R/trunk@85804 00db46b3-68df-0310-9c12-caf00c1e9a41
1 parent cf5bf6e commit 03bacf1

File tree

4 files changed

+18
-14
lines changed

4 files changed

+18
-14
lines changed

configure

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47575,8 +47575,8 @@ fi
4757547575
if test "${acx_lapack_ok}" = yes; then
4757647576
LIBS="-lblas -llapack ${FLIBS} ${acx_lapack_save_LIBS}"
4757747577

47578-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if LAPACK version >= 3.10.0" >&5
47579-
printf %s "checking if LAPACK version >= 3.10.0... " >&6; }
47578+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if LAPACK version >= 3.9.0" >&5
47579+
printf %s "checking if LAPACK version >= 3.9.0... " >&6; }
4758047580
if test ${r_cv_lapack_ver+y}
4758147581
then :
4758247582
printf %s "(cached) " >&6
@@ -47596,7 +47596,7 @@ int main(void) {
4759647596
int major, minor, patch;
4759747597
${ilaver}(&major, &minor, &patch);
4759847598
printf("%d.%d.%d, so ", major, minor, patch);
47599-
if (major < 3 || (major == 3 && minor < 10)) exit(1);
47599+
if (major < 3 || (major == 3 && minor < 9)) exit(1);
4760047600
exit(0);
4760147601
}
4760247602

doc/NEWS.Rd

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -278,11 +278,15 @@
278278
\item \command{configure} option \option{--enable-lto=check} has
279279
not worked reliably since 2019 and has been removed.
280280

281-
\item The minimum requirement for a maintainer build has been
282-
increased to \command{autoconf}\sspace{}2.71, and it is intended to
283-
increase to 2.72 before release. (The issue is better support for
284-
\sQuote{C23}: \command{autoconf}\sspace{}2.72 requires a C version
285-
of C90 or later, but \R has long required C99 or later.)
281+
\item The minimum requirement \command{autoconf} for a maintainer
282+
build has been increased to \command{autoconf}\sspace{}2.71, and
283+
it is intended to increase to 2.72 before release. (The issue is
284+
better support for \sQuote{C23}: \command{autoconf}\sspace{}2.72
285+
requires a C version of C90 or later, but \R has long required C99
286+
or later.)
287+
288+
\item The minimum version requirement for an external LAPACK has
289+
been reduced to 3.9.0.
286290
}
287291
}
288292

doc/manual/R-admin.texi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4087,7 +4087,7 @@ which is used.
40874087
@cindex LAPACK library
40884088

40894089
If when configuring @R{} a system LAPACK library is found of version
4090-
3.10.0 or later (and does not contain BLAS routines) it will be used
4090+
3.9.0 or later (and does not contain BLAS routines) it will be used
40914091
instead of compiling the LAPACK code in the package sources. This can
40924092
be prevented by configuring @R{} with @option{--without-lapack}.
40934093
Using a static @file{liblapack.a} is not supported.

m4/R.m4

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
### R.m4 -- extra macros for configuring R -*- Autoconf -*-
22
###
3-
### Copyright (C) 1998-2023 R Core Team
3+
### Copyright (C) 1998-2024 R Core Team
44
###
55
### This file is part of R.
66
###
@@ -3152,8 +3152,8 @@ AC_SUBST(LAPACK_LIBS)
31523152

31533153
## R_LAPACK_SYSTEM_LIB
31543154
## -------------------
3155-
## New for R 4.2.0
3156-
## Look for system -llapack of version at least 3.10.0.
3155+
## New for R 4.2.0: reduced to >=3.9.0 for 4.4.0.
3156+
## Look for system -llapack of version at least 3.9.0.
31573157
## We have to test with a system BLAS.
31583158
## We don't want an external lapack which contains a BLAS.
31593159
## We document that at least ATLAS, OpenBLAS and Accelerate lapack
@@ -3291,7 +3291,7 @@ fi
32913291
if test "${acx_lapack_ok}" = yes; then
32923292
LIBS="-lblas -llapack ${FLIBS} ${acx_lapack_save_LIBS}"
32933293
3294-
AC_CACHE_CHECK([if LAPACK version >= 3.10.0], [r_cv_lapack_ver],
3294+
AC_CACHE_CHECK([if LAPACK version >= 3.9.0], [r_cv_lapack_ver],
32953295
[AC_RUN_IFELSE([AC_LANG_SOURCE([[
32963296
extern void ${ilaver}(int *major, int *minor, int *patch);
32973297
@@ -3301,7 +3301,7 @@ int main(void) {
33013301
int major, minor, patch;
33023302
${ilaver}(&major, &minor, &patch);
33033303
printf("%d.%d.%d, so ", major, minor, patch);
3304-
if (major < 3 || (major == 3 && minor < 10)) exit(1);
3304+
if (major < 3 || (major == 3 && minor < 9)) exit(1);
33053305
exit(0);
33063306
}
33073307
]])],

0 commit comments

Comments
 (0)