[Buildroot] [PATCH 1/2] package/graphicsmagick: enable OpenMP when supported by toolchain

[Buildroot] [PATCH 1/2] package/graphicsmagick: enable OpenMP when supported by toolchain

[Grzegorz Blach]

Signed-off-by: Grzegorz Blach <grzegorz@blach.pl>
---
 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
-- 
2.28.0

[Buildroot] [PATCH 2/2] package/graphicsmagick: remove redundant BR2_USE_WCHAR condition

[Grzegorz Blach]

Signed-off-by: Grzegorz Blach <grzegorz@blach.pl>
---
 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
 
-- 
2.28.0

[Buildroot] [PATCH 2/2] package/graphicsmagick: remove redundant BR2_USE_WCHAR condition

[Thomas Petazzoni]

On Fri, 18 Sep 2020 19:21:33 +0200
Grzegorz Blach <grzegorz@blach.pl> wrote:

> Signed-off-by: Grzegorz Blach <grzegorz@blach.pl>
> ---
>  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)

In what sense is the BR2_USE_WCHAR dependency redundant ? Redundant
with what ?

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH 1/2] package/graphicsmagick: enable OpenMP when supported by toolchain

[Thomas Petazzoni]

On Fri, 18 Sep 2020 19:21:32 +0200
Grzegorz Blach <grzegorz@blach.pl> wrote:

> Signed-off-by: Grzegorz Blach <grzegorz@blach.pl>
> ---
>  package/graphicsmagick/graphicsmagick.mk | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH 2/2] package/graphicsmagick: remove redundant BR2_USE_WCHAR condition

[Grzegorz Blach]

On 19/09/2020 14:33, Thomas Petazzoni wrote:
> On Fri, 18 Sep 2020 19:21:33 +0200
> Grzegorz Blach <grzegorz@blach.pl> wrote:
> 
>> Signed-off-by: Grzegorz Blach <grzegorz@blach.pl>
>> ---
>>   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)
> 
> In what sense is the BR2_USE_WCHAR dependency redundant ? Redundant
> with what ?

I mean that graphicsmagick supports C++ whenever WCHAR is enabled or 
not.  So BR2_INSTALL_LIBSTDCPP should be the only condition on this line.


> Thanks!
> 
> Thomas
> 

[Buildroot] [PATCH 2/2] package/graphicsmagick: remove redundant BR2_USE_WCHAR condition

[Thomas Petazzoni]

Hello,

On Sun, 20 Sep 2020 11:18:52 +0200
Grzegorz Blach <grzegorz@blach.pl> wrote:

> > In what sense is the BR2_USE_WCHAR dependency redundant ? Redundant
> > with what ?  
> 
> I mean that graphicsmagick supports C++ whenever WCHAR is enabled or 
> not.

Are you sure about this ? graphicsmagick.mk is copy/pasted from
imagemagick.mk, and in imagemagick.mk, this BR2_USE_WCHAR also exists,
and was explicitly added by:

commit b339bb5641c59ad2e19aeb95c1387584c7c2aeab
Author: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date:   Mon Aug 12 09:06:58 2013 -0300

    imagemagick: fix magick++-config fixup error
    
    Magic++ bindings are built only with C++ and WCHAR toolchains.
    Add a WCHAR toolchain check for the magick++ config fixup.
    Looking into the future the fixup shouldn't bail on a missing file so we
    can avoid awkward kludges for packages that have many options and config
    files.
    Fixes:
    http://autobuild.buildroot.net/results/33a/33ac4b17866a64379b7bab3c0549f6e075c98dde/
    
    Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
    Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

Of course, perhaps graphicsmagick is different. Have you done a test
build with C++ support enabled, but wchar disabled, and confirmed that
Magick++-config was there ?

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH 2/2] package/graphicsmagick: remove redundant BR2_USE_WCHAR condition

[Grzegorz Blach]

On 20/09/2020 13:49, Thomas Petazzoni wrote:
> Hello,
> 
> On Sun, 20 Sep 2020 11:18:52 +0200
> Grzegorz Blach <grzegorz@blach.pl> wrote:
> 
>>> In what sense is the BR2_USE_WCHAR dependency redundant ? Redundant
>>> with what ?
>>
>> I mean that graphicsmagick supports C++ whenever WCHAR is enabled or
>> not.
> 
> Are you sure about this ? graphicsmagick.mk is copy/pasted from
> imagemagick.mk, and in imagemagick.mk, this BR2_USE_WCHAR also exists,
> and was explicitly added by:
> 
> commit b339bb5641c59ad2e19aeb95c1387584c7c2aeab
> Author: Gustavo Zacarias <gustavo@zacarias.com.ar>
> Date:   Mon Aug 12 09:06:58 2013 -0300
> 
>      imagemagick: fix magick++-config fixup error
>      
>      Magic++ bindings are built only with C++ and WCHAR toolchains.
>      Add a WCHAR toolchain check for the magick++ config fixup.
>      Looking into the future the fixup shouldn't bail on a missing file so we
>      can avoid awkward kludges for packages that have many options and config
>      files.
>      Fixes:
>      http://autobuild.buildroot.net/results/33a/33ac4b17866a64379b7bab3c0549f6e075c98dde/
>      
>      Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
>      Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> 
> Of course, perhaps graphicsmagick is different. Have you done a test
> build with C++ support enabled, but wchar disabled, and confirmed that
> Magick++-config was there ?

Yes, I've done this test and GraphicsMagick++-config exists.

Also I am sure that 
https://github.com/hzeller/rpi-rgb-led-matrix/blob/master/utils/led-image-viewer.cc 
works correctly with WCHAR disabled.

> Thanks!
> 
> Thomas
>