From patchwork Fri Sep 18 17:21:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grzegorz Blach X-Patchwork-Id: 1367135 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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=blach.pl 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 4BtM4R0m0Jz9sSf for ; Sat, 19 Sep 2020 03:57:42 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 8DBE52E209; Fri, 18 Sep 2020 17:57:39 +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 x1w3e8pYD4fU; Fri, 18 Sep 2020 17:57:37 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 5EF5B2E233; Fri, 18 Sep 2020 17:57:37 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id A13B51BF322 for ; Fri, 18 Sep 2020 17:57:35 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 94B232E233 for ; Fri, 18 Sep 2020 17:57:35 +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 4-6SGG7rndzv for ; Fri, 18 Sep 2020 17:57:34 +0000 (UTC) X-Greylist: delayed 00:35:34 by SQLgrey-1.7.6 Received: from 5.mo69.mail-out.ovh.net (5.mo69.mail-out.ovh.net [46.105.43.105]) by silver.osuosl.org (Postfix) with ESMTPS id 363532E209 for ; Fri, 18 Sep 2020 17:57:34 +0000 (UTC) Received: from player760.ha.ovh.net (unknown [10.110.171.31]) by mo69.mail-out.ovh.net (Postfix) with ESMTP id A24949D93A for ; Fri, 18 Sep 2020 19:21:57 +0200 (CEST) Received: from blach.pl (unknown [91.239.251.84]) (Authenticated sender: grzegorz@blach.pl) by player760.ha.ovh.net (Postfix) with ESMTPSA id 714F5164F6F96; Fri, 18 Sep 2020 17:21:55 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-98R002643384ce-f90b-4fd9-9a60-acf3ae9894e5, F441C75F209D145E4F005A991A1B16FD3DCD1994) smtp.auth=grzegorz@blach.pl From: Grzegorz Blach To: buildroot@buildroot.org Date: Fri, 18 Sep 2020 19:21:32 +0200 Message-Id: <20200918172135.85009-1-grzegorz@blach.pl> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 X-Ovh-Tracer-Id: 17056257690244570782 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedujedrtdeigdduudefucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvffufffkofgggfestdekredtredttdenucfhrhhomhepifhriigvghhorhiiuceulhgrtghhuceoghhriigvghhorhiisegslhgrtghhrdhplheqnecuggftrfgrthhtvghrnhepjefgtefghfehvedvieffgfefledtudefieffhfdtueelfefhieevuedttdfhffdtnecukfhppedtrddtrddtrddtpdeluddrvdefledrvdehuddrkeegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmohguvgepshhmthhpqdhouhhtpdhhvghlohepphhlrgihvghrjeeitddrhhgrrdhovhhhrdhnvghtpdhinhgvtheptddrtddrtddrtddpmhgrihhlfhhrohhmpehgrhiivghgohhriiessghlrggthhdrphhlpdhrtghpthhtohepsghuihhlughrohhothessghuihhlughrohhothdrohhrgh Subject: [Buildroot] [PATCH 1/2] package/graphicsmagick: enable OpenMP when supported by toolchain 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: Grzegorz Blach Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Grzegorz Blach --- package/graphicsmagick/graphicsmagick.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/package/graphicsmagick/graphicsmagick.mk b/package/graphicsmagick/graphicsmagick.mk index da7af5b53e..ab00ee2c9e 100644 --- a/package/graphicsmagick/graphicsmagick.mk +++ b/package/graphicsmagick/graphicsmagick.mk @@ -21,7 +21,6 @@ GRAPHICSMAGICK_CONFIG_SCRIPTS += GraphicsMagick++-config endif GRAPHICSMAGICK_CONF_OPTS = \ - --disable-openmp \ --without-dps \ --without-fpx \ --without-jbig \ @@ -33,6 +32,12 @@ GRAPHICSMAGICK_CONF_OPTS = \ GRAPHICSMAGICK_DEPENDENCIES = host-pkgconf +ifeq ($(BR2_TOOLCHAIN_HAS_OPENMP),y) +GRAPHICSMAGICK_CONF_OPTS += --enable-openmp +else +GRAPHICSMAGICK_CONF_OPTS += --disable-openmp +endif + ifeq ($(BR2_PACKAGE_FREETYPE),y) GRAPHICSMAGICK_CONF_OPTS += --with-ttf GRAPHICSMAGICK_CONF_ENV += ac_cv_path_freetype_config=$(STAGING_DIR)/usr/bin/freetype-config From patchwork Fri Sep 18 17:21:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grzegorz Blach X-Patchwork-Id: 1367108 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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=blach.pl 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 4BtLHb0nBSz9sT5 for ; Sat, 19 Sep 2020 03:22:18 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 63732878A7; Fri, 18 Sep 2020 17:22: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 lgmbYWAqK0xy; Fri, 18 Sep 2020 17:22:14 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 73D6F87840; Fri, 18 Sep 2020 17:22:14 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id A27C41BF322 for ; Fri, 18 Sep 2020 17:22:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 94B5D2E233 for ; Fri, 18 Sep 2020 17:22:07 +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 HcncHyiB5TVX for ; Fri, 18 Sep 2020 17:22:06 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from 9.mo179.mail-out.ovh.net (9.mo179.mail-out.ovh.net [46.105.76.148]) by silver.osuosl.org (Postfix) with ESMTPS id 431B12048D for ; Fri, 18 Sep 2020 17:22:06 +0000 (UTC) Received: from player760.ha.ovh.net (unknown [10.110.115.113]) by mo179.mail-out.ovh.net (Postfix) with ESMTP id A9896176CF0 for ; Fri, 18 Sep 2020 19:22:03 +0200 (CEST) Received: from blach.pl (unknown [91.239.251.84]) (Authenticated sender: grzegorz@blach.pl) by player760.ha.ovh.net (Postfix) with ESMTPSA id F1CBA164F6FF4; Fri, 18 Sep 2020 17:22:00 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-98R002a97fbc5e-053e-474c-a812-a5df9d55d543, F441C75F209D145E4F005A991A1B16FD3DCD1994) smtp.auth=grzegorz@blach.pl From: Grzegorz Blach To: buildroot@buildroot.org Date: Fri, 18 Sep 2020 19:21:33 +0200 Message-Id: <20200918172135.85009-2-grzegorz@blach.pl> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200918172135.85009-1-grzegorz@blach.pl> References: <20200918172135.85009-1-grzegorz@blach.pl> MIME-Version: 1.0 X-Ovh-Tracer-Id: 17058228016191856286 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedujedrtdeigdduudefucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomhepifhriigvghhorhiiuceulhgrtghhuceoghhriigvghhorhiisegslhgrtghhrdhplheqnecuggftrfgrthhtvghrnhepffeuveekueeugfejjeeludffhfetffetgeduffejveeivdeuleetueejkeehgfeknecukfhppedtrddtrddtrddtpdeluddrvdefledrvdehuddrkeegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmohguvgepshhmthhpqdhouhhtpdhhvghlohepphhlrgihvghrjeeitddrhhgrrdhovhhhrdhnvghtpdhinhgvtheptddrtddrtddrtddpmhgrihhlfhhrohhmpehgrhiivghgohhriiessghlrggthhdrphhlpdhrtghpthhtohepsghuihhlughrohhothessghuihhlughrohhothdrohhrgh Subject: [Buildroot] [PATCH 2/2] package/graphicsmagick: remove redundant BR2_USE_WCHAR condition 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: Grzegorz Blach Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Grzegorz Blach --- package/graphicsmagick/graphicsmagick.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/graphicsmagick/graphicsmagick.mk b/package/graphicsmagick/graphicsmagick.mk index ab00ee2c9e..7e71870482 100644 --- a/package/graphicsmagick/graphicsmagick.mk +++ b/package/graphicsmagick/graphicsmagick.mk @@ -16,7 +16,7 @@ GRAPHICSMAGICK_CONFIG_SCRIPTS = GraphicsMagick-config GraphicsMagickWand-config # 0001-MNG-Fix-small-heap-overwrite-or-assertion.patch GRAPHICSMAGICK_IGNORE_CVES += CVE-2020-12672 -ifeq ($(BR2_INSTALL_LIBSTDCPP)$(BR2_USE_WCHAR),yy) +ifeq ($(BR2_INSTALL_LIBSTDCPP),y) GRAPHICSMAGICK_CONFIG_SCRIPTS += GraphicsMagick++-config endif