From patchwork Mon Jan 21 13:50:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gwenhael Goavec-Merou X-Patchwork-Id: 1028700 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.136; helo=silver.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 silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43jthm5HVrz9s2P for ; Tue, 22 Jan 2019 01:09:28 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id D533B22926; Mon, 21 Jan 2019 14:09:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3DBv2u4tVtLl; Mon, 21 Jan 2019 14:09:20 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id DC8B9233A6; Mon, 21 Jan 2019 14:09:19 +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 A86C71BF3A4 for ; Mon, 21 Jan 2019 14:09:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A53A181EB7 for ; Mon, 21 Jan 2019 14:09:16 +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 ZQ7Vm5FUwQhn for ; Mon, 21 Jan 2019 14:09:10 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail (kmf.trabucayre.com [91.121.117.161]) by whitealder.osuosl.org (Postfix) with ESMTP id E78F485CB4 for ; Mon, 21 Jan 2019 14:08:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by mail (Postfix) with ESMTP id 802B039856; Mon, 21 Jan 2019 14:51:13 +0100 (CET) From: Gwenhael Goavec-Merou To: buildroot@busybox.net Date: Mon, 21 Jan 2019 14:50:55 +0100 Message-Id: <1548078671-63318-1-git-send-email-gwenj@trabucayre.com> X-Mailer: git-send-email 1.6.4.2 Subject: [Buildroot] [PATCH v4 01/17] package/fftw: prepare for splitting into multiple packages 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: Thomas Petazzoni , Gwenhael Goavec-Merou , "Yann E. MORIN" , Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Thomas Petazzoni From: Thomas Petazzoni 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 Signed-off-by: Gwenhael Goavec-Merou Reviewed-by: "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)) From patchwork Mon Jan 21 13:50:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gwenhael Goavec-Merou X-Patchwork-Id: 1028704 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.136; helo=silver.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 silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43jtkW6q2zz9s55 for ; Tue, 22 Jan 2019 01:10:59 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 4BD9B227CD; Mon, 21 Jan 2019 14:10:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id D39-Wf29-yy3; Mon, 21 Jan 2019 14:10:56 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 9009622926; Mon, 21 Jan 2019 14:10:56 +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 7BDB01BF3A4 for ; Mon, 21 Jan 2019 14:09:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 794678261B for ; Mon, 21 Jan 2019 14:09:17 +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 BdvD1IuVpxr5 for ; Mon, 21 Jan 2019 14:09:10 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail (kmf.trabucayre.com [91.121.117.161]) by whitealder.osuosl.org (Postfix) with ESMTP id E892385D26 for ; Mon, 21 Jan 2019 14:08:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by mail (Postfix) with ESMTP id A41D939857; Mon, 21 Jan 2019 14:51:13 +0100 (CET) From: Gwenhael Goavec-Merou To: buildroot@busybox.net Date: Mon, 21 Jan 2019 14:50:56 +0100 Message-Id: <1548078671-63318-2-git-send-email-gwenj@trabucayre.com> X-Mailer: git-send-email 1.6.4.2 In-Reply-To: <1548078671-63318-1-git-send-email-gwenj@trabucayre.com> References: <1548078671-63318-1-git-send-email-gwenj@trabucayre.com> Subject: [Buildroot] [PATCH v4 02/17] package/fftw: break fftw-single 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: Thomas Petazzoni , Gwenhael Goavec-Merou , "Yann E. MORIN" , Thomas Petazzoni MIME-Version: 1.0 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 single precision into a new package and: - makes BR2_PACKAGE_FFTW_PRECISION_SINGLE select BR2_PACKAGE_FFTW_SINGLE to keep compatibility with packages that use BR2_PACKAGE_FFTW_PRECISION_SINGLE. This option will be removed in a follow-up commit; - removes the BR2_PACKAGE_FFTW_USE_SSE and BR2_PACKAGE_FFTW_USE_NEON otpions since they are only used for single precision. The corresponding CPU-capability options are directly handled in the fftw-single package; - makes fftw depend on fftw-single when this package is enabled. Signed-off-by: Gwenhael Goavec-Merou [Yann/Thomas: - Force --disable-single in FFTW_CONF_OPTS, just for the sake of clarity (fftw is no longer going to build the single variant) - Use FFTW_SINGLE_DL_SUBDIR to avoid downloading fftw multiple times - Minor reformatting tweaks in fftw-single.mk - Do not deprecate BR2_PACKAGE_FFTW_PRECISION_SINGLE and instead make it select BR2_PACKAGE_FFTW_SINGLE, so that packages using BR2_PACKAGE_FFTW_PRECISION_SINGLE continue to work.] Signed-off-by: Thomas Petazzoni Reviewed-by: "Yann E. MORIN" Tested-by: "Yann E. MORIN" --- package/fftw/Config.in | 12 ++------ package/fftw/fftw-single/Config.in | 5 +++ package/fftw/fftw-single/fftw-single.hash | 1 + package/fftw/fftw-single/fftw-single.mk | 37 +++++++++++++++++++++++ package/fftw/fftw.mk | 14 +++++---- 5 files changed, 54 insertions(+), 15 deletions(-) diff --git a/package/fftw/Config.in b/package/fftw/Config.in index d51f8f3c51..f61784de50 100644 --- a/package/fftw/Config.in +++ b/package/fftw/Config.in @@ -12,15 +12,9 @@ config BR2_PACKAGE_FFTW if BR2_PACKAGE_FFTW -config BR2_PACKAGE_FFTW_USE_SSE - bool - config BR2_PACKAGE_FFTW_USE_SSE2 bool -config BR2_PACKAGE_FFTW_USE_NEON - bool - choice prompt "fftw precision" default BR2_PACKAGE_FFTW_PRECISION_DOUBLE @@ -29,9 +23,7 @@ choice config BR2_PACKAGE_FFTW_PRECISION_SINGLE bool "single" - select BR2_PACKAGE_FFTW_USE_SSE if BR2_X86_CPU_HAS_SSE - select BR2_PACKAGE_FFTW_USE_SSE2 if BR2_X86_CPU_HAS_SSE2 - select BR2_PACKAGE_FFTW_USE_NEON if BR2_ARM_CPU_HAS_NEON && !BR2_ARM_SOFT_FLOAT + select BR2_PACKAGE_FFTW_SINGLE help Compile fftw in single precision, i.e. use 'float' for floating point type. @@ -62,6 +54,8 @@ config BR2_PACKAGE_FFTW_PRECISION_QUAD endchoice +source "package/fftw/fftw-single/Config.in" + config BR2_PACKAGE_FFTW_FAST bool "optimise for speed over accuracy" help diff --git a/package/fftw/fftw-single/Config.in b/package/fftw/fftw-single/Config.in new file mode 100644 index 0000000000..ff1486871d --- /dev/null +++ b/package/fftw/fftw-single/Config.in @@ -0,0 +1,5 @@ +config BR2_PACKAGE_FFTW_SINGLE + bool "fftw-single" + help + Compile fftw in single precision, i.e. use 'float' + for floating point type. diff --git a/package/fftw/fftw-single/fftw-single.hash b/package/fftw/fftw-single/fftw-single.hash new file mode 120000 index 0000000000..3ee7ecb3ba --- /dev/null +++ b/package/fftw/fftw-single/fftw-single.hash @@ -0,0 +1 @@ +../fftw.hash \ No newline at end of file diff --git a/package/fftw/fftw-single/fftw-single.mk b/package/fftw/fftw-single/fftw-single.mk new file mode 100644 index 0000000000..1e26ff7a38 --- /dev/null +++ b/package/fftw/fftw-single/fftw-single.mk @@ -0,0 +1,37 @@ +################################################################################ +# +# fftw-single +# +################################################################################ + +FFTW_SINGLE_VERSION = $(FFTW_VERSION) +FFTW_SINGLE_SOURCE = fftw-$(FFTW_VERSION).tar.gz +FFTW_SINGLE_SITE = $(FFTW_SITE) +FFTW_SINGLE_DL_SUBDIR = fftw +FFTW_SINGLE_INSTALL_STAGING = $(FFTW_INSTALL_STAGING) +FFTW_SINGLE_LICENSE = $(FFTW_LICENSE) +FFTW_SINGLE_LICENSE_FILES = $(FFTW_LICENSE_FILES) + +FFTW_SINGLE_CONF_ENV = $(FFTW_COMMON_CONF_ENV) + +FFTW_SINGLE_CONF_OPTS = \ + $(FFTW_COMMON_CONF_OPTS) \ + CFLAGS="$(FFTW_SINGLE_CFLAGS)" \ + --enable-single + +FFTW_SINGLE_CFLAGS = $(FFTW_COMMON_CFLAGS) + +# x86 optimisations +FFTW_SINGLE_CONF_OPTS += \ + $(if $(BR2_X86_CPU_HAS_SSE),--enable,--disable)-sse \ + $(if $(BR2_X86_CPU_HAS_SSE2),--enable,--disable)-sse2 + +# ARM optimisations +ifeq ($(BR2_ARM_CPU_HAS_NEON):$(BR2_ARM_SOFT_FLOAT),y:) +FFTW_SINGLE_CONF_OPTS += --enable-neon +FFTW_SINGLE_CFLAGS += -mfpu=neon +else +FFTW_SINGLE_CONF_OPTS += --disable-neon +endif + +$(eval $(autotools-package)) diff --git a/package/fftw/fftw.mk b/package/fftw/fftw.mk index 8b76b7c190..b738928032 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_SINGLE),y) +FFTW_DEPENDENCIES += fftw-single +endif + # fortran support only enables generation and installation of fortran sources ifeq ($(BR2_TOOLCHAIN_HAS_FORTRAN),y) FFTW_COMMON_CONF_OPTS += --enable-fortran @@ -19,18 +23,14 @@ FFTW_COMMON_CONF_OPTS += --disable-fortran endif FFTW_COMMON_CFLAGS = $(TARGET_CFLAGS) + ifeq ($(BR2_PACKAGE_FFTW_FAST),y) FFTW_COMMON_CFLAGS += -O3 -ffast-math endif # x86 optimisations -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_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_COMMON_CONF_OPTS += --enable-threads @@ -43,9 +43,11 @@ FFTW_COMMON_CONF_OPTS += $(if $(BR2_GCC_ENABLE_OPENMP),--enable,--disable)-openm FFTW_CONF_ENV = $(FFTW_COMMON_CONF_ENV) FFTW_CONF_OPTS += \ $(FFTW_COMMON_CONF_OPTS) \ - $(if $(BR2_PACKAGE_FFTW_PRECISION_SINGLE),--enable,--disable)-single \ + --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)) + +include $(sort $(wildcard package/fftw/*/*.mk)) From patchwork Mon Jan 21 13:50:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gwenhael Goavec-Merou X-Patchwork-Id: 1028705 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.138; helo=whitealder.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 whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43jtkX3FmTz9sCh for ; Tue, 22 Jan 2019 01:11:00 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A0EED80F43; Mon, 21 Jan 2019 14:10:58 +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 L35lidJbLDUS; Mon, 21 Jan 2019 14:10:57 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 572DE81437; Mon, 21 Jan 2019 14:10:57 +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 A6ED61BF3A4 for ; Mon, 21 Jan 2019 14:09:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A346B81FEE for ; Mon, 21 Jan 2019 14:09:17 +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 hB7Xl8RPcoNA for ; Mon, 21 Jan 2019 14:09:10 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail (kmf.trabucayre.com [91.121.117.161]) by whitealder.osuosl.org (Postfix) with ESMTP id E677985AE0 for ; Mon, 21 Jan 2019 14:08:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by mail (Postfix) with ESMTP id C568D3985C; Mon, 21 Jan 2019 14:51:13 +0100 (CET) From: Gwenhael Goavec-Merou To: buildroot@busybox.net Date: Mon, 21 Jan 2019 14:50:57 +0100 Message-Id: <1548078671-63318-3-git-send-email-gwenj@trabucayre.com> X-Mailer: git-send-email 1.6.4.2 In-Reply-To: <1548078671-63318-2-git-send-email-gwenj@trabucayre.com> References: <1548078671-63318-1-git-send-email-gwenj@trabucayre.com> <1548078671-63318-2-git-send-email-gwenj@trabucayre.com> Subject: [Buildroot] [PATCH v4 03/17] package/fftw: break fftw-long-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: Thomas Petazzoni , Gwenhael Goavec-Merou , "Yann E. MORIN" , Thomas Petazzoni MIME-Version: 1.0 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 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 [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 Tested-by: "Yann E. MORIN" Reviewed-by: "Yann E. MORIN" --- 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(-) 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)" From patchwork Mon Jan 21 13:50:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gwenhael Goavec-Merou X-Patchwork-Id: 1028701 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 43jtjJ5B4dz9sBQ for ; Tue, 22 Jan 2019 01:09:56 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 34B618531D; Mon, 21 Jan 2019 14:09:50 +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 8C_9p5z7VqFZ; Mon, 21 Jan 2019 14:09:38 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 2675E850D6; Mon, 21 Jan 2019 14:09:38 +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 C7B471BF3A4 for ; Mon, 21 Jan 2019 14:09:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C34DB81EB7 for ; Mon, 21 Jan 2019 14:09:16 +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 jo58u4nxt4AY for ; Mon, 21 Jan 2019 14:09:10 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail (kmf.trabucayre.com [91.121.117.161]) by whitealder.osuosl.org (Postfix) with ESMTP id E9A7385D5C for ; Mon, 21 Jan 2019 14:08:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by mail (Postfix) with ESMTP id 030B73985E; Mon, 21 Jan 2019 14:51:14 +0100 (CET) From: Gwenhael Goavec-Merou To: buildroot@busybox.net Date: Mon, 21 Jan 2019 14:50:58 +0100 Message-Id: <1548078671-63318-4-git-send-email-gwenj@trabucayre.com> X-Mailer: git-send-email 1.6.4.2 In-Reply-To: <1548078671-63318-3-git-send-email-gwenj@trabucayre.com> References: <1548078671-63318-1-git-send-email-gwenj@trabucayre.com> <1548078671-63318-2-git-send-email-gwenj@trabucayre.com> <1548078671-63318-3-git-send-email-gwenj@trabucayre.com> Subject: [Buildroot] [PATCH v4 04/17] package/fftw: break fftw-quad 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: Thomas Petazzoni , Gwenhael Goavec-Merou , "Yann E. MORIN" , Thomas Petazzoni MIME-Version: 1.0 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 quad precision into a new package and: - makes BR2_PACKAGE_FFTW_PRECISION_QUAD select BR2_PACKAGE_FFTW_QUAD to keep compatibility with packages that use BR2_PACKAGE_FFTW_PRECISION_QUAD. This option will be removed in a follow-up commit; - makes fftw depend on fftw-quad when this package is enabled. Signed-off-by: Gwenhael Goavec-Merou [Yann/Thomas: - Force --disable-quad in FFTW_CONF_OPTS, just for the sake of clarity (fftw is no longer going to build the quad variant) - Use FFTW_QUAD_DL_SUBDIR to avoid downloading fftw multiple times - Minor reformatting tweaks in fftw-quad.mk - Do not deprecate BR2_PACKAGE_FFTW_PRECISION_QUAD and instead make it select BR2_PACKAGE_FFTW_QUAD, so that packages using BR2_PACKAGE_FFTW_PRECISION_QUAD continue to work.] Signed-off-by: Thomas Petazzoni [Gwenhael/Yann]: - (BR2_i386 || BR2_x86_64) -> BR2_TOOLCHAIN_HAS_LIBQUADMATH Tested-by: "Yann E. MORIN" Reviewed-by: "Yann E. MORIN" --- package/fftw/Config.in | 2 ++ package/fftw/fftw-quad/Config.in | 7 +++++++ package/fftw/fftw-quad/fftw-quad.hash | 1 + package/fftw/fftw-quad/fftw-quad.mk | 22 ++++++++++++++++++++++ package/fftw/fftw.mk | 6 +++++- 5 files changed, 37 insertions(+), 1 deletion(-) diff --git a/package/fftw/Config.in b/package/fftw/Config.in index 4f37b43a60..8699d9c350 100644 --- a/package/fftw/Config.in +++ b/package/fftw/Config.in @@ -49,6 +49,7 @@ config BR2_PACKAGE_FFTW_PRECISION_QUAD bool "quad" # quad-precision needs to have a gcc with libquadmath depends on (BR2_i386 || BR2_x86_64) && BR2_USE_WCHAR + select BR2_PACKAGE_FFTW_QUAD help Compile fftw in quadruple precision, i.e. use '__float128' for floating point type. @@ -57,6 +58,7 @@ endchoice source "package/fftw/fftw-single/Config.in" source "package/fftw/fftw-long-double/Config.in" +source "package/fftw/fftw-quad/Config.in" config BR2_PACKAGE_FFTW_FAST bool "optimise for speed over accuracy" diff --git a/package/fftw/fftw-quad/Config.in b/package/fftw/fftw-quad/Config.in new file mode 100644 index 0000000000..10d296df91 --- /dev/null +++ b/package/fftw/fftw-quad/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_FFTW_QUAD + bool "fftw-quad" + # quad-precision needs to have a gcc with libquadmath + depends on BR2_TOOLCHAIN_HAS_LIBQUADMATH && BR2_USE_WCHAR + help + Compile fftw in quadruple precision, i.e. use '__float128' for + floating point type. diff --git a/package/fftw/fftw-quad/fftw-quad.hash b/package/fftw/fftw-quad/fftw-quad.hash new file mode 120000 index 0000000000..3ee7ecb3ba --- /dev/null +++ b/package/fftw/fftw-quad/fftw-quad.hash @@ -0,0 +1 @@ +../fftw.hash \ No newline at end of file diff --git a/package/fftw/fftw-quad/fftw-quad.mk b/package/fftw/fftw-quad/fftw-quad.mk new file mode 100644 index 0000000000..5ff79b1d46 --- /dev/null +++ b/package/fftw/fftw-quad/fftw-quad.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# fftw-quad +# +################################################################################ + +FFTW_QUAD_VERSION = $(FFTW_VERSION) +FFTW_QUAD_SOURCE = fftw-$(FFTW_VERSION).tar.gz +FFTW_QUAD_SITE = $(FFTW_SITE) +FFTW_QUAD_DL_SUBDIR = fftw +FFTW_QUAD_INSTALL_STAGING = $(FFTW_INSTALL_STAGING) +FFTW_QUAD_LICENSE = $(FFTW_LICENSE) +FFTW_QUAD_LICENSE_FILES = $(FFTW_LICENSE_FILES) + +FFTW_QUAD_CONF_ENV = $(FFTW_COMMON_CONF_ENV) + +FFTW_QUAD_CONF_OPTS = \ + $(FFTW_COMMON_CONF_OPTS) \ + CFLAGS="$(FFTW_COMMON_CFLAGS)" \ + --enable-quad-precision + +$(eval $(autotools-package)) diff --git a/package/fftw/fftw.mk b/package/fftw/fftw.mk index 26137b9f7c..ccec0e0f2d 100644 --- a/package/fftw/fftw.mk +++ b/package/fftw/fftw.mk @@ -14,6 +14,10 @@ ifeq ($(BR2_PACKAGE_FFTW_LONG_DOUBLE),y) FFTW_DEPENDENCIES += fftw-long-double endif +ifeq ($(BR2_PACKAGE_FFTW_QUAD),y) +FFTW_DEPENDENCIES += fftw-quad +endif + ifeq ($(BR2_PACKAGE_FFTW_SINGLE),y) FFTW_DEPENDENCIES += fftw-single endif @@ -49,7 +53,7 @@ FFTW_CONF_OPTS += \ $(FFTW_COMMON_CONF_OPTS) \ --disable-single \ --disable-long-double \ - $(if $(BR2_PACKAGE_FFTW_PRECISION_QUAD),--enable,--disable)-quad-precision \ + --disable-quad-precision \ CFLAGS="$(FFTW_COMMON_CFLAGS)" $(eval $(autotools-package)) From patchwork Mon Jan 21 13:50:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gwenhael Goavec-Merou X-Patchwork-Id: 1028706 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 43jtkb6HDVz9s2P for ; Tue, 22 Jan 2019 01:11:03 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 245F0854C2; Mon, 21 Jan 2019 14:11:02 +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 7w0eu4rVEALC; Mon, 21 Jan 2019 14:10:59 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1CB538531D; Mon, 21 Jan 2019 14:10:59 +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 335811BF3A4 for ; Mon, 21 Jan 2019 14:09:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 23D6F824B0 for ; Mon, 21 Jan 2019 14:09:18 +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 UvWJcr9lCej5 for ; Mon, 21 Jan 2019 14:09:10 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail (kmf.trabucayre.com [91.121.117.161]) by whitealder.osuosl.org (Postfix) with ESMTP id EA85885DA0 for ; Mon, 21 Jan 2019 14:08:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by mail (Postfix) with ESMTP id 269003985F; Mon, 21 Jan 2019 14:51:14 +0100 (CET) From: Gwenhael Goavec-Merou To: buildroot@busybox.net Date: Mon, 21 Jan 2019 14:50:59 +0100 Message-Id: <1548078671-63318-5-git-send-email-gwenj@trabucayre.com> X-Mailer: git-send-email 1.6.4.2 In-Reply-To: <1548078671-63318-4-git-send-email-gwenj@trabucayre.com> References: <1548078671-63318-1-git-send-email-gwenj@trabucayre.com> <1548078671-63318-2-git-send-email-gwenj@trabucayre.com> <1548078671-63318-3-git-send-email-gwenj@trabucayre.com> <1548078671-63318-4-git-send-email-gwenj@trabucayre.com> Subject: [Buildroot] [PATCH v4 05/17] package/fftw: break 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: Thomas Petazzoni , Gwenhael Goavec-Merou , "Yann E. MORIN" , Thomas Petazzoni MIME-Version: 1.0 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: - 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 [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 Tested-by: "Yann E. MORIN" Reviewed-by: "Yann E. MORIN" --- package/fftw/Config.in | 6 ++---- package/fftw/fftw-double/Config.in | 5 +++++ package/fftw/fftw-double/fftw-double.hash | 1 + package/fftw/fftw-double/fftw-double.mk | 22 ++++++++++++++++++++++ package/fftw/fftw.mk | 17 +++++------------ 5 files changed, 35 insertions(+), 16 deletions(-) diff --git a/package/fftw/Config.in b/package/fftw/Config.in index 8699d9c350..ed87de1a70 100644 --- a/package/fftw/Config.in +++ b/package/fftw/Config.in @@ -12,9 +12,6 @@ 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 @@ -30,7 +27,7 @@ config BR2_PACKAGE_FFTW_PRECISION_SINGLE config BR2_PACKAGE_FFTW_PRECISION_DOUBLE bool "double" - select BR2_PACKAGE_FFTW_USE_SSE2 if BR2_X86_CPU_HAS_SSE2 + select BR2_PACKAGE_FFTW_DOUBLE help Compile fftw in double precision (the default), i.e. use 'double' for floating point type. @@ -57,6 +54,7 @@ config BR2_PACKAGE_FFTW_PRECISION_QUAD endchoice 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-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..4bacb26e56 --- /dev/null +++ b/package/fftw/fftw-double/fftw-double.mk @@ -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)) diff --git a/package/fftw/fftw.mk b/package/fftw/fftw.mk index ccec0e0f2d..862ad5edc0 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 @@ -36,9 +40,6 @@ ifeq ($(BR2_PACKAGE_FFTW_FAST),y) FFTW_COMMON_CFLAGS += -O3 -ffast-math endif -# x86 optimisations -FFTW_COMMON_CONF_OPTS += $(if $(BR2_PACKAGE_FFTW_USE_SSE2),--enable,--disable)-sse2 - # Generic optimisations ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) FFTW_COMMON_CONF_OPTS += --enable-threads @@ -48,14 +49,6 @@ FFTW_COMMON_CONF_OPTS += --disable-threads endif 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) \ - --disable-single \ - --disable-long-double \ - --disable-quad-precision \ - CFLAGS="$(FFTW_COMMON_CFLAGS)" - -$(eval $(autotools-package)) +$(eval $(generic-package)) include $(sort $(wildcard package/fftw/*/*.mk)) From patchwork Mon Jan 21 13:51:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gwenhael Goavec-Merou X-Patchwork-Id: 1028707 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.138; helo=whitealder.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 whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43jtkd0Hzgz9sCh for ; Tue, 22 Jan 2019 01:11:04 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 2617085FAC; Mon, 21 Jan 2019 14:11:03 +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 qHgo3YhiZi18; Mon, 21 Jan 2019 14:11:01 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 9DC3181499; Mon, 21 Jan 2019 14:11:01 +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 1C8571BF3A4 for ; Mon, 21 Jan 2019 14:09:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0605081B8C for ; Mon, 21 Jan 2019 14:09:20 +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 wzz-16pxySaL for ; Mon, 21 Jan 2019 14:09:17 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail (kmf.trabucayre.com [91.121.117.161]) by whitealder.osuosl.org (Postfix) with ESMTP id EC45081437 for ; Mon, 21 Jan 2019 14:09:04 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by mail (Postfix) with ESMTP id 489B039860; Mon, 21 Jan 2019 14:51:14 +0100 (CET) From: Gwenhael Goavec-Merou To: buildroot@busybox.net Date: Mon, 21 Jan 2019 14:51:00 +0100 Message-Id: <1548078671-63318-6-git-send-email-gwenj@trabucayre.com> X-Mailer: git-send-email 1.6.4.2 In-Reply-To: <1548078671-63318-5-git-send-email-gwenj@trabucayre.com> References: <1548078671-63318-1-git-send-email-gwenj@trabucayre.com> <1548078671-63318-2-git-send-email-gwenj@trabucayre.com> <1548078671-63318-3-git-send-email-gwenj@trabucayre.com> <1548078671-63318-4-git-send-email-gwenj@trabucayre.com> <1548078671-63318-5-git-send-email-gwenj@trabucayre.com> Subject: [Buildroot] [PATCH v4 06/17] package/alsa-utils: use the new fftw-single 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: Thomas Petazzoni , Gwenhael Goavec-Merou , "Yann E. MORIN" , Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Gwenhael Goavec-Merou Signed-off-by: Gwenhael Goavec-Merou Signed-off-by: Thomas Petazzoni Acked-by: "Yann E. MORIN" --- package/alsa-utils/alsa-utils.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/alsa-utils/alsa-utils.mk b/package/alsa-utils/alsa-utils.mk index 4ce4aace46..b5c36e0a46 100644 --- a/package/alsa-utils/alsa-utils.mk +++ b/package/alsa-utils/alsa-utils.mk @@ -41,7 +41,7 @@ endif ifeq ($(BR2_PACKAGE_ALSA_UTILS_BAT),y) ALSA_UTILS_CONF_OPTS += --enable-bat # Analysis support requires fftw single precision -ALSA_UTILS_DEPENDENCIES += $(if $(BR2_PACKAGE_FFTW_PRECISION_SINGLE),fftw) +ALSA_UTILS_DEPENDENCIES += $(if $(BR2_PACKAGE_FFTW_SINGLE),fftw-single) else ALSA_UTILS_CONF_OPTS += --disable-bat endif From patchwork Mon Jan 21 13:51:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gwenhael Goavec-Merou X-Patchwork-Id: 1028710 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.138; helo=whitealder.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 whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43jtkg3W1Jz9sBQ for ; Tue, 22 Jan 2019 01:11:07 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id CF5B7815ED; Mon, 21 Jan 2019 14:11:05 +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 cmEbiJq893w0; Mon, 21 Jan 2019 14:11:02 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 753C085FC4; Mon, 21 Jan 2019 14:11:02 +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 AF4C81BF3A4 for ; Mon, 21 Jan 2019 14:09:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A968D81CF3 for ; Mon, 21 Jan 2019 14:09:20 +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 2JptMGF7YXAo for ; Mon, 21 Jan 2019 14:09:17 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail (kmf.trabucayre.com [91.121.117.161]) by whitealder.osuosl.org (Postfix) with ESMTP id 01C77815FB for ; Mon, 21 Jan 2019 14:09:04 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by mail (Postfix) with ESMTP id 6A9D939861; Mon, 21 Jan 2019 14:51:14 +0100 (CET) From: Gwenhael Goavec-Merou To: buildroot@busybox.net Date: Mon, 21 Jan 2019 14:51:01 +0100 Message-Id: <1548078671-63318-7-git-send-email-gwenj@trabucayre.com> X-Mailer: git-send-email 1.6.4.2 In-Reply-To: <1548078671-63318-6-git-send-email-gwenj@trabucayre.com> References: <1548078671-63318-1-git-send-email-gwenj@trabucayre.com> <1548078671-63318-2-git-send-email-gwenj@trabucayre.com> <1548078671-63318-3-git-send-email-gwenj@trabucayre.com> <1548078671-63318-4-git-send-email-gwenj@trabucayre.com> <1548078671-63318-5-git-send-email-gwenj@trabucayre.com> <1548078671-63318-6-git-send-email-gwenj@trabucayre.com> Subject: [Buildroot] [PATCH v4 07/17] package/aubio: use the new fftw-double and fftw-single packages 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: Thomas Petazzoni , Gwenhael Goavec-Merou , "Yann E. MORIN" , Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Gwenhael Goavec-Merou Signed-off-by: Gwenhael Goavec-Merou [Thomas: drop the condition on BR2_PACKAGE_FFTW] Signed-off-by: Thomas Petazzoni Reviewed-by: "Yann E. MORIN" --- Changes v3 -> v4: * allows to build samplerate without fft support and ensure samplerate and double precision are not enabled in same time. (yann) --- package/aubio/aubio.mk | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/package/aubio/aubio.mk b/package/aubio/aubio.mk index b0cc8b899e..ba182d9bd7 100644 --- a/package/aubio/aubio.mk +++ b/package/aubio/aubio.mk @@ -27,7 +27,7 @@ AUBIO_CONF_OPTS += --disable-sndfile endif # Could not compile aubio in double precision mode with libsamplerate -ifeq ($(BR2_PACKAGE_LIBSAMPLERATE)$(BR2_PACKAGE_FFTW_PRECISION_SINGLE),yy) +ifeq ($(BR2_PACKAGE_LIBSAMPLERATE):$(BR2_PACKAGE_FFTW_DOUBLE),y:) AUBIO_DEPENDENCIES += libsamplerate AUBIO_CONF_OPTS += --enable-samplerate else @@ -41,15 +41,14 @@ else AUBIO_CONF_OPTS += --disable-jack endif -ifeq ($(BR2_PACKAGE_FFTW),y) -AUBIO_DEPENDENCIES += fftw # fftw3 require double otherwise it will look for fftw3f -ifeq ($(BR2_PACKAGE_FFTW_PRECISION_DOUBLE),y) +ifeq ($(BR2_PACKAGE_FFTW_DOUBLE),y) AUBIO_CONF_OPTS += --enable-fftw3 --enable-double -else ifeq ($(BR2_PACKAGE_FFTW_PRECISION_SINGLE),y) +AUBIO_DEPENDENCIES += fftw-double +else ifeq ($(BR2_PACKAGE_FFTW_SINGLE),y) AUBIO_CONF_OPTS += --enable-fftw3f --disable-double -endif -else # !BR2_PACKAGE_FFTW +AUBIO_DEPENDENCIES += fftw-single +else AUBIO_CONF_OPTS += --disable-fftw3 endif From patchwork Mon Jan 21 13:51:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gwenhael Goavec-Merou X-Patchwork-Id: 1028711 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.133; helo=hemlock.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 hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43jtkk51syz9sBQ for ; Tue, 22 Jan 2019 01:11:10 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id B8D9F87079; Mon, 21 Jan 2019 14:11:07 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Vpn7de2Lu0OP; Mon, 21 Jan 2019 14:11:05 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 574A486F1B; Mon, 21 Jan 2019 14:11:04 +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 7A3D51BF3A4 for ; Mon, 21 Jan 2019 14:09:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 74A9C81016 for ; Mon, 21 Jan 2019 14:09:21 +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 87TKZTPdCjDE for ; Mon, 21 Jan 2019 14:09:17 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail (kmf.trabucayre.com [91.121.117.161]) by whitealder.osuosl.org (Postfix) with ESMTP id F272C8147B for ; Mon, 21 Jan 2019 14:09:04 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by mail (Postfix) with ESMTP id 8C52939862; Mon, 21 Jan 2019 14:51:14 +0100 (CET) From: Gwenhael Goavec-Merou To: buildroot@busybox.net Date: Mon, 21 Jan 2019 14:51:02 +0100 Message-Id: <1548078671-63318-8-git-send-email-gwenj@trabucayre.com> X-Mailer: git-send-email 1.6.4.2 In-Reply-To: <1548078671-63318-7-git-send-email-gwenj@trabucayre.com> References: <1548078671-63318-1-git-send-email-gwenj@trabucayre.com> <1548078671-63318-2-git-send-email-gwenj@trabucayre.com> <1548078671-63318-3-git-send-email-gwenj@trabucayre.com> <1548078671-63318-4-git-send-email-gwenj@trabucayre.com> <1548078671-63318-5-git-send-email-gwenj@trabucayre.com> <1548078671-63318-6-git-send-email-gwenj@trabucayre.com> <1548078671-63318-7-git-send-email-gwenj@trabucayre.com> Subject: [Buildroot] [PATCH v4 08/17] package/gnuradio: use the new fftw-single 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: Thomas Petazzoni , Gwenhael Goavec-Merou , "Yann E. MORIN" , Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Gwenhael Goavec-Merou Thanks to the new fftw package organization, we can use a "select" instead of "depends on". Signed-off-by: Gwenhael Goavec-Merou Signed-off-by: Thomas Petazzoni Reviewed-by: "Yann E. MORIN" --- package/gnuradio/Config.in | 8 ++------ package/gnuradio/gnuradio.mk | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/package/gnuradio/Config.in b/package/gnuradio/Config.in index 56957d59e4..533a49c81e 100644 --- a/package/gnuradio/Config.in +++ b/package/gnuradio/Config.in @@ -78,11 +78,6 @@ config BR2_PACKAGE_GNURADIO_ZEROMQ help zeromq communication support -comment "gr-fft, -filter, -analog, -channels, -digital, -trellis, -pager, -qtgui depends fftw's single precision" - depends on !BR2_PACKAGE_FFTW_PRECISION_SINGLE - -if BR2_PACKAGE_FFTW_PRECISION_SINGLE - config BR2_PACKAGE_GNURADIO_ANALOG bool "gr-analog support" select BR2_PACKAGE_GNURADIO_FILTER @@ -103,6 +98,8 @@ config BR2_PACKAGE_GNURADIO_DIGITAL config BR2_PACKAGE_GNURADIO_FFT bool "gr-fft support" + select BR2_PACKAGE_FFTW + select BR2_PACKAGE_FFTW_SINGLE select BR2_PACKAGE_GNURADIO_BLOCKS help FFT signal processing blocks @@ -136,4 +133,3 @@ config BR2_PACKAGE_GNURADIO_TRELLIS Trellis coded modulation blocks endif -endif diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index ed537e3934..564ad8b2a4 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -101,7 +101,7 @@ GNURADIO_CONF_OPTS += -DENABLE_GR_FEC=OFF endif ifeq ($(BR2_PACKAGE_GNURADIO_FFT),y) -GNURADIO_DEPENDENCIES += fftw +GNURADIO_DEPENDENCIES += fftw-single GNURADIO_CONF_OPTS += -DENABLE_GR_FFT=ON else GNURADIO_CONF_OPTS += -DENABLE_GR_FFT=OFF From patchwork Mon Jan 21 13:51:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gwenhael Goavec-Merou X-Patchwork-Id: 1028697 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.138; helo=whitealder.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 whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43jthf0Rwdz9s55 for ; Tue, 22 Jan 2019 01:09:21 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id BF0B180F43; Mon, 21 Jan 2019 14:09:18 +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 y2qOvK+uFJwM; Mon, 21 Jan 2019 14:09:17 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 72D6981B8C; Mon, 21 Jan 2019 14:09:14 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 1CE6C1BF3A4 for ; Mon, 21 Jan 2019 14:09:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 1A62886E1A for ; Mon, 21 Jan 2019 14:09:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nwvmfohDl+sE for ; Mon, 21 Jan 2019 14:09:05 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail (kmf.trabucayre.com [91.121.117.161]) by hemlock.osuosl.org (Postfix) with ESMTP id BFD3E86CB7 for ; Mon, 21 Jan 2019 14:09:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by mail (Postfix) with ESMTP id AE01139863; Mon, 21 Jan 2019 14:51:14 +0100 (CET) From: Gwenhael Goavec-Merou To: buildroot@busybox.net Date: Mon, 21 Jan 2019 14:51:03 +0100 Message-Id: <1548078671-63318-9-git-send-email-gwenj@trabucayre.com> X-Mailer: git-send-email 1.6.4.2 In-Reply-To: <1548078671-63318-8-git-send-email-gwenj@trabucayre.com> References: <1548078671-63318-1-git-send-email-gwenj@trabucayre.com> <1548078671-63318-2-git-send-email-gwenj@trabucayre.com> <1548078671-63318-3-git-send-email-gwenj@trabucayre.com> <1548078671-63318-4-git-send-email-gwenj@trabucayre.com> <1548078671-63318-5-git-send-email-gwenj@trabucayre.com> <1548078671-63318-6-git-send-email-gwenj@trabucayre.com> <1548078671-63318-7-git-send-email-gwenj@trabucayre.com> <1548078671-63318-8-git-send-email-gwenj@trabucayre.com> Subject: [Buildroot] [PATCH v4 09/17] package/gqrx: remove unneeded fftw dependency 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: Thomas Petazzoni , Gwenhael Goavec-Merou , "Yann E. MORIN" , Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Gwenhael Goavec-Merou Thanks to the new fftw package organization, gnuradio already selects the appropriate fftw precision, and there is no need to propagate the "depends on BR2_PACKAGE_FFTW_PRECISION_SINGLE" that used to be present in the gnuradio package. Signed-off-by: Gwenhael Goavec-Merou Signed-off-by: Thomas Petazzoni Reviewed-by: "Yann E. MORIN" --- Changes v3 -> v4: * use select instead of depends on for GNURadio and propagates dependencies.(yann) --- package/gqrx/Config.in | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/package/gqrx/Config.in b/package/gqrx/Config.in index 1dc40c6d24..b55b5740ad 100644 --- a/package/gqrx/Config.in +++ b/package/gqrx/Config.in @@ -1,22 +1,25 @@ -comment "gqrx needs a toolchain w/ C++, threads, wchar" +comment "gqrx needs a toolchain w/ C++, threads, wchar, dynamic library" + depends on BR2_USE_MMU # gnuradio + depends on !BR2_PACKAGE_PYTHON3 # gnuradio depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_USE_WCHAR + !BR2_USE_WCHAR || !BR2_STATIC_LIBS -comment "gqrx needs qt5, gnuradio, fftw's single precision" - depends on !BR2_PACKAGE_GNURADIO || !BR2_PACKAGE_FFTW_PRECISION_SINGLE || \ - !BR2_PACKAGE_QT5 +comment "gqrx needs qt5" + depends on !BR2_PACKAGE_QT5 config BR2_PACKAGE_GQRX bool "gqrx" - depends on BR2_PACKAGE_FFTW_PRECISION_SINGLE # gnuradio - depends on BR2_PACKAGE_GNURADIO depends on BR2_PACKAGE_QT5 + depends on !BR2_PACKAGE_PYTHON3 depends on BR2_INSTALL_LIBSTDCPP # boost + depends on !BR2_STATIC_LIBS # gnuradio + depends on BR2_USE_MMU # gnuradio depends on BR2_TOOLCHAIN_HAS_THREADS # boost depends on BR2_USE_WCHAR # boost select BR2_PACKAGE_BOOST select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS select BR2_PACKAGE_BOOST_SYSTEM + select BR2_PACKAGE_GNURADIO select BR2_PACKAGE_GNURADIO_ANALOG select BR2_PACKAGE_GNURADIO_AUDIO select BR2_PACKAGE_GNURADIO_BLOCKS From patchwork Mon Jan 21 13:51:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gwenhael Goavec-Merou X-Patchwork-Id: 1028709 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 43jtkg3zjpz9s2P for ; Tue, 22 Jan 2019 01:11:07 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 81E16844B5; Mon, 21 Jan 2019 14:11:04 +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 EGM-U0gIULi6; Mon, 21 Jan 2019 14:11:01 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id E778485137; Mon, 21 Jan 2019 14:11:00 +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 49BE21BF3A4 for ; Mon, 21 Jan 2019 14:09:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 3C55A80B14 for ; Mon, 21 Jan 2019 14:09:19 +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 AcNQg3lKECPM for ; Mon, 21 Jan 2019 14:09:16 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail (kmf.trabucayre.com [91.121.117.161]) by whitealder.osuosl.org (Postfix) with ESMTP id 00B0F815ED for ; Mon, 21 Jan 2019 14:09:04 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by mail (Postfix) with ESMTP id CFB5639864; Mon, 21 Jan 2019 14:51:14 +0100 (CET) From: Gwenhael Goavec-Merou To: buildroot@busybox.net Date: Mon, 21 Jan 2019 14:51:04 +0100 Message-Id: <1548078671-63318-10-git-send-email-gwenj@trabucayre.com> X-Mailer: git-send-email 1.6.4.2 In-Reply-To: <1548078671-63318-9-git-send-email-gwenj@trabucayre.com> References: <1548078671-63318-1-git-send-email-gwenj@trabucayre.com> <1548078671-63318-2-git-send-email-gwenj@trabucayre.com> <1548078671-63318-3-git-send-email-gwenj@trabucayre.com> <1548078671-63318-4-git-send-email-gwenj@trabucayre.com> <1548078671-63318-5-git-send-email-gwenj@trabucayre.com> <1548078671-63318-6-git-send-email-gwenj@trabucayre.com> <1548078671-63318-7-git-send-email-gwenj@trabucayre.com> <1548078671-63318-8-git-send-email-gwenj@trabucayre.com> <1548078671-63318-9-git-send-email-gwenj@trabucayre.com> Subject: [Buildroot] [PATCH v4 10/17] package/hackrf: use the new fftw-single 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: Thomas Petazzoni , Gwenhael Goavec-Merou , "Yann E. MORIN" , Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Gwenhael Goavec-Merou Signed-off-by: Gwenhael Goavec-Merou Signed-off-by: Thomas Petazzoni Acked-by: "Yann E. MORIN" --- package/hackrf/Config.in | 6 ++---- package/hackrf/hackrf.mk | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/package/hackrf/Config.in b/package/hackrf/Config.in index 4fa27699c4..b86790f2b0 100644 --- a/package/hackrf/Config.in +++ b/package/hackrf/Config.in @@ -2,7 +2,8 @@ config BR2_PACKAGE_HACKRF bool "hackrf" depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_PACKAGE_FFTW_PRECISION_SINGLE + select BR2_PACKAGE_FFTW + select BR2_PACKAGE_FFTW_SINGLE select BR2_PACKAGE_LIBUSB help Library and tools for accessing HackRF SDR boards. @@ -11,6 +12,3 @@ config BR2_PACKAGE_HACKRF comment "hackrf needs a toolchain w/ threads, dynamic library" depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS - -comment "hackrf needs fftw's single precision" - depends on !BR2_PACKAGE_FFTW_PRECISION_SINGLE diff --git a/package/hackrf/hackrf.mk b/package/hackrf/hackrf.mk index acab0be1d3..b83f6518e8 100644 --- a/package/hackrf/hackrf.mk +++ b/package/hackrf/hackrf.mk @@ -9,7 +9,7 @@ HACKRF_SITE = https://github.com/mossmann/hackrf/releases/download/v$(HACKRF_VER HACKRF_SOURCE = hackrf-$(HACKRF_VERSION).tar.xz HACKRF_LICENSE = GPL-2.0+ BSD-3c HACKRF_LICENSE_FILES = COPYING -HACKRF_DEPENDENCIES = fftw libusb +HACKRF_DEPENDENCIES = fftw-single libusb HACKRF_SUBDIR = host HACKRF_INSTALL_STAGING = YES From patchwork Mon Jan 21 13:51:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gwenhael Goavec-Merou X-Patchwork-Id: 1028695 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.133; helo=hemlock.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 hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43jthb4kZ4z9sBQ for ; Tue, 22 Jan 2019 01:09:19 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id E66298700E; Mon, 21 Jan 2019 14:09:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kOGLxEl--zeP; Mon, 21 Jan 2019 14:09:17 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 4CE1487009; Mon, 21 Jan 2019 14:09:17 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id C316A1BF3A4 for ; Mon, 21 Jan 2019 14:09:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id C0C7086FDE for ; Mon, 21 Jan 2019 14:09:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2wuPWwqixbi1 for ; Mon, 21 Jan 2019 14:09:05 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail (kmf.trabucayre.com [91.121.117.161]) by hemlock.osuosl.org (Postfix) with ESMTP id C634886E1D for ; Mon, 21 Jan 2019 14:09:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by mail (Postfix) with ESMTP id F1EDF39865; Mon, 21 Jan 2019 14:51:14 +0100 (CET) From: Gwenhael Goavec-Merou To: buildroot@busybox.net Date: Mon, 21 Jan 2019 14:51:05 +0100 Message-Id: <1548078671-63318-11-git-send-email-gwenj@trabucayre.com> X-Mailer: git-send-email 1.6.4.2 In-Reply-To: <1548078671-63318-10-git-send-email-gwenj@trabucayre.com> References: <1548078671-63318-1-git-send-email-gwenj@trabucayre.com> <1548078671-63318-2-git-send-email-gwenj@trabucayre.com> <1548078671-63318-3-git-send-email-gwenj@trabucayre.com> <1548078671-63318-4-git-send-email-gwenj@trabucayre.com> <1548078671-63318-5-git-send-email-gwenj@trabucayre.com> <1548078671-63318-6-git-send-email-gwenj@trabucayre.com> <1548078671-63318-7-git-send-email-gwenj@trabucayre.com> <1548078671-63318-8-git-send-email-gwenj@trabucayre.com> <1548078671-63318-9-git-send-email-gwenj@trabucayre.com> <1548078671-63318-10-git-send-email-gwenj@trabucayre.com> Subject: [Buildroot] [PATCH v4 11/17] package/httping: use the new fftw-double 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: Thomas Petazzoni , Gwenhael Goavec-Merou , "Yann E. MORIN" , Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Gwenhael Goavec-Merou This patch add an explicitly dependency to fftw-double (the only compatible fftw's flavor) instead of default behavior where the package do assumption about the compatible version. Signed-off-by: Gwenhael Goavec-Merou Signed-off-by: Thomas Petazzoni Acked-by: "Yann E. MORIN" --- Changes v3 -> v4: * improve commit message about fftw version. (Yann) --- package/httping/httping.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/httping/httping.mk b/package/httping/httping.mk index 955ee3131b..b3a625a8e1 100644 --- a/package/httping/httping.mk +++ b/package/httping/httping.mk @@ -17,9 +17,9 @@ HTTPING_DEPENDENCIES = \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) \ $(if $(BR2_PACKAGE_NCURSES_WCHAR),ncurses) \ $(if $(BR2_PACKAGE_OPENSSL),openssl) \ - $(if $(BR2_PACKAGE_FFTW),fftw) + $(if $(BR2_PACKAGE_FFTW_DOUBLE),fftw-double) HTTPING_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) \ - FW=$(if $(BR2_PACKAGE_FFTW),yes,no) \ + FW=$(if $(BR2_PACKAGE_FFTW_DOUBLE),yes,no) \ NC=$(if $(BR2_PACKAGE_NCURSES_WCHAR),yes,no) \ SSL=$(if $(BR2_PACKAGE_OPENSSL),yes,no) \ TFO=$(if $(BR2_PACKAGE_HTTPING_TFO),yes,no) \ From patchwork Mon Jan 21 13:51:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gwenhael Goavec-Merou X-Patchwork-Id: 1028708 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.133; helo=hemlock.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 hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43jtkf3chDz9s2P for ; Tue, 22 Jan 2019 01:11:06 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id BB41486FCD; Mon, 21 Jan 2019 14:11:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id PJPAkHkwzuO2; Mon, 21 Jan 2019 14:11:00 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 2EAD886D78; Mon, 21 Jan 2019 14:11:00 +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 76B331BF3A4 for ; Mon, 21 Jan 2019 14:09:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 746A580F43 for ; Mon, 21 Jan 2019 14:09:18 +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 sheYERiyFJKA for ; Mon, 21 Jan 2019 14:09:17 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail (kmf.trabucayre.com [91.121.117.161]) by whitealder.osuosl.org (Postfix) with ESMTP id 00A3781499 for ; Mon, 21 Jan 2019 14:09:04 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by mail (Postfix) with ESMTP id 1F69E39866; Mon, 21 Jan 2019 14:51:15 +0100 (CET) From: Gwenhael Goavec-Merou To: buildroot@busybox.net Date: Mon, 21 Jan 2019 14:51:06 +0100 Message-Id: <1548078671-63318-12-git-send-email-gwenj@trabucayre.com> X-Mailer: git-send-email 1.6.4.2 In-Reply-To: <1548078671-63318-11-git-send-email-gwenj@trabucayre.com> References: <1548078671-63318-1-git-send-email-gwenj@trabucayre.com> <1548078671-63318-2-git-send-email-gwenj@trabucayre.com> <1548078671-63318-3-git-send-email-gwenj@trabucayre.com> <1548078671-63318-4-git-send-email-gwenj@trabucayre.com> <1548078671-63318-5-git-send-email-gwenj@trabucayre.com> <1548078671-63318-6-git-send-email-gwenj@trabucayre.com> <1548078671-63318-7-git-send-email-gwenj@trabucayre.com> <1548078671-63318-8-git-send-email-gwenj@trabucayre.com> <1548078671-63318-9-git-send-email-gwenj@trabucayre.com> <1548078671-63318-10-git-send-email-gwenj@trabucayre.com> <1548078671-63318-11-git-send-email-gwenj@trabucayre.com> Subject: [Buildroot] [PATCH v4 12/17] package/imagemagick: use the new fftw-double 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: Thomas Petazzoni , Gwenhael Goavec-Merou , "Yann E. MORIN" , Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Gwenhael Goavec-Merou This patch add an explicitly dependency to fftw-double (the only compatible fftw's flavor) instead of default behavior where the package do assumption about the compatible version. Signed-off-by: Gwenhael Goavec-Merou Signed-off-by: Thomas Petazzoni Acked-by: "Yann E. MORIN" --- Changes v3 -> v4: * improve commit message about fftw version. (Yann) --- package/imagemagick/imagemagick.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index 72482267ce..7678980582 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -113,11 +113,11 @@ else IMAGEMAGICK_CONF_OPTS += --without-lzma endif -ifeq ($(BR2_PACKAGE_FFTW),y) +ifeq ($(BR2_PACKAGE_FFTW_DOUBLE),y) # configure script misdetects these leading to build errors IMAGEMAGICK_CONF_ENV += ac_cv_func_creal=yes ac_cv_func_cimag=yes IMAGEMAGICK_CONF_OPTS += --with-fftw -IMAGEMAGICK_DEPENDENCIES += fftw +IMAGEMAGICK_DEPENDENCIES += fftw-double else IMAGEMAGICK_CONF_OPTS += --without-fftw endif From patchwork Mon Jan 21 13:51:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gwenhael Goavec-Merou X-Patchwork-Id: 1028693 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.133; helo=hemlock.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 hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43jthY3XFtz9s55 for ; Tue, 22 Jan 2019 01:09:17 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id C8F9486E1D; Mon, 21 Jan 2019 14:09:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id JfWF3w+5RIfs; Mon, 21 Jan 2019 14:09:07 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 86F7F86FAE; Mon, 21 Jan 2019 14:09:07 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id E122D1BF3A4 for ; Mon, 21 Jan 2019 14:09:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id DABE085092 for ; Mon, 21 Jan 2019 14:09:06 +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 DDnWZ8pcUQXY for ; Mon, 21 Jan 2019 14:09:05 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail (kmf.trabucayre.com [91.121.117.161]) by fraxinus.osuosl.org (Postfix) with ESMTP id 9CEF8844D5 for ; Mon, 21 Jan 2019 14:09:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by mail (Postfix) with ESMTP id 4124A39867; Mon, 21 Jan 2019 14:51:15 +0100 (CET) From: Gwenhael Goavec-Merou To: buildroot@busybox.net Date: Mon, 21 Jan 2019 14:51:07 +0100 Message-Id: <1548078671-63318-13-git-send-email-gwenj@trabucayre.com> X-Mailer: git-send-email 1.6.4.2 In-Reply-To: <1548078671-63318-12-git-send-email-gwenj@trabucayre.com> References: <1548078671-63318-1-git-send-email-gwenj@trabucayre.com> <1548078671-63318-2-git-send-email-gwenj@trabucayre.com> <1548078671-63318-3-git-send-email-gwenj@trabucayre.com> <1548078671-63318-4-git-send-email-gwenj@trabucayre.com> <1548078671-63318-5-git-send-email-gwenj@trabucayre.com> <1548078671-63318-6-git-send-email-gwenj@trabucayre.com> <1548078671-63318-7-git-send-email-gwenj@trabucayre.com> <1548078671-63318-8-git-send-email-gwenj@trabucayre.com> <1548078671-63318-9-git-send-email-gwenj@trabucayre.com> <1548078671-63318-10-git-send-email-gwenj@trabucayre.com> <1548078671-63318-11-git-send-email-gwenj@trabucayre.com> <1548078671-63318-12-git-send-email-gwenj@trabucayre.com> Subject: [Buildroot] [PATCH v4 13/17] package/libvips: use the new fftw-double 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: Thomas Petazzoni , Gwenhael Goavec-Merou , "Yann E. MORIN" , Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Gwenhael Goavec-Merou This patch add an explicitly dependency to fftw-double (the only compatible fftw's flavor) instead of default behavior where the package do assumption about the compatible version. Signed-off-by: Gwenhael Goavec-Merou Signed-off-by: Thomas Petazzoni Acked-by: "Yann E. MORIN" --- Changes v3 -> v4: * improve commit message about fftw version. (Yann) --- package/libvips/libvips.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libvips/libvips.mk b/package/libvips/libvips.mk index 8078e046d1..7622f32fbc 100644 --- a/package/libvips/libvips.mk +++ b/package/libvips/libvips.mk @@ -68,9 +68,9 @@ else LIBVIPS_CONF_OPTS += --without-tiff endif -ifeq ($(BR2_PACKAGE_FFTW),y) +ifeq ($(BR2_PACKAGE_FFTW_DOUBLE),y) LIBVIPS_CONF_OPTS += --with-fftw -LIBVIPS_DEPENDENCIES += fftw +LIBVIPS_DEPENDENCIES += fftw-double else LIBVIPS_CONF_OPTS += --without-fftw endif From patchwork Mon Jan 21 13:51:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gwenhael Goavec-Merou X-Patchwork-Id: 1028696 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.136; helo=silver.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 silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43jthd54m2z9s2P for ; Tue, 22 Jan 2019 01:09:21 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id D6BB423143; Mon, 21 Jan 2019 14:09:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 23vwv1RqCZnN; Mon, 21 Jan 2019 14:09:18 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 13E2322926; Mon, 21 Jan 2019 14:09:18 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 838211BF3A4 for ; Mon, 21 Jan 2019 14:09:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 811DE85218 for ; Mon, 21 Jan 2019 14:09:14 +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 5pOom5Ld-m1t for ; Mon, 21 Jan 2019 14:09:06 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail (kmf.trabucayre.com [91.121.117.161]) by fraxinus.osuosl.org (Postfix) with ESMTP id 2152A845E0 for ; Mon, 21 Jan 2019 14:09:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by mail (Postfix) with ESMTP id 62D0E39868; Mon, 21 Jan 2019 14:51:15 +0100 (CET) From: Gwenhael Goavec-Merou To: buildroot@busybox.net Date: Mon, 21 Jan 2019 14:51:08 +0100 Message-Id: <1548078671-63318-14-git-send-email-gwenj@trabucayre.com> X-Mailer: git-send-email 1.6.4.2 In-Reply-To: <1548078671-63318-13-git-send-email-gwenj@trabucayre.com> References: <1548078671-63318-1-git-send-email-gwenj@trabucayre.com> <1548078671-63318-2-git-send-email-gwenj@trabucayre.com> <1548078671-63318-3-git-send-email-gwenj@trabucayre.com> <1548078671-63318-4-git-send-email-gwenj@trabucayre.com> <1548078671-63318-5-git-send-email-gwenj@trabucayre.com> <1548078671-63318-6-git-send-email-gwenj@trabucayre.com> <1548078671-63318-7-git-send-email-gwenj@trabucayre.com> <1548078671-63318-8-git-send-email-gwenj@trabucayre.com> <1548078671-63318-9-git-send-email-gwenj@trabucayre.com> <1548078671-63318-10-git-send-email-gwenj@trabucayre.com> <1548078671-63318-11-git-send-email-gwenj@trabucayre.com> <1548078671-63318-12-git-send-email-gwenj@trabucayre.com> <1548078671-63318-13-git-send-email-gwenj@trabucayre.com> Subject: [Buildroot] [PATCH v4 14/17] package/pulseaudio: use the new fftw-single 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: Thomas Petazzoni , Gwenhael Goavec-Merou , "Yann E. MORIN" , Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Gwenhael Goavec-Merou This patch add an explicitly dependency to fftw-single (the only compatible fftw's flavor) instead of default behavior where the package do assumption about the compatible version. Signed-off-by: Gwenhael Goavec-Merou Signed-off-by: Thomas Petazzoni Acked-by: "Yann E. MORIN" --- Changes v3 -> v4: * improve commit message about fftw version. (Yann) --- package/pulseaudio/pulseaudio.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pulseaudio/pulseaudio.mk b/package/pulseaudio/pulseaudio.mk index d1c35654cf..c91af22935 100644 --- a/package/pulseaudio/pulseaudio.mk +++ b/package/pulseaudio/pulseaudio.mk @@ -21,7 +21,7 @@ PULSEAUDIO_DEPENDENCIES = \ $(if $(BR2_PACKAGE_AVAHI_DAEMON),avahi) \ $(if $(BR2_PACKAGE_DBUS),dbus) \ $(if $(BR2_PACKAGE_OPENSSL),openssl) \ - $(if $(BR2_PACKAGE_FFTW),fftw) \ + $(if $(BR2_PACKAGE_FFTW_SINGLE),fftw-single) \ $(if $(BR2_PACKAGE_SYSTEMD),systemd) ifeq ($(BR2_PACKAGE_LIBSAMPLERATE),y) From patchwork Mon Jan 21 13:51:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gwenhael Goavec-Merou X-Patchwork-Id: 1028694 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 43jthZ39Rcz9sCh for ; Tue, 22 Jan 2019 01:09:18 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 095B685108; Mon, 21 Jan 2019 14:09: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 OJHgxJ0rnf9I; Mon, 21 Jan 2019 14:09:10 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 6EB6385092; Mon, 21 Jan 2019 14:09:10 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 50FED1BF3A4 for ; Mon, 21 Jan 2019 14:09:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 4E3DF86E1A for ; Mon, 21 Jan 2019 14:09:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YISy6W3u2SCD for ; Mon, 21 Jan 2019 14:09:06 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail (kmf.trabucayre.com [91.121.117.161]) by hemlock.osuosl.org (Postfix) with ESMTP id 77A4A86EA5 for ; Mon, 21 Jan 2019 14:09:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by mail (Postfix) with ESMTP id 851783986E; Mon, 21 Jan 2019 14:51:15 +0100 (CET) From: Gwenhael Goavec-Merou To: buildroot@busybox.net Date: Mon, 21 Jan 2019 14:51:09 +0100 Message-Id: <1548078671-63318-15-git-send-email-gwenj@trabucayre.com> X-Mailer: git-send-email 1.6.4.2 In-Reply-To: <1548078671-63318-14-git-send-email-gwenj@trabucayre.com> References: <1548078671-63318-1-git-send-email-gwenj@trabucayre.com> <1548078671-63318-2-git-send-email-gwenj@trabucayre.com> <1548078671-63318-3-git-send-email-gwenj@trabucayre.com> <1548078671-63318-4-git-send-email-gwenj@trabucayre.com> <1548078671-63318-5-git-send-email-gwenj@trabucayre.com> <1548078671-63318-6-git-send-email-gwenj@trabucayre.com> <1548078671-63318-7-git-send-email-gwenj@trabucayre.com> <1548078671-63318-8-git-send-email-gwenj@trabucayre.com> <1548078671-63318-9-git-send-email-gwenj@trabucayre.com> <1548078671-63318-10-git-send-email-gwenj@trabucayre.com> <1548078671-63318-11-git-send-email-gwenj@trabucayre.com> <1548078671-63318-12-git-send-email-gwenj@trabucayre.com> <1548078671-63318-13-git-send-email-gwenj@trabucayre.com> <1548078671-63318-14-git-send-email-gwenj@trabucayre.com> Subject: [Buildroot] [PATCH v4 15/17] package/liquid-dsp: use the new fftw-{single, double, long-double} packages 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: Thomas Petazzoni , Gwenhael Goavec-Merou , "Yann E. MORIN" , Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Gwenhael Goavec-Merou Signed-off-by: Gwenhael Goavec-Merou Signed-off-by: Thomas Petazzoni --- package/liquid-dsp/liquid-dsp.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package/liquid-dsp/liquid-dsp.mk b/package/liquid-dsp/liquid-dsp.mk index db67893844..6aa27a5248 100644 --- a/package/liquid-dsp/liquid-dsp.mk +++ b/package/liquid-dsp/liquid-dsp.mk @@ -30,9 +30,9 @@ LIQUID_DSP_CFLAGS += -ffast-math endif # use FFTW instead of built-in FFT -ifeq ($(BR2_PACKAGE_FFTW_PRECISION_SINGLE),y) +ifeq ($(BR2_PACKAGE_FFTW_SINGLE),y) LIQUID_DSP_LDFLAGS += -lfftw3f -LIQUID_DSP_DEPENDENCIES += fftw +LIQUID_DSP_DEPENDENCIES += fftw-single endif # disable altivec, it has build issues @@ -40,14 +40,14 @@ ifeq ($(BR2_powerpc)$(BR2_powerpc64)$(BR2_powerpc64le),y) LIQUID_DSP_CONF_OPTS += --enable-simdoverride endif -ifeq ($(BR2_PACKAGE_FFTW_PRECISION_DOUBLE),y) +ifeq ($(BR2_PACKAGE_FFTW_DOUBLE),y) LIQUID_DSP_LDFLAGS += -lfftw3 -LIQUID_DSP_DEPENDENCIES += fftw +LIQUID_DSP_DEPENDENCIES += fftw-double endif -ifeq ($(BR2_PACKAGE_FFTW_PRECISION_LONG_DOUBLE),y) +ifeq ($(BR2_PACKAGE_FFTW_LONG_DOUBLE),y) LIQUID_DSP_LDFLAGS += -lfftw3l -LIQUID_DSP_DEPENDENCIES += fftw +LIQUID_DSP_DEPENDENCIES += fftw-long-double endif LIQUID_DSP_CONF_OPTS += \ From patchwork Mon Jan 21 13:51:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gwenhael Goavec-Merou X-Patchwork-Id: 1028698 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.133; helo=hemlock.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 hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43jthg4wKXz9s2P for ; Tue, 22 Jan 2019 01:09:23 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id A5D18870D7; Mon, 21 Jan 2019 14:09:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1KiD7xpzNw0I; Mon, 21 Jan 2019 14:09:18 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id DEDB68702D; Mon, 21 Jan 2019 14:09:18 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 541411BF3A4 for ; Mon, 21 Jan 2019 14:09:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 519DF86FAE for ; Mon, 21 Jan 2019 14:09:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HvJMOEJPOiWW for ; Mon, 21 Jan 2019 14:09:06 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail (kmf.trabucayre.com [91.121.117.161]) by hemlock.osuosl.org (Postfix) with ESMTP id 4054686E2C for ; Mon, 21 Jan 2019 14:09:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by mail (Postfix) with ESMTP id A75A43986F; Mon, 21 Jan 2019 14:51:15 +0100 (CET) From: Gwenhael Goavec-Merou To: buildroot@busybox.net Date: Mon, 21 Jan 2019 14:51:10 +0100 Message-Id: <1548078671-63318-16-git-send-email-gwenj@trabucayre.com> X-Mailer: git-send-email 1.6.4.2 In-Reply-To: <1548078671-63318-15-git-send-email-gwenj@trabucayre.com> References: <1548078671-63318-1-git-send-email-gwenj@trabucayre.com> <1548078671-63318-2-git-send-email-gwenj@trabucayre.com> <1548078671-63318-3-git-send-email-gwenj@trabucayre.com> <1548078671-63318-4-git-send-email-gwenj@trabucayre.com> <1548078671-63318-5-git-send-email-gwenj@trabucayre.com> <1548078671-63318-6-git-send-email-gwenj@trabucayre.com> <1548078671-63318-7-git-send-email-gwenj@trabucayre.com> <1548078671-63318-8-git-send-email-gwenj@trabucayre.com> <1548078671-63318-9-git-send-email-gwenj@trabucayre.com> <1548078671-63318-10-git-send-email-gwenj@trabucayre.com> <1548078671-63318-11-git-send-email-gwenj@trabucayre.com> <1548078671-63318-12-git-send-email-gwenj@trabucayre.com> <1548078671-63318-13-git-send-email-gwenj@trabucayre.com> <1548078671-63318-14-git-send-email-gwenj@trabucayre.com> <1548078671-63318-15-git-send-email-gwenj@trabucayre.com> Subject: [Buildroot] [PATCH v4 16/17] package/fftw: remove as regular 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: Thomas Petazzoni , Gwenhael Goavec-Merou , "Yann E. MORIN" , Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Thomas Petazzoni From: Thomas Petazzoni fftw is no longer a package: only fftw-single, fftw-double, fftw-long-double and fftw-quad are. fftw.mk only contains some common definitions that are used by the different fftw variants. The old BR2_PACKAGE_FFTW_PRECISION_* options, which are no longer used anywhere, are moved to Config.in.legacy. Signed-off-by: Thomas Petazzoni Signed-off-by: Gwenhael Goavec-Merou --- Changes v3 -> V4: * when BR2_PACKAGE_FFTW is enabled without flavour, selects fftw-double by default. (Yann) * suppress suppress two consecutive empty lines. (Yann) --- Config.in.legacy | 35 +++++++++++++++++++++++++++++++++ package/fftw/Config.in | 44 +++--------------------------------------- package/fftw/fftw.mk | 18 ----------------- 3 files changed, 38 insertions(+), 59 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index ef460752f3..b26a070759 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -154,6 +154,41 @@ config BR2_PACKAGE_BOOST_SIGNALS was announced in 1.54. Users are encouraged to use Signals2 instead. +config BR2_PACKAGE_FFTW_PRECISION_SINGLE + bool "single" + select BR2_LEGACY + select BR2_PACKAGE_FFTW_SINGLE + help + This option has been removed in favor of + BR2_PACKAGE_FFTW_SINGLE. + +config BR2_PACKAGE_FFTW_PRECISION_DOUBLE + bool "double" + select BR2_LEGACY + select BR2_PACKAGE_FFTW_DOUBLE + help + This option has been removed in favor of + BR2_PACKAGE_FFTW_DOUBLE. + +config BR2_PACKAGE_FFTW_PRECISION_LONG_DOUBLE + bool "long double" + depends on !(BR2_TOOLCHAIN_BUILDROOT_UCLIBC && \ + (BR2_arm || BR2_mips || BR2_mipsel)) + select BR2_LEGACY + select BR2_PACKAGE_FFTW_LONG_DOUBLE + help + This option has been removed in favor of + BR2_PACKAGE_FFTW_LONG_DOUBLE. + +config BR2_PACKAGE_FFTW_PRECISION_QUAD + bool "quad" + depends on (BR2_i386 || BR2_x86_64) && BR2_USE_WCHAR + select BR2_LEGACY + select BR2_PACKAGE_FFTW_QUAD + help + This option has been removed in favor of + BR2_PACKAGE_FFTW_QUAD. + config BR2_PACKAGE_LUA_5_2 bool "Lua 5.2.x version removed" select BR2_LEGACY diff --git a/package/fftw/Config.in b/package/fftw/Config.in index ed87de1a70..89d99c5f9d 100644 --- a/package/fftw/Config.in +++ b/package/fftw/Config.in @@ -1,5 +1,8 @@ config BR2_PACKAGE_FFTW bool "fftw" + select BR2_PACKAGE_FFTW_DOUBLE if !BR2_PACKAGE_FFTW_SINGLE \ + && !BR2_PACKAGE_FFTW_LONG_DOUBLE && !BR2_PACKAGE_FFTW_QUAD + help Library for computing Fast Fourier Transforms. @@ -12,47 +15,6 @@ config BR2_PACKAGE_FFTW if BR2_PACKAGE_FFTW -choice - prompt "fftw precision" - default BR2_PACKAGE_FFTW_PRECISION_DOUBLE - help - Selects fftw precision - -config BR2_PACKAGE_FFTW_PRECISION_SINGLE - bool "single" - select BR2_PACKAGE_FFTW_SINGLE - help - Compile fftw in single precision, i.e. use 'float' for - floating point type. - -config BR2_PACKAGE_FFTW_PRECISION_DOUBLE - bool "double" - select BR2_PACKAGE_FFTW_DOUBLE - help - Compile fftw in double precision (the default), i.e. use - 'double' for floating point type. - -config BR2_PACKAGE_FFTW_PRECISION_LONG_DOUBLE - bool "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. - -config BR2_PACKAGE_FFTW_PRECISION_QUAD - bool "quad" - # quad-precision needs to have a gcc with libquadmath - depends on (BR2_i386 || BR2_x86_64) && BR2_USE_WCHAR - select BR2_PACKAGE_FFTW_QUAD - help - Compile fftw in quadruple precision, i.e. use '__float128' for - floating point type. - -endchoice - source "package/fftw/fftw-single/Config.in" source "package/fftw/fftw-double/Config.in" source "package/fftw/fftw-long-double/Config.in" diff --git a/package/fftw/fftw.mk b/package/fftw/fftw.mk index 862ad5edc0..bcfdb9c96a 100644 --- a/package/fftw/fftw.mk +++ b/package/fftw/fftw.mk @@ -10,22 +10,6 @@ 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 - -ifeq ($(BR2_PACKAGE_FFTW_QUAD),y) -FFTW_DEPENDENCIES += fftw-quad -endif - -ifeq ($(BR2_PACKAGE_FFTW_SINGLE),y) -FFTW_DEPENDENCIES += fftw-single -endif - # fortran support only enables generation and installation of fortran sources ifeq ($(BR2_TOOLCHAIN_HAS_FORTRAN),y) FFTW_COMMON_CONF_OPTS += --enable-fortran @@ -49,6 +33,4 @@ FFTW_COMMON_CONF_OPTS += --disable-threads endif FFTW_COMMON_CONF_OPTS += $(if $(BR2_GCC_ENABLE_OPENMP),--enable,--disable)-openmp -$(eval $(generic-package)) - include $(sort $(wildcard package/fftw/*/*.mk)) From patchwork Mon Jan 21 13:51:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gwenhael Goavec-Merou X-Patchwork-Id: 1028699 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 43jthg6rRnz9sCh for ; Tue, 22 Jan 2019 01:09:23 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id ED8D38508A; Mon, 21 Jan 2019 14:09:18 +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 J4PP7qhbSguk; Mon, 21 Jan 2019 14:09:13 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id A6207853FD; Mon, 21 Jan 2019 14:09:13 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 73D9E1BF3A4 for ; Mon, 21 Jan 2019 14:09:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 713BC850D6 for ; Mon, 21 Jan 2019 14:09:10 +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 JglzEph_egD5 for ; Mon, 21 Jan 2019 14:09:07 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail (kmf.trabucayre.com [91.121.117.161]) by fraxinus.osuosl.org (Postfix) with ESMTP id D90028508A for ; Mon, 21 Jan 2019 14:09:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by mail (Postfix) with ESMTP id C8F7839870; Mon, 21 Jan 2019 14:51:15 +0100 (CET) From: Gwenhael Goavec-Merou To: buildroot@busybox.net Date: Mon, 21 Jan 2019 14:51:11 +0100 Message-Id: <1548078671-63318-17-git-send-email-gwenj@trabucayre.com> X-Mailer: git-send-email 1.6.4.2 In-Reply-To: <1548078671-63318-16-git-send-email-gwenj@trabucayre.com> References: <1548078671-63318-1-git-send-email-gwenj@trabucayre.com> <1548078671-63318-2-git-send-email-gwenj@trabucayre.com> <1548078671-63318-3-git-send-email-gwenj@trabucayre.com> <1548078671-63318-4-git-send-email-gwenj@trabucayre.com> <1548078671-63318-5-git-send-email-gwenj@trabucayre.com> <1548078671-63318-6-git-send-email-gwenj@trabucayre.com> <1548078671-63318-7-git-send-email-gwenj@trabucayre.com> <1548078671-63318-8-git-send-email-gwenj@trabucayre.com> <1548078671-63318-9-git-send-email-gwenj@trabucayre.com> <1548078671-63318-10-git-send-email-gwenj@trabucayre.com> <1548078671-63318-11-git-send-email-gwenj@trabucayre.com> <1548078671-63318-12-git-send-email-gwenj@trabucayre.com> <1548078671-63318-13-git-send-email-gwenj@trabucayre.com> <1548078671-63318-14-git-send-email-gwenj@trabucayre.com> <1548078671-63318-15-git-send-email-gwenj@trabucayre.com> <1548078671-63318-16-git-send-email-gwenj@trabucayre.com> Subject: [Buildroot] [PATCH v4 17/17] package/liquid-dsp: drop support for fftw-double and fftw-long-double 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: Thomas Petazzoni , Gwenhael Goavec-Merou , "Yann E. MORIN" , Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Thomas Petazzoni From: Thomas Petazzoni liquid-dsp has the following code: #if HAVE_FFTW3_H && !defined LIQUID_FFTOVERRIDE # include # define FFT_PLAN fftwf_plan # define FFT_CREATE_PLAN fftwf_plan_dft_1d # define FFT_DESTROY_PLAN fftwf_destroy_plan # define FFT_EXECUTE fftwf_execute # define FFT_DIR_FORWARD FFTW_FORWARD # define FFT_DIR_BACKWARD FFTW_BACKWARD # define FFT_METHOD FFTW_ESTIMATE #else # define FFT_PLAN fftplan # define FFT_CREATE_PLAN fft_create_plan # define FFT_DESTROY_PLAN fft_destroy_plan # define FFT_EXECUTE fft_execute # define FFT_DIR_FORWARD LIQUID_FFT_FORWARD # define FFT_DIR_BACKWARD LIQUID_FFT_BACKWARD # define FFT_METHOD 0 #endif So, if it uses the external fftw library, it can only use the fftwf variant, i.e the fftw-single variant. Otherwise, it uses its internal FFT library. There is no way for liquid-dsp to use fftw-double or fftw-long-double. Signed-off-by: Thomas Petazzoni Signed-off-by: Gwenhael Goavec-Merou --- package/liquid-dsp/liquid-dsp.mk | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/package/liquid-dsp/liquid-dsp.mk b/package/liquid-dsp/liquid-dsp.mk index 6aa27a5248..64c403e87f 100644 --- a/package/liquid-dsp/liquid-dsp.mk +++ b/package/liquid-dsp/liquid-dsp.mk @@ -40,16 +40,6 @@ ifeq ($(BR2_powerpc)$(BR2_powerpc64)$(BR2_powerpc64le),y) LIQUID_DSP_CONF_OPTS += --enable-simdoverride endif -ifeq ($(BR2_PACKAGE_FFTW_DOUBLE),y) -LIQUID_DSP_LDFLAGS += -lfftw3 -LIQUID_DSP_DEPENDENCIES += fftw-double -endif - -ifeq ($(BR2_PACKAGE_FFTW_LONG_DOUBLE),y) -LIQUID_DSP_LDFLAGS += -lfftw3l -LIQUID_DSP_DEPENDENCIES += fftw-long-double -endif - LIQUID_DSP_CONF_OPTS += \ CFLAGS="$(LIQUID_DSP_CFLAGS)" \ LDFLAGS="$(LIQUID_DSP_LDFLAGS)"