@@ -145,6 +145,15 @@ endif
###############################################################################
comment "Legacy options removed in 2019.02"
+config BR2_PACKAGE_FFTW_PRECISION_DOUBLE
+ bool "fftw double precision option was replaced by package"
+ select BR2_LEGACY
+ select BR2_PACKAGE_FFTW
+ select BR2_PACKAGE_FFTW_DOUBLE
+ help
+ fftw double precision option was replaced by dedicated
+ package.
+
config BR2_PACKAGE_FFTW_PRECISION_LONG_DOUBLE
bool "fftw long double precision option was replaced by package"
select BR2_LEGACY
@@ -1,5 +1,9 @@
config BR2_PACKAGE_FFTW
bool "fftw"
+ select BR2_PACKAGE_FFTW_DOUBLE if \
+ !BR2_PACKAGE_FFTW_SINGLE && \
+ !BR2_PACKAGE_FFTW_QUAD && \
+ !BR2_PACKAGE_FFTW_LONG_DOUBLE
help
Library for computing Fast Fourier Transforms.
@@ -12,24 +16,7 @@ config BR2_PACKAGE_FFTW
if BR2_PACKAGE_FFTW
-config BR2_PACKAGE_FFTW_USE_SSE2
- bool
-
-choice
- prompt "fftw precision"
- default BR2_PACKAGE_FFTW_PRECISION_DOUBLE
- help
- Selects fftw precision
-
-config BR2_PACKAGE_FFTW_PRECISION_DOUBLE
- bool "double"
- select BR2_PACKAGE_FFTW_USE_SSE2 if BR2_X86_CPU_HAS_SSE2
- help
- Compile fftw in double precision (the default), i.e. use
- 'double' for floating point type.
-
-endchoice
-
+source "package/fftw/fftw-double/Config.in"
source "package/fftw/fftw-long-double/Config.in"
source "package/fftw/fftw-single/Config.in"
source "package/fftw/fftw-quad/Config.in"
new file mode 100644
@@ -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.
new file mode 120000
@@ -0,0 +1 @@
+../fftw.hash
\ No newline at end of file
new file mode 100644
@@ -0,0 +1,23 @@
+################################################################################
+#
+# fftw-double
+#
+################################################################################
+
+FFTW_DOUBLE_VERSION = $(FFTW_VERSION)
+FFTW_DOUBLE_SOURCE = fftw-$(FFTW_VERSION).tar.gz
+FFTW_DOUBLE_SITE = $(FFTW_SITE)
+FFTW_DOUBLE_INSTALL_STAGING = $(FFTW_INSTALL_STAGING)
+FFTW_DOUBLE_LICENSE = $(FFTW_LICENSE)
+FFTW_DOUBLE_LICENSE_FILES = $(FFTW_LICENSE_FILES)
+
+FFTW_DOUBLE_CONF_ENV = $(FFTW_CONF_ENV)
+
+FFTW_DOUBLE_CONF_OPTS= $(FFTW_CONF_OPTS)
+
+FFTW_DOUBLE_CFLAGS = $(FFTW_CFLAGS)
+
+# x86 optimisations
+FFTW_DOUBLE_CONF_OPTS += $(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_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
@@ -35,9 +39,6 @@ ifeq ($(BR2_PACKAGE_FFTW_FAST),y)
FFTW_CFLAGS += -O3 -ffast-math
endif
-# x86 optimisations
-FFTW_CONF_OPTS += $(if $(BR2_PACKAGE_FFTW_USE_SSE2),--enable,--disable)-sse2
-
# Generic optimisations
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
FFTW_CONF_OPTS += --enable-threads
@@ -49,6 +50,4 @@ FFTW_CONF_OPTS += $(if $(BR2_GCC_ENABLE_OPENMP),--enable,--disable)-openmp
FFTW_CONF_OPTS += CFLAGS="$(FFTW_CFLAGS)"
-$(eval $(autotools-package))
-
include $(sort $(wildcard package/fftw/*/*.mk))