From 3078a6a912292119a150b868c6bb6cc25fbfed2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Tue, 2 Feb 2021 17:57:20 -0300 Subject: [PATCH] pixman: fix potential build errors with meson 0.56.x. I couldn't reproduce the errors, so this commit is not entirely necessary. It still works as a precaution. The below is slightly erroneous, since the issue didn't repeat itself. Apparently meson detects OpenMP as available on cross builds because it can find the omp.h header, even though the library seems to be available. For reference, what the configure output of a native build looks like: WARNING: OpenMP found but omp.h missing. Run-time dependency OpenMP found: NO --- srcpkgs/pixman/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/pixman/template b/srcpkgs/pixman/template index ca5bf9632b0..26c65462af6 100644 --- a/srcpkgs/pixman/template +++ b/srcpkgs/pixman/template @@ -20,7 +20,11 @@ LDFLAGS="-Wl,-z,stack-size=2097152" if [ "$XBPS_CHECK_PKGS" ]; then # libpng and openmp are used only for testing; the make-blue-noise.c file isn't built # https://gitlab.freedesktop.org/pixman/pixman/-/blob/9b49f4e08751885289333fed652bf5e0f45976b4/pixman/dither/make-blue-noise.c - configure_args+=" -Dlibpng=enabled -Dopenmp=enabled" + configure_args+=" -Dtests=enabled -Dlibpng=enabled -Dopenmp=enabled" +else + # dynamic libgomp is available only when running tests, better to disable explicitly. + # -Dtests will only take effect on the next release. + configure_args+=" -Dtests=disabled -Dopenmp=disabled" fi post_install() {