git: 79d7fc53b463 - main - graphics/rawtherapee: Revert "drop USE_GCC..."

The branch main has been updated by mandree:

URL: https://cgit.FreeBSD.org/ports/commit/?id=79d7fc53b463b8175d366a1547926488f72fccd5

commit 79d7fc53b463b8175d366a1547926488f72fccd5
Author:     Matthias Andree <mandree@FreeBSD.org>
AuthorDate: 2023-11-10 01:38:29 +0000
Commit:     Matthias Andree <mandree@FreeBSD.org>
CommitDate: 2023-11-10 01:40:31 +0000

    graphics/rawtherapee: Revert "drop USE_GCC..."
    
    This reverts commit fff0cd6cf3ae5141f7f588e27b8e71839ee742be.
    Caused regressions on the build of too many FreeBSD versions, as
    Reported by:    pkg-fallout@
    MFH:            2023Q4
---
 graphics/rawtherapee/Makefile | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/graphics/rawtherapee/Makefile b/graphics/rawtherapee/Makefile
index b6c4b7731919..0a0525b52192 100644
--- a/graphics/rawtherapee/Makefile
+++ b/graphics/rawtherapee/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	rawtherapee
 PORTVERSION=	5.9
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	https://rawtherapee.com/shared/source/ \
 		LOCAL/mandree/
@@ -25,15 +25,27 @@ LIB_DEPENDS=	\
 		libsigc-2.0.so:devel/libsigc++20 \
 		libtiff.so:graphics/tiff
 
-USES=		cmake desktop-file-utils compiler:c++11-lang gnome \
+USES=		cmake desktop-file-utils compiler:gcc-c++11-lib gnome \
 		jpeg localbase:ldflags pkgconfig tar:xz
 
 # Binutils required for LTO (base ar/nm/ld/ranlib don't work)
 USE_BINUTILS=	yes
 
+# As of 2019-09-29, this port is known to be miscompiled by clang90
+# (SIGSEGV or SIBGUS).
+# So we shall stick to a modern GCC for now,
+# XXX FIXME note that rawtherapee is somewhat sensitive
+# versus compiler details so we may need to pin GCC 9.x
+# or a version range.
+USE_GCC=	yes
+
 USE_GNOME=	gtkmm30 librsvg2
 
-_LTO_FLAGS=	-flto=thin
+_LTO_FLAGS=	-flto=${MAKE_JOBS_NUMBER}
+# gcc needs -flto=${MAKE_JOBS_NUMBER} for parallel link (fixed in GCC 10?)
+#     and does not understand -flto=thin
+#
+# llvm/clang needs -flto=thin and will automatically parallelize the link
 
 # Fix <https://bugs.freebsd.org/251041>:
 # 11.x has binutils that don't accept a --plugin option,
@@ -52,8 +64,9 @@ CMAKE_ARGS+=	-DDOCDIR="${DOCSDIR}" \
 		-DDATADIR="${DATADIR}" \
 		-DCACHE_NAME_SUFFIX="" \
 		-Wno-dev \
+		-DCMAKE_AR:FILEPATH=${_AR} \
+		-DCMAKE_RANLIB:FILEPATH=${_RANLIB} \
 		-DCMAKE_POLICY_DEFAULT_CMP0056:STRING=NEW
-
 # 3.4.x: CMAKE_EXE_LINKER_FLAGS is not passed to TRY_COMPILE by default
 # any more. The CMP0056 policy must be explicitly set to NEW to ensure
 # linker flags are passed. Else -lomp is not found with clang.