| Message ID | 20210724214526.47637-2-arnout@mind.be |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v4,1/3] package/clapack: introduce BR2_PACKAGE_CLAPACK_ARCH_SUPPORTS | expand |
Arnout, All, On 2021-07-24 23:45 +0200, Arnout Vandecappelle (Essensium/Mind) spake thusly: > This makes it easier for packages that depend on lapack to get > their dependencies correct. > > Since the !uClibc dependency only exists for PowerPC, treat it as > an architecture dependency. > > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> > --- > package/lapack/Config.in | 11 ++++++++--- > 1 file changed, 8 insertions(+), 3 deletions(-) > > diff --git a/package/lapack/Config.in b/package/lapack/Config.in > index 6cd0810cb1..ee7aeae7a8 100644 > --- a/package/lapack/Config.in > +++ b/package/lapack/Config.in > @@ -1,13 +1,18 @@ > -comment "lapack/blas needs a toolchain w/ fortran" > +config BR2_PACKAGE_LAPACK_ARCH_SUPPORTS > + bool > + default y > + # _fpu_control is used on PowerPC, but not available with uClibc > depends on !(BR2_powerpc && BR2_TOOLCHAIN_USES_UCLIBC) Patch 1 in the series states: _fpu_control is used on PowerPC, but not available with uClibc or musl but here, _fpu_control is just not available with uClibc... I've just checked, and as far as I can see, musl still does not provide _fpu_control... This inconsistency pre-exists before your series, but still, this is the opportunity to fix it, so I've done so when applying... Applied to master, thanks. Regards, Yann E. MORIN. > +comment "lapack/blas needs a toolchain w/ fortran" > + depends on BR2_PACKAGE_LAPACK_ARCH_SUPPORTS > depends on !BR2_TOOLCHAIN_HAS_FORTRAN > > config BR2_PACKAGE_LAPACK > bool "lapack/blas" > + depends on BR2_PACKAGE_LAPACK_ARCH_SUPPORTS > depends on BR2_TOOLCHAIN_HAS_FORTRAN > depends on !BR2_PACKAGE_CLAPACK > - # _fpu_control is used on PowerPC, but not available with uClibc > - depends on !(BR2_powerpc && BR2_TOOLCHAIN_USES_UCLIBC) > help > LAPACK and BLAS FORTRAN implementation. This package > installs two libraries: libblas and liblapack. > -- > 2.31.1 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
diff --git a/package/lapack/Config.in b/package/lapack/Config.in index 6cd0810cb1..ee7aeae7a8 100644 --- a/package/lapack/Config.in +++ b/package/lapack/Config.in @@ -1,13 +1,18 @@ -comment "lapack/blas needs a toolchain w/ fortran" +config BR2_PACKAGE_LAPACK_ARCH_SUPPORTS + bool + default y + # _fpu_control is used on PowerPC, but not available with uClibc depends on !(BR2_powerpc && BR2_TOOLCHAIN_USES_UCLIBC) + +comment "lapack/blas needs a toolchain w/ fortran" + depends on BR2_PACKAGE_LAPACK_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_FORTRAN config BR2_PACKAGE_LAPACK bool "lapack/blas" + depends on BR2_PACKAGE_LAPACK_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_HAS_FORTRAN depends on !BR2_PACKAGE_CLAPACK - # _fpu_control is used on PowerPC, but not available with uClibc - depends on !(BR2_powerpc && BR2_TOOLCHAIN_USES_UCLIBC) help LAPACK and BLAS FORTRAN implementation. This package installs two libraries: libblas and liblapack.
This makes it easier for packages that depend on lapack to get their dependencies correct. Since the !uClibc dependency only exists for PowerPC, treat it as an architecture dependency. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> --- package/lapack/Config.in | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)