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