git: 8ccc484526b0 - main - graphics/gegl: fix build on non-OpenMP platforms

From: Robert Clausecker <fuz_at_FreeBSD.org>
Date: Fri, 13 Jun 2025 15:41:56 UTC
The branch main has been updated by fuz:

URL: https://cgit.FreeBSD.org/ports/commit/?id=8ccc484526b042307cf8668884b4c8a6a8c7ea51

commit 8ccc484526b042307cf8668884b4c8a6a8c7ea51
Author:     Robert Clausecker <fuz@FreeBSD.org>
AuthorDate: 2025-06-11 11:06:15 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2025-06-13 15:41:17 +0000

    graphics/gegl: fix build on non-OpenMP platforms
    
    Previously, this was doubly worked around.  On armv7 by disabling
    OpenMP and in general by compiling with gcc.  Unfortunately, using
    gcc caused GeGL to fail at runtime with symbol errors like this one
    in games/toppler:
    
    GEGL-Message: 10:22:16.282: Module '/usr/local/lib/gegl-0.4/gegl-common-cxx.so' load error: /usr/local/lib/gegl-0.4/gegl-common-cxx.so: Undefined symbol "__aeabi_d2lz@GCC_3.5"
    GEGL operation missing!
    
    Avoid this problem by not using gcc and instead disabling OpenMP on all
    platforms.
    
    Approved by:    portmgr (build fix blanket)
    MFH:            2025Q2
---
 graphics/gegl/Makefile | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/graphics/gegl/Makefile b/graphics/gegl/Makefile
index c69520319531..b8bb13fa84b3 100644
--- a/graphics/gegl/Makefile
+++ b/graphics/gegl/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	gegl
 DISTVERSION=	0.4.58
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	GIMP
 
@@ -19,13 +19,8 @@ LIB_DEPENDS=	libbabl-0.1.so:x11/babl \
 		libnsgif.so:graphics/libnsgif \
 		libpng.so:graphics/png
 
-USES=		cpe gettext gnome jpeg localbase:ldflags meson pkgconfig shebangfix \
-		uniquefiles tar:xz
-.if exists(/usr/include/omp.h)
-USES+=		compiler:c++14-lang
-.else
-USES+=		compiler:gcc-c++11-lib
-.endif
+USES=		compiler:c++14-lang cpe gettext gnome jpeg localbase:ldflags \
+		meson pkgconfig shebangfix uniquefiles tar:xz
 USE_GNOME=	glib20 introspection:build
 USE_LDCONFIG=	yes
 
@@ -41,10 +36,10 @@ MESON_ARGS=	-Ddocs=false \
 		-Dmaxflow=disabled \
 		-Dmrg=disabled \
 		-Dpygobject=disabled \
-		-Dlua=disabled \
-		${MESON_ARGS_${ARCH}}
-MESON_ARGS_armv6=	-Dopenmp=disabled
-MESON_ARGS_armv7=	-Dopenmp=disabled
+		-Dlua=disabled
+.if !exists(/usr/include/omp.h)
+MESON_ARGS+=	-Dopenmp=disabled
+.endif
 
 GEGL_SHLIB=	0.457.1
 GEGL_VER=	0.4