Skip to contentSkip to conversation

package/graphicsmagick: enable OpenMP when supported by toolchain

PATCH New Grzegorz Blach 2 participants 7 messages Sep 18, 2020 – Sep 20, 2020

lore
Share & tools
lore
#0 lore raw

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

---
 package/graphicsmagick/graphicsmagick.mk | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
package/graphicsmagick/graphicsmagick.mk +6 -1
index da7af5b53e..ab00ee2c9e 100644
@@ -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
Signature · 1 line
2.28.0
#1 lore raw

PATCH 2/2 package/graphicsmagick: remove redundant BR2_USE_WCHAR condition

---
 package/graphicsmagick/graphicsmagick.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/graphicsmagick/graphicsmagick.mk +1 -1
index ab00ee2c9e..7e71870482 100644
@@ -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
 
Signature · 1 line
2.28.0
#2 lore raw

PATCH 2/2 package/graphicsmagick: remove redundant BR2_USE_WCHAR condition

Quoted 10 lines · On Fri, 18 Sep 2020 19:21:33 +0200 Grzegorz Blach <[email protected]> wrote:
---
 package/graphicsmagick/graphicsmagick.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/graphicsmagick/graphicsmagick.mk +0 -0
index ab00ee2c9e..7e71870482 100644

package/graphicsmagick/graphicsmagick.mk GRAPHICSMAGICK_CONFIG_SCRIPTS = GraphicsMagick-config GraphicsMagickWand-config · line 19

Quoted 5 lines
package/graphicsmagick/graphicsmagick.mk +1 -1
@@ -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

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#3 lore raw

PATCH 2/2 package/graphicsmagick: remove redundant BR2_USE_WCHAR condition

Quoted 16 lines · Thomas Petazzoni
Quoted 13 lines · On Fri, 18 Sep 2020 19:21:33 +0200 Grzegorz Blach <[email protected]> wrote:
---
  package/graphicsmagick/graphicsmagick.mk | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
package/graphicsmagick/graphicsmagick.mk +0 -0
index ab00ee2c9e..7e71870482 100644
@@ -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
 
Quoted 5 lines

package/graphicsmagick/graphicsmagick.mk GRAPHICSMAGICK_CONFIG_SCRIPTS = GraphicsMagick-config GraphicsMagickWand-config · line 19

Quoted 2 lines
package/graphicsmagick/graphicsmagick.mk +1 -1
-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.

Quoted 4 lines

Thanks!

Thomas

#4 lore raw

PATCH 2/2 package/graphicsmagick: remove redundant BR2_USE_WCHAR condition

Hello,

Quoted 5 lines · On Sun, 20 Sep 2020 11:18:52 +0200 Grzegorz Blach <[email protected]> wrote:
Quoted 2 lines

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 <[email protected]>
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/

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

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#5 lore raw

PATCH 2/2 package/graphicsmagick: remove redundant BR2_USE_WCHAR condition

Quoted 29 lines · Thomas Petazzoni

Hello,

Quoted 5 lines · On Sun, 20 Sep 2020 11:18:52 +0200 Grzegorz Blach <[email protected]> wrote:
Quoted 2 lines

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 <[email protected]>
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/

Quoted 6 lines

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.

Quoted 4 lines

Thanks!

Thomas

#6 lore raw

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

In reply to Grzegorz Blach
Quoted 4 lines · On Fri, 18 Sep 2020 19:21:32 +0200 Grzegorz Blach <[email protected]> wrote:
---
 package/graphicsmagick/graphicsmagick.mk | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com