[pkgsrc/trunk]: pkgsrc/graphics/gmic Needs bash. Don't force LTO. Ask compile...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4d13c62c9341
branches:  trunk
changeset: 432860:4d13c62c9341
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue May 26 11:28:04 2020 +0000

description:
Needs bash. Don't force LTO. Ask compiler for OpenMP implementation.

diffstat:

 graphics/gmic/Makefile                           |   4 ++--
 graphics/gmic/distinfo                           |   5 +++--
 graphics/gmic/patches/patch-gmic-qt_gmic__qt.pro |  17 +++++++++++++++++
 graphics/gmic/patches/patch-src_Makefile         |  11 ++++++++++-
 4 files changed, 32 insertions(+), 5 deletions(-)

diffs (77 lines):

diff -r 1b00e4b83cb7 -r 4d13c62c9341 graphics/gmic/Makefile
--- a/graphics/gmic/Makefile    Tue May 26 11:27:21 2020 +0000
+++ b/graphics/gmic/Makefile    Tue May 26 11:28:04 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2020/05/23 10:44:02 ryoon Exp $
+# $NetBSD: Makefile,v 1.20 2020/05/26 11:28:04 joerg Exp $
 
 DISTNAME=      gmic_2.9.0
 PKGNAME=       ${DISTNAME:S/_/-/}
@@ -13,7 +13,7 @@
 WRKSRC=                ${WRKDIR}/${PKGNAME_NOREV}
 BUILD_DIRS=    src
 USE_LANGUAGES= c c++11
-USE_TOOLS+=    gmake pkg-config
+USE_TOOLS+=    gmake pkg-config bash
 MAKE_FLAGS+=   USR=${PREFIX}
 MAKE_FLAGS+=   QMAKE=${QTDIR}/bin/qmake
 BUILD_TARGET=  cli gimp lib zart
diff -r 1b00e4b83cb7 -r 4d13c62c9341 graphics/gmic/distinfo
--- a/graphics/gmic/distinfo    Tue May 26 11:27:21 2020 +0000
+++ b/graphics/gmic/distinfo    Tue May 26 11:28:04 2020 +0000
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.7 2020/05/23 10:44:02 ryoon Exp $
+$NetBSD: distinfo,v 1.8 2020/05/26 11:28:04 joerg Exp $
 
 SHA1 (gmic_2.9.0.tar.gz) = f1c4dd0c58548828fe57ca6685b384ae086f45bf
 RMD160 (gmic_2.9.0.tar.gz) = f5e250c3043f811c76a74d60513a979ed09679b0
 SHA512 (gmic_2.9.0.tar.gz) = 3b3703520998e5ad547316683158d7b60541a8cea2a7c1e7118f8de88492e0961bf1fe1da360dfb26d0ba7eaf997e7005a864364297db2bb405d532dedc4241d
 Size (gmic_2.9.0.tar.gz) = 6195597 bytes
-SHA1 (patch-src_Makefile) = fc114d8b68691dadfa787bc06107460d1326dbb8
+SHA1 (patch-gmic-qt_gmic__qt.pro) = 9fb32f44c13f743a0d6624bd24a0dac331f677b5
+SHA1 (patch-src_Makefile) = 13e8c73c84d504311cff1eb8248c1359a642ee83
 SHA1 (patch-src_gmic.cpp) = f74d2f444b9b8121fce5aa14e3266a88bf749da1
diff -r 1b00e4b83cb7 -r 4d13c62c9341 graphics/gmic/patches/patch-gmic-qt_gmic__qt.pro
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/gmic/patches/patch-gmic-qt_gmic__qt.pro  Tue May 26 11:28:04 2020 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-gmic-qt_gmic__qt.pro,v 1.1 2020/05/26 11:28:04 joerg Exp $
+
+--- gmic-qt/gmic_qt.pro.orig   2020-05-26 01:42:41.240133823 +0000
++++ gmic-qt/gmic_qt.pro
+@@ -227,12 +227,6 @@ win32:equals(LTO,"on") {
+     LTO = off
+ }
+ 
+-!win32:CONFIG(release, debug|release):gcc|clang:equals(LTO,"on") {
+-    message("Link Time Optimizer enabled")
+-    QMAKE_CXXFLAGS_RELEASE += -flto
+-    QMAKE_LFLAGS_RELEASE += -flto
+-}
+-
+ DEFINES += gmic_gui gmic_build gmic_is_parallel cimg_use_abort
+ 
+ INCLUDEPATH   += $$PWD $$PWD/src $$GMIC_PATH
diff -r 1b00e4b83cb7 -r 4d13c62c9341 graphics/gmic/patches/patch-src_Makefile
--- a/graphics/gmic/patches/patch-src_Makefile  Tue May 26 11:27:21 2020 +0000
+++ b/graphics/gmic/patches/patch-src_Makefile  Tue May 26 11:28:04 2020 +0000
@@ -1,9 +1,18 @@
-$NetBSD: patch-src_Makefile,v 1.5 2020/05/23 10:44:02 ryoon Exp $
+$NetBSD: patch-src_Makefile,v 1.6 2020/05/26 11:28:04 joerg Exp $
 
 * Install man pages for pkgsrc.
 
 --- src/Makefile.orig  2020-03-28 13:25:12.000000000 +0000
 +++ src/Makefile
+@@ -212,7 +212,7 @@ endif
+ # Enable parallelization in CImg, using OpenMP.
+ # (http://www.openmp.org/)
+ OPENMP_CFLAGS = -fopenmp -Dcimg_use_openmp
+-OPENMP_LIBS = -lgomp
++OPENMP_LIBS = -fopenmp
+ 
+ # Enable software debugging.
+ # (Use address sanitizer and thus slows down the code)
 @@ -727,12 +727,12 @@ ifneq ($(OS),Darwin)
            ln -fs libcgmic.so.$(VERSION1) $(DESTDIR)$(USR)/$(LIB)/libcgmic.so; \
          fi