Date: Fri, 17 Jan 2025 09:00:01 GMT From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 01d3683c4417 - main - x11/pixman: Make OpenMP optional Message-ID: <202501170900.50H901fN062754@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by tijl: URL: https://cgit.FreeBSD.org/ports/commit/?id=01d3683c441704c1f2ed00c44a41ad94baf72a5b commit 01d3683c441704c1f2ed00c44a41ad94baf72a5b Author: Tijl Coosemans <tijl@FreeBSD.org> AuthorDate: 2025-01-09 12:18:27 +0000 Commit: Tijl Coosemans <tijl@FreeBSD.org> CommitDate: 2025-01-17 08:58:19 +0000 x11/pixman: Make OpenMP optional OpenMP is not available when the base system has been built with WITHOUT_OPENMP in src.conf(5). PR: 283949 Reviewed by: manu --- x11/pixman/Makefile | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/x11/pixman/Makefile b/x11/pixman/Makefile index 80b8c0f070c0..ce937e01ad47 100644 --- a/x11/pixman/Makefile +++ b/x11/pixman/Makefile @@ -15,7 +15,13 @@ MESON_ARGS= -Dloongson-mmi=disabled \ -Dgtk=disabled \ -Ddemos=disabled -OPTIONS_DEFINE= TEST +OPTIONS_DEFINE= OPENMP TEST +OPTIONS_DEFAULT= OPENMP +OPTIONS_EXCLUDE_armv6= OPENMP +OPTIONS_EXCLUDE_armv7= OPENMP +OPTIONS_EXCLUDE_powerpc=OPENMP + +OPENMP_MESON_ENABLED= openmp TEST_LIB_DEPENDS= libpng.so:graphics/png TEST_MESON_ENABLED= libpng tests @@ -23,14 +29,12 @@ TEST_MESON_ENABLED= libpng tests .include <bsd.port.options.mk> .if ${ARCH} == armv6 -MESON_ARGS+= -Darm-simd=enabled \ - -Dopenmp=disabled +MESON_ARGS+= -Darm-simd=enabled .else MESON_ARGS+= -Darm-simd=disabled .endif .if ${ARCH} == armv7 -MESON_ARGS+= -Dneon=enabled \ - -Dopenmp=disabled +MESON_ARGS+= -Dneon=enabled .else MESON_ARGS+= -Dneon=disabled .endif @@ -58,9 +62,6 @@ MESON_ARGS+= -Dvmx=enabled .else MESON_ARGS+= -Dvmx=disabled .endif -.if ${ARCH} == powerpc -MESON_ARGS+= -Dopenmp=disabled -.endif .if ${ARCH} == riscv64 MESON_ARGS+= -Drvv=enabled .else
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202501170900.50H901fN062754>