jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

pixman: fix potential build errors with meson 0.56.x.

Browse source 
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
This commit is contained in:
Érico Rolim 2021-02-02 17:57:20 -03:00 committed by Érico Nogueira Rolim
parent 9234a99910
commit 3078a6a912
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
srcpkgs/pixman/template
View file

@ -20,7 +20,11 @@ LDFLAGS="-Wl,-z,stack-size=2097152"
if [ "$XBPS_CHECK_PKGS" ]; then if [ "$XBPS_CHECK_PKGS" ]; then
# libpng and openmp are used only for testing; the make-blue-noise.c file isn't built # 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 # 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 fi
post_install() { post_install() {