From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v3 03/17] package/fftw: break fftw-long-double into a dedicated package
Date: Mon, 31 Dec 2018 14:30:16 +0100 [thread overview]
Message-ID: <20181231133030.25991-4-thomas.petazzoni@bootlin.com> (raw)
In-Reply-To: <20181231133030.25991-1-thomas.petazzoni@bootlin.com>
From: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
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 long double precision into a new package and:
- makes BR2_PACKAGE_FFTW_PRECISION_LONG_DOUBLE select
BR2_PACKAGE_FFTW_LONG_DOUBLE to keep compatibility with packages
that use BR2_PACKAGE_FFTW_PRECISION_LONG_DOUBLE. This option will be
removed in a follow-up commit;
- makes fftw depend on fftw-long-double when this package is enabled.
Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
[Yann/Thomas:
- Force --disable-long-double in FFTW_CONF_OPTS, just for the sake of
clarity (fftw is no longer going to build the long double variant)
- Use FFTW_LONG_DOUBLE_DL_SUBDIR to avoid downloading fftw multiple times
- Minor reformatting tweaks in fftw-long-double.mk
- Do not deprecate BR2_PACKAGE_FFTW_PRECISION_LONG_DOUBLE and instead
make it select BR2_PACKAGE_FFTW_LONG_DOUBLE, so that packages using
BR2_PACKAGE_FFTW_PRECISION_LONG_DOUBLE continue to work.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
package/fftw/Config.in | 2 ++
package/fftw/fftw-long-double/Config.in | 8 +++++++
.../fftw-long-double/fftw-long-double.hash | 1 +
.../fftw/fftw-long-double/fftw-long-double.mk | 22 +++++++++++++++++++
package/fftw/fftw.mk | 6 ++++-
5 files changed, 38 insertions(+), 1 deletion(-)
create mode 100644 package/fftw/fftw-long-double/Config.in
create mode 120000 package/fftw/fftw-long-double/fftw-long-double.hash
create mode 100644 package/fftw/fftw-long-double/fftw-long-double.mk
diff --git a/package/fftw/Config.in b/package/fftw/Config.in
index f61784de50..4f37b43a60 100644
--- a/package/fftw/Config.in
+++ b/package/fftw/Config.in
@@ -40,6 +40,7 @@ config BR2_PACKAGE_FFTW_PRECISION_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.
@@ -55,6 +56,7 @@ config BR2_PACKAGE_FFTW_PRECISION_QUAD
endchoice
source "package/fftw/fftw-single/Config.in"
+source "package/fftw/fftw-long-double/Config.in"
config BR2_PACKAGE_FFTW_FAST
bool "optimise for speed over accuracy"
diff --git a/package/fftw/fftw-long-double/Config.in b/package/fftw/fftw-long-double/Config.in
new file mode 100644
index 0000000000..3ee1762850
--- /dev/null
+++ b/package/fftw/fftw-long-double/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_FFTW_LONG_DOUBLE
+ bool "fftw-long-double"
+ # long-double precision require long-double trigonometric routines
+ depends on !(BR2_TOOLCHAIN_USES_UCLIBC && \
+ (BR2_arm || BR2_mips || BR2_mipsel))
+ help
+ Compile fftw in long double precision, i.e. use 'long double'
+ for floating point type.
diff --git a/package/fftw/fftw-long-double/fftw-long-double.hash b/package/fftw/fftw-long-double/fftw-long-double.hash
new file mode 120000
index 0000000000..3ee7ecb3ba
--- /dev/null
+++ b/package/fftw/fftw-long-double/fftw-long-double.hash
@@ -0,0 +1 @@
+../fftw.hash
\ No newline at end of file
diff --git a/package/fftw/fftw-long-double/fftw-long-double.mk b/package/fftw/fftw-long-double/fftw-long-double.mk
new file mode 100644
index 0000000000..173050446c
--- /dev/null
+++ b/package/fftw/fftw-long-double/fftw-long-double.mk
@@ -0,0 +1,22 @@
+################################################################################
+#
+# fftw-long-double
+#
+################################################################################
+
+FFTW_LONG_DOUBLE_VERSION = $(FFTW_VERSION)
+FFTW_LONG_DOUBLE_SOURCE = fftw-$(FFTW_VERSION).tar.gz
+FFTW_LONG_DOUBLE_SITE = $(FFTW_SITE)
+FFTW_LONG_DOUBLE_DL_SUBDIR = fftw
+FFTW_LONG_DOUBLE_INSTALL_STAGING = $(FFTW_INSTALL_STAGING)
+FFTW_LONG_DOUBLE_LICENSE = $(FFTW_LICENSE)
+FFTW_LONG_DOUBLE_LICENSE_FILES = $(FFTW_LICENSE_FILES)
+
+FFTW_LONG_DOUBLE_CONF_ENV = $(FFTW_COMMON_CONF_ENV)
+
+FFTW_LONG_DOUBLE_CONF_OPTS = \
+ $(FFTW_COMMON_CONF_OPTS) \
+ CFLAGS="$(FFTW_COMMON_CFLAGS)" \
+ --enable-long-double
+
+$(eval $(autotools-package))
diff --git a/package/fftw/fftw.mk b/package/fftw/fftw.mk
index b738928032..26137b9f7c 100644
--- a/package/fftw/fftw.mk
+++ b/package/fftw/fftw.mk
@@ -10,6 +10,10 @@ FFTW_INSTALL_STAGING = YES
FFTW_LICENSE = GPL-2.0+
FFTW_LICENSE_FILES = COPYING
+ifeq ($(BR2_PACKAGE_FFTW_LONG_DOUBLE),y)
+FFTW_DEPENDENCIES += fftw-long-double
+endif
+
ifeq ($(BR2_PACKAGE_FFTW_SINGLE),y)
FFTW_DEPENDENCIES += fftw-single
endif
@@ -44,7 +48,7 @@ FFTW_CONF_ENV = $(FFTW_COMMON_CONF_ENV)
FFTW_CONF_OPTS += \
$(FFTW_COMMON_CONF_OPTS) \
--disable-single \
- $(if $(BR2_PACKAGE_FFTW_PRECISION_LONG_DOUBLE),--enable,--disable)-long-double \
+ --disable-long-double \
$(if $(BR2_PACKAGE_FFTW_PRECISION_QUAD),--enable,--disable)-quad-precision \
CFLAGS="$(FFTW_COMMON_CFLAGS)"
--
2.20.1
next prev parent reply other threads:[~2018-12-31 13:30 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-31 13:30 [Buildroot] [PATCH v3 00/17] Split fftw into multiple packages Thomas Petazzoni
2018-12-31 13:30 ` [Buildroot] [PATCH v3 01/17] package/fftw: prepare for splitting " Thomas Petazzoni
2019-01-01 10:14 ` Yann E. MORIN
2018-12-31 13:30 ` [Buildroot] [PATCH v3 02/17] package/fftw: break fftw-single into a dedicated package Thomas Petazzoni
2019-01-01 11:09 ` Yann E. MORIN
2019-01-01 12:00 ` Thomas Petazzoni
2019-01-01 12:11 ` Yann E. MORIN
2018-12-31 13:30 ` Thomas Petazzoni [this message]
2019-01-01 11:40 ` [Buildroot] [PATCH v3 03/17] package/fftw: break fftw-long-double " Yann E. MORIN
2018-12-31 13:30 ` [Buildroot] [PATCH v3 04/17] package/fftw: break fftw-quad " Thomas Petazzoni
2019-01-01 11:46 ` Yann E. MORIN
2018-12-31 13:30 ` [Buildroot] [PATCH v3 05/17] package/fftw: break fftw-double " Thomas Petazzoni
2019-01-01 11:52 ` Yann E. MORIN
2018-12-31 13:30 ` [Buildroot] [PATCH v3 06/17] package/alsa-utils: use the new fftw-single package Thomas Petazzoni
2019-01-01 11:55 ` Yann E. MORIN
2018-12-31 13:30 ` [Buildroot] [PATCH v3 07/17] package/aubio: use the new fftw-double and fftw-single packages Thomas Petazzoni
2019-01-01 12:02 ` Yann E. MORIN
2019-01-18 11:00 ` Gwenhael Goavec-Merou
2018-12-31 13:30 ` [Buildroot] [PATCH v3 08/17] package/gnuradio: use the new fftw-single package Thomas Petazzoni
2019-01-01 12:16 ` Yann E. MORIN
2019-01-01 13:07 ` Thomas Petazzoni
2019-01-18 11:00 ` Gwenhael Goavec-Merou
2018-12-31 13:30 ` [Buildroot] [PATCH v3 09/17] package/gqrx: remove unneeded fftw dependency Thomas Petazzoni
2019-01-01 12:29 ` Yann E. MORIN
2019-01-01 12:33 ` Yann E. MORIN
2019-01-18 11:00 ` Gwenhael Goavec-Merou
2018-12-31 13:30 ` [Buildroot] [PATCH v3 10/17] package/hackrf: use the new fftw-single package Thomas Petazzoni
2019-01-01 18:11 ` Yann E. MORIN
2018-12-31 13:30 ` [Buildroot] [PATCH v3 11/17] package/httping: use the new fftw-double package Thomas Petazzoni
2019-01-01 18:16 ` Yann E. MORIN
2019-01-18 11:01 ` Gwenhael Goavec-Merou
2018-12-31 13:30 ` [Buildroot] [PATCH v3 12/17] package/imagemagick: " Thomas Petazzoni
2019-01-01 21:03 ` Yann E. MORIN
2019-01-18 11:01 ` Gwenhael Goavec-Merou
2018-12-31 13:30 ` [Buildroot] [PATCH v3 13/17] package/libvips: " Thomas Petazzoni
2019-01-01 21:06 ` Yann E. MORIN
2018-12-31 13:30 ` [Buildroot] [PATCH v3 14/17] package/pulseaudio: use the new fftw-single package Thomas Petazzoni
2019-01-01 21:44 ` Yann E. MORIN
2018-12-31 13:30 ` [Buildroot] [PATCH v3 15/17] package/liquid-dsp: use the new fftw-{single, double, long-double} packages Thomas Petazzoni
2019-01-01 21:50 ` Yann E. MORIN
2019-01-01 21:57 ` Yann E. MORIN
2018-12-31 13:30 ` [Buildroot] [PATCH v3 16/17] package/fftw: remove as regular package Thomas Petazzoni
2019-01-01 12:24 ` Yann E. MORIN
2019-01-01 21:54 ` Yann E. MORIN
2018-12-31 13:30 ` [Buildroot] [PATCH v3 17/17] package/liquid-dsp: drop support for fftw-double and fftw-long-double Thomas Petazzoni
2018-12-31 13:52 ` Baruch Siach
2018-12-31 13:54 ` Thomas Petazzoni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181231133030.25991-4-thomas.petazzoni@bootlin.com \
--to=thomas.petazzoni@bootlin.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox