From patchwork Wed Dec 12 07:45:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gwenhael Goavec-Merou X-Patchwork-Id: 1011647 X-Patchwork-Delegate: thomas.petazzoni@free-electrons.com Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=trabucayre.com Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43F83z5T2Fz9s47 for ; Wed, 12 Dec 2018 18:45:19 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id ED5E185E47; Wed, 12 Dec 2018 07:45:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id MJSBKpgOFrLb; Wed, 12 Dec 2018 07:45:17 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1CC95851CC; Wed, 12 Dec 2018 07:45:17 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 124E51BF282 for ; Wed, 12 Dec 2018 07:45:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0F180867EC for ; Wed, 12 Dec 2018 07:45:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2KZUB15nhks5 for ; Wed, 12 Dec 2018 07:45:11 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from smtp3-g21.free.fr (smtp3-g21.free.fr [212.27.42.3]) by whitealder.osuosl.org (Postfix) with ESMTPS id 82FC186410 for ; Wed, 12 Dec 2018 07:45:11 +0000 (UTC) Received: from x230.trabucayre.com (unknown [78.252.129.8]) by smtp3-g21.free.fr (Postfix) with ESMTP id 6E27213F8B1; Wed, 12 Dec 2018 08:45:09 +0100 (CET) From: Gwenhael Goavec-Merou To: buildroot@busybox.net Date: Wed, 12 Dec 2018 08:45:29 +0100 Message-Id: <20181212074539.11656-4-gwenj@trabucayre.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181212074539.11656-1-gwenj@trabucayre.com> References: <20181212074539.11656-1-gwenj@trabucayre.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 04/14] fftw: breaks fftw-double into a dedicated package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gwenhael Goavec-Merou Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Gwenhael Goavec-Merou 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: - deprecates BR2_PACKAGE_FFTW_PRECISION_DOUBLE, BR2_PACKAGE_FFTW_DOUBLE must be used instead; - suppress BR2_PACKAGE_FFTW_USE_SSE2 since option is only available on single and double precision. Corresponding options are directly handled in fftw-double package; - do fftw depends on fftw-double when this package is enabled. - select this option when fftw is enabled and no precision is enabled Signed-off-by: Gwenhael Goavec-Merou Reviewed-by: Joel Carlson Tested-by: Joel Carlson --- Changes v1 -> v2: * BR2_PACKAGE_FFTW_PRECISION_DOUBLE -> BR2_PACKAGE_FFTW_DOUBLE (Arnout) * old symbol deprecation (Arnout) * split big monolithic patch into a serie (Arnout) * add dependency between fftw and fftw-double (Yann) --- Config.in.legacy | 9 +++++++++ package/fftw/Config.in | 23 +++++------------------ package/fftw/fftw-double/Config.in | 5 +++++ package/fftw/fftw-double/fftw-double.hash | 1 + package/fftw/fftw-double/fftw-double.mk | 23 +++++++++++++++++++++++ package/fftw/fftw.mk | 9 ++++----- 6 files changed, 47 insertions(+), 23 deletions(-) create mode 100644 package/fftw/fftw-double/Config.in create mode 120000 package/fftw/fftw-double/fftw-double.hash create mode 100644 package/fftw/fftw-double/fftw-double.mk diff --git a/Config.in.legacy b/Config.in.legacy index 06a5803ff5..fa157dc4ec 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -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 diff --git a/package/fftw/Config.in b/package/fftw/Config.in index 945fd5d173..3f04f16454 100644 --- a/package/fftw/Config.in +++ b/package/fftw/Config.in @@ -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" diff --git a/package/fftw/fftw-double/Config.in b/package/fftw/fftw-double/Config.in new file mode 100644 index 0000000000..cfcd1ef997 --- /dev/null +++ b/package/fftw/fftw-double/Config.in @@ -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. diff --git a/package/fftw/fftw-double/fftw-double.hash b/package/fftw/fftw-double/fftw-double.hash new file mode 120000 index 0000000000..3ee7ecb3ba --- /dev/null +++ b/package/fftw/fftw-double/fftw-double.hash @@ -0,0 +1 @@ +../fftw.hash \ No newline at end of file diff --git a/package/fftw/fftw-double/fftw-double.mk b/package/fftw/fftw-double/fftw-double.mk new file mode 100644 index 0000000000..2923a86783 --- /dev/null +++ b/package/fftw/fftw-double/fftw-double.mk @@ -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)) diff --git a/package/fftw/fftw.mk b/package/fftw/fftw.mk index 499e0ed1ad..69db09dcd4 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_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))