From: Yann E. MORIN <yann.morin.1998@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v3 01/17] package/fftw: prepare for splitting into multiple packages
Date: Tue, 1 Jan 2019 11:14:32 +0100 [thread overview]
Message-ID: <20190101101432.GF26917@scaer> (raw)
In-Reply-To: <20181231133030.25991-2-thomas.petazzoni@bootlin.com>
Thomas, Gwenha?l, All,
On 2018-12-31 14:30 +0100, Thomas Petazzoni spake thusly:
> In preparation for splitting into multiple packages, this commit
> changes the fftw.mk package to use FFTW_COMMON_CONF_OPTS,
> FFTW_COMMON_CONF_ENV and FFTW_COMMON_CFLAGS, which will be re-used by
> the soon-to-be-introduced per-precision packages.
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> ---
> package/fftw/fftw.mk | 40 +++++++++++++++++++++-------------------
> 1 file changed, 21 insertions(+), 19 deletions(-)
>
> diff --git a/package/fftw/fftw.mk b/package/fftw/fftw.mk
> index b167a2f6f7..8b76b7c190 100644
> --- a/package/fftw/fftw.mk
> +++ b/package/fftw/fftw.mk
> @@ -12,38 +12,40 @@ FFTW_LICENSE_FILES = COPYING
>
> # fortran support only enables generation and installation of fortran sources
> ifeq ($(BR2_TOOLCHAIN_HAS_FORTRAN),y)
> -FFTW_CONF_OPTS += --enable-fortran
> -FFTW_CONF_ENV += FLIBS="-lgfortran -lm"
> +FFTW_COMMON_CONF_OPTS += --enable-fortran
> +FFTW_COMMON_CONF_ENV += FLIBS="-lgfortran -lm"
> else
> -FFTW_CONF_OPTS += --disable-fortran
> +FFTW_COMMON_CONF_OPTS += --disable-fortran
> endif
>
> -FFTW_CONF_OPTS += $(if $(BR2_PACKAGE_FFTW_PRECISION_SINGLE),--enable,--disable)-single
> -FFTW_CONF_OPTS += $(if $(BR2_PACKAGE_FFTW_PRECISION_LONG_DOUBLE),--enable,--disable)-long-double
> -FFTW_CONF_OPTS += $(if $(BR2_PACKAGE_FFTW_PRECISION_QUAD),--enable,--disable)-quad-precision
> -
> -FFTW_CFLAGS = $(TARGET_CFLAGS)
> +FFTW_COMMON_CFLAGS = $(TARGET_CFLAGS)
> ifeq ($(BR2_PACKAGE_FFTW_FAST),y)
> -FFTW_CFLAGS += -O3 -ffast-math
> +FFTW_COMMON_CFLAGS += -O3 -ffast-math
> endif
>
> # x86 optimisations
> -FFTW_CONF_OPTS += $(if $(BR2_PACKAGE_FFTW_USE_SSE),--enable,--disable)-sse
> -FFTW_CONF_OPTS += $(if $(BR2_PACKAGE_FFTW_USE_SSE2),--enable,--disable)-sse2
> +FFTW_COMMON_CONF_OPTS += $(if $(BR2_PACKAGE_FFTW_USE_SSE),--enable,--disable)-sse
> +FFTW_COMMON_CONF_OPTS += $(if $(BR2_PACKAGE_FFTW_USE_SSE2),--enable,--disable)-sse2
>
> # ARM optimisations
> -FFTW_CONF_OPTS += $(if $(BR2_PACKAGE_FFTW_USE_NEON),--enable,--disable)-neon
> -FFTW_CFLAGS += $(if $(BR2_PACKAGE_FFTW_USE_NEON),-mfpu=neon)
> +FFTW_COMMON_CONF_OPTS += $(if $(BR2_PACKAGE_FFTW_USE_NEON),--enable,--disable)-neon
> +FFTW_COMMON_CFLAGS += $(if $(BR2_PACKAGE_FFTW_USE_NEON),-mfpu=neon)
>
> # Generic optimisations
> ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
> -FFTW_CONF_OPTS += --enable-threads
> -FFTW_CONF_OPTS += $(if $(BR2_GCC_ENABLE_OPENMP),--without,--with)-combined-threads
> +FFTW_COMMON_CONF_OPTS += --enable-threads
> +FFTW_COMMON_CONF_OPTS += $(if $(BR2_GCC_ENABLE_OPENMP),--without,--with)-combined-threads
> else
> -FFTW_CONF_OPTS += --disable-threads
> +FFTW_COMMON_CONF_OPTS += --disable-threads
> endif
> -FFTW_CONF_OPTS += $(if $(BR2_GCC_ENABLE_OPENMP),--enable,--disable)-openmp
> -
> -FFTW_CONF_OPTS += CFLAGS="$(FFTW_CFLAGS)"
> +FFTW_COMMON_CONF_OPTS += $(if $(BR2_GCC_ENABLE_OPENMP),--enable,--disable)-openmp
> +
> +FFTW_CONF_ENV = $(FFTW_COMMON_CONF_ENV)
> +FFTW_CONF_OPTS += \
> + $(FFTW_COMMON_CONF_OPTS) \
> + $(if $(BR2_PACKAGE_FFTW_PRECISION_SINGLE),--enable,--disable)-single \
> + $(if $(BR2_PACKAGE_FFTW_PRECISION_LONG_DOUBLE),--enable,--disable)-long-double \
> + $(if $(BR2_PACKAGE_FFTW_PRECISION_QUAD),--enable,--disable)-quad-precision \
> + CFLAGS="$(FFTW_COMMON_CFLAGS)"
>
> $(eval $(autotools-package))
> --
> 2.20.1
>
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
next prev parent reply other threads:[~2019-01-01 10:14 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 [this message]
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 ` [Buildroot] [PATCH v3 03/17] package/fftw: break fftw-long-double " Thomas Petazzoni
2019-01-01 11:40 ` 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=20190101101432.GF26917@scaer \
--to=yann.morin.1998@free.fr \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.