Re: git: 3af2e89732ee - 2023Q3 - graphics/gegl: fix build on armv7
- In reply to: Robert Clausecker : "git: 3af2e89732ee - 2023Q3 - graphics/gegl: fix build on armv7"
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 31 Jul 2023 07:47:52 UTC
Wouldn't it be better to do it similarly to other ports?
.if !exists(/usr/include/omp.h)
MESON_ARGS+= -Dopenmp=disabled
.endif
This would also fix build on other OpenMP-less architectures and if a user on OpenMP-enabled architecture decides to build base with libomp.
On 23-07-30 23:02:11, Robert Clausecker wrote:
> The branch 2023Q3 has been updated by fuz:
>
> URL: https://cgit.FreeBSD.org/ports/commit/?id=3af2e89732ee15c2b8c39e8ec5a0f97ebc66635d
>
> commit 3af2e89732ee15c2b8c39e8ec5a0f97ebc66635d
> Author: Robert Clausecker <fuz@FreeBSD.org>
> AuthorDate: 2023-07-28 21:01:02 +0000
> Commit: Robert Clausecker <fuz@FreeBSD.org>
> CommitDate: 2023-07-30 23:01:42 +0000
>
> graphics/gegl: fix build on armv7
>
> OpenMP is not supported on armv7. Fix the build by disabling its use.
>
> Approved by: portmgr (build fix blanket)
> MFH: 2023Q3
>
> (cherry picked from commit 9e2602394b77661efe58bb191416048e3ca7c7c7)
> ---
> graphics/gegl/Makefile | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/graphics/gegl/Makefile b/graphics/gegl/Makefile
> index 6fbbd2446c43..9e1784ebd599 100644
> --- a/graphics/gegl/Makefile
> +++ b/graphics/gegl/Makefile
> @@ -33,7 +33,10 @@ MESON_ARGS= -Ddocs=false \
> -Dmaxflow=disabled \
> -Dmrg=disabled \
> -Dpygobject=disabled \
> - -Dlua=disabled
> + -Dlua=disabled \
> + ${MESON_ARGS_${ARCH}}
> +MESON_ARGS_armv6= -Dopenmp=disabled
> +MESON_ARGS_armv7= -Dopenmp=disabled
>
> GEGL_SHLIB= 0.443.1
> GEGL_VER= 0.4