package/fftw: break fftw-double into a dedicated package
fftw's library name depends on the precision option. Consequently, it's possible to install multiple flavor on the same target. This patch breaks fftw double precision into a new package and: - makes BR2_PACKAGE_FFTW_PRECISION_DOUBLE select BR2_PACKAGE_FFTW_DOUBLE to keep compatibility with packages that use BR2_PACKAGE_FFTW_PRECISION_DOUBLE. This option will be removed in a follow-up commit; - removes BR2_PACKAGE_FFTW_USE_SSE2 since it is only used for single and double precision. The corresponding options are directly handled in fftw-double package; - makes fftw depend on fftw-double when this package is enabled; - turns fftw itself into a generic-package instead of an autotools-package: it no longer builds anything and only allows to trigger the build of the appropriate fftw-* sub-packages, as a temporary compatibility mechanism. Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com> [Yann/Thomas: - Use FFTW_DOUBLE_DL_SUBDIR to avoid downloading fftw multiple times - Minor reformatting tweaks in fftw-double.mk - Drop from fftw.mk FFTW_CONF_ENV/FFTW_CONF_OPTS which are no longer used - Make fftw a generic package so that its dependencies are built - Do not deprecate BR2_PACKAGE_FFTW_PRECISION_DOUBLE and instead make it select BR2_PACKAGE_FFTW_DOUBLE, so that packages using BR2_PACKAGE_FFTW_PRECISION_QUAD continue to work.] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
parent
3b261182e9
commit
55efbfd735
|
@ -12,9 +12,6 @@ config BR2_PACKAGE_FFTW
|
||||||
|
|
||||||
if BR2_PACKAGE_FFTW
|
if BR2_PACKAGE_FFTW
|
||||||
|
|
||||||
config BR2_PACKAGE_FFTW_USE_SSE2
|
|
||||||
bool
|
|
||||||
|
|
||||||
choice
|
choice
|
||||||
prompt "fftw precision"
|
prompt "fftw precision"
|
||||||
default BR2_PACKAGE_FFTW_PRECISION_DOUBLE
|
default BR2_PACKAGE_FFTW_PRECISION_DOUBLE
|
||||||
|
@ -30,7 +27,7 @@ config BR2_PACKAGE_FFTW_PRECISION_SINGLE
|
||||||
|
|
||||||
config BR2_PACKAGE_FFTW_PRECISION_DOUBLE
|
config BR2_PACKAGE_FFTW_PRECISION_DOUBLE
|
||||||
bool "double"
|
bool "double"
|
||||||
select BR2_PACKAGE_FFTW_USE_SSE2 if BR2_X86_CPU_HAS_SSE2
|
select BR2_PACKAGE_FFTW_DOUBLE
|
||||||
help
|
help
|
||||||
Compile fftw in double precision (the default), i.e. use
|
Compile fftw in double precision (the default), i.e. use
|
||||||
'double' for floating point type.
|
'double' for floating point type.
|
||||||
|
@ -57,6 +54,7 @@ config BR2_PACKAGE_FFTW_PRECISION_QUAD
|
||||||
endchoice
|
endchoice
|
||||||
|
|
||||||
source "package/fftw/fftw-single/Config.in"
|
source "package/fftw/fftw-single/Config.in"
|
||||||
|
source "package/fftw/fftw-double/Config.in"
|
||||||
source "package/fftw/fftw-long-double/Config.in"
|
source "package/fftw/fftw-long-double/Config.in"
|
||||||
source "package/fftw/fftw-quad/Config.in"
|
source "package/fftw/fftw-quad/Config.in"
|
||||||
|
|
||||||
|
|
5
package/fftw/fftw-double/Config.in
Normal file
5
package/fftw/fftw-double/Config.in
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
config BR2_PACKAGE_FFTW_DOUBLE
|
||||||
|
bool "fftw-double"
|
||||||
|
help
|
||||||
|
Compile fftw in double precision (the default), i.e. use
|
||||||
|
'double' for floating point type.
|
1
package/fftw/fftw-double/fftw-double.hash
Symbolic link
1
package/fftw/fftw-double/fftw-double.hash
Symbolic link
|
@ -0,0 +1 @@
|
||||||
|
../fftw.hash
|
22
package/fftw/fftw-double/fftw-double.mk
Normal file
22
package/fftw/fftw-double/fftw-double.mk
Normal file
|
@ -0,0 +1,22 @@
|
||||||
|
################################################################################
|
||||||
|
#
|
||||||
|
# fftw-double
|
||||||
|
#
|
||||||
|
################################################################################
|
||||||
|
|
||||||
|
FFTW_DOUBLE_VERSION = $(FFTW_VERSION)
|
||||||
|
FFTW_DOUBLE_SOURCE = fftw-$(FFTW_VERSION).tar.gz
|
||||||
|
FFTW_DOUBLE_SITE = $(FFTW_SITE)
|
||||||
|
FFTW_DOUBLE_DL_SUBDIR = fftw
|
||||||
|
FFTW_DOUBLE_INSTALL_STAGING = $(FFTW_INSTALL_STAGING)
|
||||||
|
FFTW_DOUBLE_LICENSE = $(FFTW_LICENSE)
|
||||||
|
FFTW_DOUBLE_LICENSE_FILES = $(FFTW_LICENSE_FILES)
|
||||||
|
|
||||||
|
FFTW_DOUBLE_CONF_ENV = $(FFTW_COMMON_CONF_ENV)
|
||||||
|
|
||||||
|
FFTW_DOUBLE_CONF_OPTS = \
|
||||||
|
$(FFTW_COMMON_CONF_OPTS) \
|
||||||
|
CFLAGS="$(FFTW_COMMON_CFLAGS)" \
|
||||||
|
$(if $(BR2_X86_CPU_HAS_SSE2),--enable,--disable)-sse2
|
||||||
|
|
||||||
|
$(eval $(autotools-package))
|
|
@ -10,6 +10,10 @@ FFTW_INSTALL_STAGING = YES
|
||||||
FFTW_LICENSE = GPL-2.0+
|
FFTW_LICENSE = GPL-2.0+
|
||||||
FFTW_LICENSE_FILES = COPYING
|
FFTW_LICENSE_FILES = COPYING
|
||||||
|
|
||||||
|
ifeq ($(BR2_PACKAGE_FFTW_DOUBLE),y)
|
||||||
|
FFTW_DEPENDENCIES += fftw-double
|
||||||
|
endif
|
||||||
|
|
||||||
ifeq ($(BR2_PACKAGE_FFTW_LONG_DOUBLE),y)
|
ifeq ($(BR2_PACKAGE_FFTW_LONG_DOUBLE),y)
|
||||||
FFTW_DEPENDENCIES += fftw-long-double
|
FFTW_DEPENDENCIES += fftw-long-double
|
||||||
endif
|
endif
|
||||||
|
@ -36,9 +40,6 @@ ifeq ($(BR2_PACKAGE_FFTW_FAST),y)
|
||||||
FFTW_COMMON_CFLAGS += -O3 -ffast-math
|
FFTW_COMMON_CFLAGS += -O3 -ffast-math
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# x86 optimisations
|
|
||||||
FFTW_COMMON_CONF_OPTS += $(if $(BR2_PACKAGE_FFTW_USE_SSE2),--enable,--disable)-sse2
|
|
||||||
|
|
||||||
# Generic optimisations
|
# Generic optimisations
|
||||||
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
|
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
|
||||||
FFTW_COMMON_CONF_OPTS += --enable-threads
|
FFTW_COMMON_CONF_OPTS += --enable-threads
|
||||||
|
@ -48,14 +49,6 @@ FFTW_COMMON_CONF_OPTS += --disable-threads
|
||||||
endif
|
endif
|
||||||
FFTW_COMMON_CONF_OPTS += $(if $(BR2_GCC_ENABLE_OPENMP),--enable,--disable)-openmp
|
FFTW_COMMON_CONF_OPTS += $(if $(BR2_GCC_ENABLE_OPENMP),--enable,--disable)-openmp
|
||||||
|
|
||||||
FFTW_CONF_ENV = $(FFTW_COMMON_CONF_ENV)
|
$(eval $(generic-package))
|
||||||
FFTW_CONF_OPTS += \
|
|
||||||
$(FFTW_COMMON_CONF_OPTS) \
|
|
||||||
--disable-single \
|
|
||||||
--disable-long-double \
|
|
||||||
--disable-quad-precision \
|
|
||||||
CFLAGS="$(FFTW_COMMON_CFLAGS)"
|
|
||||||
|
|
||||||
$(eval $(autotools-package))
|
|
||||||
|
|
||||||
include $(sort $(wildcard package/fftw/*/*.mk))
|
include $(sort $(wildcard package/fftw/*/*.mk))
|
||||||
|
|
Loading…
Reference in a new issue