package/fftw: remove as regular package

fftw is no longer a package: only fftw-single, fftw-double,
fftw-long-double and fftw-quad are. fftw.mk only contains some common
definitions that are used by the different fftw variants.

The old BR2_PACKAGE_FFTW_PRECISION_* options, which are no longer used
anywhere, are moved to Config.in.legacy.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Thomas Petazzoni 2019-01-21 14:51:10 +01:00
parent 10b21a55b3
commit 7883e55999
3 changed files with 37 additions and 59 deletions

View File

@ -160,6 +160,41 @@ config BR2_PACKAGE_BOOST_SIGNALS
was announced in 1.54. Users are encouraged to use Signals2
instead.
config BR2_PACKAGE_FFTW_PRECISION_SINGLE
bool "single"
select BR2_LEGACY
select BR2_PACKAGE_FFTW_SINGLE
help
This option has been removed in favor of
BR2_PACKAGE_FFTW_SINGLE.
config BR2_PACKAGE_FFTW_PRECISION_DOUBLE
bool "double"
select BR2_LEGACY
select BR2_PACKAGE_FFTW_DOUBLE
help
This option has been removed in favor of
BR2_PACKAGE_FFTW_DOUBLE.
config BR2_PACKAGE_FFTW_PRECISION_LONG_DOUBLE
bool "long double"
depends on !(BR2_TOOLCHAIN_BUILDROOT_UCLIBC && \
(BR2_arm || BR2_mips || BR2_mipsel))
select BR2_LEGACY
select BR2_PACKAGE_FFTW_LONG_DOUBLE
help
This option has been removed in favor of
BR2_PACKAGE_FFTW_LONG_DOUBLE.
config BR2_PACKAGE_FFTW_PRECISION_QUAD
bool "quad"
depends on (BR2_i386 || BR2_x86_64) && BR2_USE_WCHAR
select BR2_LEGACY
select BR2_PACKAGE_FFTW_QUAD
help
This option has been removed in favor of
BR2_PACKAGE_FFTW_QUAD.
config BR2_PACKAGE_LUA_5_2
bool "Lua 5.2.x version removed"
select BR2_LEGACY

View File

@ -1,5 +1,7 @@
config BR2_PACKAGE_FFTW
bool "fftw"
select BR2_PACKAGE_FFTW_DOUBLE if !BR2_PACKAGE_FFTW_SINGLE \
&& !BR2_PACKAGE_FFTW_LONG_DOUBLE && !BR2_PACKAGE_FFTW_QUAD
help
Library for computing Fast Fourier Transforms.
@ -12,47 +14,6 @@ config BR2_PACKAGE_FFTW
if BR2_PACKAGE_FFTW
choice
prompt "fftw precision"
default BR2_PACKAGE_FFTW_PRECISION_DOUBLE
help
Selects fftw precision
config BR2_PACKAGE_FFTW_PRECISION_SINGLE
bool "single"
select BR2_PACKAGE_FFTW_SINGLE
help
Compile fftw in single precision, i.e. use 'float' for
floating point type.
config BR2_PACKAGE_FFTW_PRECISION_DOUBLE
bool "double"
select BR2_PACKAGE_FFTW_DOUBLE
help
Compile fftw in double precision (the default), i.e. use
'double' for floating point type.
config BR2_PACKAGE_FFTW_PRECISION_LONG_DOUBLE
bool "long double"
# long-double precision require long-double trigonometric routines
depends on !(BR2_TOOLCHAIN_BUILDROOT_UCLIBC && \
(BR2_arm || BR2_mips || BR2_mipsel))
select BR2_PACKAGE_FFTW_LONG_DOUBLE
help
Compile fftw in long double precision, i.e. use 'long double'
for floating point type.
config BR2_PACKAGE_FFTW_PRECISION_QUAD
bool "quad"
# quad-precision needs to have a gcc with libquadmath
depends on (BR2_i386 || BR2_x86_64) && BR2_USE_WCHAR
select BR2_PACKAGE_FFTW_QUAD
help
Compile fftw in quadruple precision, i.e. use '__float128' for
floating point type.
endchoice
source "package/fftw/fftw-single/Config.in"
source "package/fftw/fftw-double/Config.in"
source "package/fftw/fftw-long-double/Config.in"

View File

@ -10,22 +10,6 @@ FFTW_INSTALL_STAGING = YES
FFTW_LICENSE = GPL-2.0+
FFTW_LICENSE_FILES = COPYING
ifeq ($(BR2_PACKAGE_FFTW_DOUBLE),y)
FFTW_DEPENDENCIES += fftw-double
endif
ifeq ($(BR2_PACKAGE_FFTW_LONG_DOUBLE),y)
FFTW_DEPENDENCIES += fftw-long-double
endif
ifeq ($(BR2_PACKAGE_FFTW_QUAD),y)
FFTW_DEPENDENCIES += fftw-quad
endif
ifeq ($(BR2_PACKAGE_FFTW_SINGLE),y)
FFTW_DEPENDENCIES += fftw-single
endif
# fortran support only enables generation and installation of fortran sources
ifeq ($(BR2_TOOLCHAIN_HAS_FORTRAN),y)
FFTW_COMMON_CONF_OPTS += --enable-fortran
@ -49,6 +33,4 @@ FFTW_COMMON_CONF_OPTS += --disable-threads
endif
FFTW_COMMON_CONF_OPTS += $(if $(BR2_GCC_ENABLE_OPENMP),--enable,--disable)-openmp
$(eval $(generic-package))
include $(sort $(wildcard package/fftw/*/*.mk))