From 4c2c719b27107d0d18901b0a6ffd74e6aaf91383 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Thu, 28 Jan 2021 01:17:40 -0300 Subject: [PATCH 1/9] meson: update to 0.56.2. Fix checkdepends and tests in general on musl. Add bash completions. --- srcpkgs/meson/patches/fix-unittest.patch | 77 ++++++++++++++++++++++++ srcpkgs/meson/template | 29 ++++++--- 2 files changed, 99 insertions(+), 7 deletions(-) create mode 100644 srcpkgs/meson/patches/fix-unittest.patch diff --git a/srcpkgs/meson/patches/fix-unittest.patch b/srcpkgs/meson/patches/fix-unittest.patch new file mode 100644 index 00000000000..746de056ed7 --- /dev/null +++ b/srcpkgs/meson/patches/fix-unittest.patch @@ -0,0 +1,77 @@ +commit 777cbe9c0faa018bafccf3e7adb8dad162276e35 +Author: Érico Rolim +Date: Mon Feb 1 00:26:49 2021 -0300 + + tests/common: fix " 37 has function" test on musl systems. + + This commit fixes the test that asserts on whether the lchmod() function + should have been detected as available by Meson. It does so by assuming + that on Linux systems not using glibc, the function will be available. + + - fix comment about lchmod on Linux: musl has implemented the function + correctly since 2013, so the assumption in the test wasn't correct. + Furthermore, musl doesn't use glibc's stub mechanism. + - fix include to receive __GLIBC__ definition: including almost any + header in glibc will end up defining __GLIBC__, since most headers + include . The header was probably + chosen because of its name, but its actual purpose is defining functions + for checking glibc version at runtime (instead of what the binary was + built with), so it isn't necessary to use it. Since it is a completely + non standard header, including it makes the test suite fail on musl due + to not finding the header. + +diff --git test cases/common/37 has function/meson.build test cases/common/37 has function/meson.build +index 26f13d6fa..a59480c2d 100644 +--- test cases/common/39 has function/meson.build ++++ test cases/common/39 has function/meson.build +@@ -44,11 +44,13 @@ foreach cc : compilers + error('Found non-existent function "hfkerhisadf".') + endif + +- # With glibc on Linux lchmod is a stub that will always return an error, +- # we want to detect that and declare that the function is not available. +- # We can't check for the C library used here of course, but if it's not +- # implemented in glibc it's probably not implemented in any other 'slimmer' +- # C library variants either, so the check should be safe either way hopefully. ++ # With glibc (before 2.32, see below) on Linux, lchmod is a stub that will ++ # always return an error, we want to detect that and declare that the ++ # function is not available. ++ # We can't check for the C library used here of course, but the main ++ # alternative Linux C library (musl) doesn't use glibc's stub mechanism; ++ # also, it has implemented lchmod since 2013, so it should be safe to check ++ # that lchmod is available on Linux when not using glibc. + if host_system == 'linux' or host_system == 'darwin' + assert (cc.has_function('poll', prefix : '#include ', + args : unit_test_args), +@@ -57,15 +59,24 @@ foreach cc : compilers + has_lchmod = cc.has_function('lchmod', prefix : lchmod_prefix, args : unit_test_args) + + if host_system == 'linux' +- glibc_major = cc.get_define('__GLIBC__', prefix: '#include ', args: unit_test_args) +- glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include ', args: unit_test_args) +- glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor) +- message('GLIBC vetsion:', glibc_vers) ++ # __GLIBC__ macro can be retrieved by including almost any C library header ++ glibc_major = cc.get_define('__GLIBC__', prefix: '#include ', args: unit_test_args) ++ # __GLIBC__ will only be set for glibc ++ if glibc_major != '' ++ glibc_print = 'hi "@0@" hi'.format(glibc_major) ++ message(glibc_print) ++ glibc_minor = cc.get_define('__GLIBC_MINOR__', prefix: '#include ', args: unit_test_args) ++ glibc_vers = '@0@.@1@'.format(glibc_major, glibc_minor) ++ message('GLIBC version:', glibc_vers) + +- # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html) +- if glibc_vers.version_compare('<2.32') +- assert (not has_lchmod, '"lchmod" check should have failed') ++ # lchmod was implemented in glibc 2.32 (https://sourceware.org/pipermail/libc-announce/2020/000029.html) ++ if glibc_vers.version_compare('<2.32') ++ assert (not has_lchmod, '"lchmod" check should have failed') ++ else ++ assert (has_lchmod, '"lchmod" check should have succeeded') ++ endif + else ++ # Other C libraries for Linux should have lchmod + assert (has_lchmod, '"lchmod" check should have succeeded') + endif + else diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template index 9a1afce0cfc..64a12e6d7a9 100644 --- a/srcpkgs/meson/template +++ b/srcpkgs/meson/template @@ -1,20 +1,33 @@ # Template file for 'meson' pkgname=meson -version=0.55.3 -revision=3 +version=0.56.2 +revision=1 build_style=python3-module hostmakedepends="python3-devel python3-setuptools" depends="ninja python3-setuptools" -checkdepends="glib-devel gobject-introspection libsanitizer-devel ninja +checkdepends="glib-devel gobject-introspection ninja gcc-objc++ clang qt5-devel cmake llvm git pkg-config vala python-devel cross-arm-linux-gnueabihf" short_desc="Super fast build system" maintainer="John " license="Apache-2.0" homepage="https://mesonbuild.com" -changelog="https://github.com/mesonbuild/$pkgname/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md" -distfiles="https://github.com/mesonbuild/$pkgname/releases/download/$version/$pkgname-$version.tar.gz" -checksum=6bed2a25a128bbabe97cf40f63165ebe800e4fcb46db8ab7ef5c2b5789f092a5 +changelog="https://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md" +distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz" +checksum=3cb8bdb91383f7f8da642f916e4c44066a29262caa499341e2880f010edb87f4 + +# XXX: sanitizers aren't available on musl +if [ "$XBPS_TARGET_LIBC" = glibc ]; then + checkdepends+=" libsanitizer-devel" +fi + +post_patch() { + if [ "$XBPS_TARGET_LIBC" = musl ]; then + vsed -e 's/test_pch_with_address_sanitizer/_&/' \ + -e 's/test_generate_gir_with_address_sanitizer/_&/' \ + -i run_unittests.py + fi +} do_check() { # meson depends on trillion of things to perform actual tests @@ -35,5 +48,7 @@ post_install() { done vinstall data/syntax-highlighting/emacs/meson.el 644 usr/share/emacs/site-lisp - vinstall data/shell-completions/zsh/_meson 644 usr/share/zsh/site-functions + + vcompletion data/shell-completions/bash/meson bash + vcompletion data/shell-completions/zsh/_meson zsh } From 582e1b30f30796ee3d292361eba767330e0653fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Tue, 2 Feb 2021 17:20:22 -0300 Subject: [PATCH 2/9] kanshi: add patch to fix ndebug build. Caught by new warnings enabled by meson update. --- srcpkgs/kanshi/patches/assert.patch | 37 +++++++++++++++++++++++++++++ srcpkgs/kanshi/template | 2 +- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/kanshi/patches/assert.patch diff --git a/srcpkgs/kanshi/patches/assert.patch b/srcpkgs/kanshi/patches/assert.patch new file mode 100644 index 00000000000..90e8e3c7bab --- /dev/null +++ b/srcpkgs/kanshi/patches/assert.patch @@ -0,0 +1,37 @@ +commit 5ff7fad0a8391c0c3ef87f48e34e4e65c584d000 +Author: Érico Rolim +Date: Tue Feb 2 17:18:42 2021 -0300 + + parser: use abort() instead of assert(0). + + assert(0) has no effect on NDEBUG builds, and means the program will + continue running in an unexpected state. + +diff --git parser.c parser.c +index 40146e8..0ed1ba1 100644 +--- parser.c ++++ parser.c +@@ -1,5 +1,4 @@ + #define _POSIX_C_SOURCE 200809L +-#include + #include + #include + #include +@@ -24,7 +23,7 @@ static const char *token_type_str(enum kanshi_token_type t) { + case KANSHI_TOKEN_NEWLINE: + return "newline"; + } +- assert(0); ++ abort(); + } + + static int parser_read_char(struct kanshi_parser *parser) { +@@ -333,7 +332,7 @@ static struct kanshi_profile_output *parse_profile_output( + } + break; + default: +- assert(0); ++ abort(); + } + has_key = false; + output->fields |= key; diff --git a/srcpkgs/kanshi/template b/srcpkgs/kanshi/template index fbef9a7e59b..e6fe40f4a69 100644 --- a/srcpkgs/kanshi/template +++ b/srcpkgs/kanshi/template @@ -1,7 +1,7 @@ # Template file for 'kanshi' pkgname=kanshi version=1.1.0 -revision=1 +revision=2 build_style=meson hostmakedepends="pkg-config scdoc wayland-devel" makedepends="wayland-devel" From e383b2ebc18282a2e59f574d409d9d2209fe86f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Tue, 2 Feb 2021 18:05:10 -0300 Subject: [PATCH 3/9] wlroots: follow upstream recommendation for ndebug. Assertions in this case are desirable at runtime. Fix build for meson 0.56.x, since new warnings were added. --- srcpkgs/wlroots/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/wlroots/template b/srcpkgs/wlroots/template index a73b5f21a13..c17be9b303f 100644 --- a/srcpkgs/wlroots/template +++ b/srcpkgs/wlroots/template @@ -1,11 +1,11 @@ # Template file for 'wlroots' pkgname=wlroots version=0.12.0 -revision=1 +revision=2 build_style=meson configure_args="-Dlogind=disabled -Dlibseat=enabled -Dxcb-errors=enabled -Dxcb-icccm=enabled -Dxwayland=enabled - -Dx11-backend=enabled -Dexamples=false" + -Dx11-backend=enabled -Dexamples=false -Dwerror=false -Db_ndebug=false" hostmakedepends="pkg-config wayland-devel" _devel_depends="MesaLib-devel libseat-devel eudev-libudev-devel libdrm-devel libinput-devel libxkbcommon-devel pixman-devel wayland-devel wayland-protocols From 80078d72c6895e9c43c8824bccc867877974e668 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Tue, 2 Feb 2021 19:30:18 -0300 Subject: [PATCH 4/9] efl: don't build examples. Avoids wasting build time. Also gate tests, since they aren't working great yet. --- srcpkgs/efl/template | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template index a8b26fff25c..513cb4dfff4 100644 --- a/srcpkgs/efl/template +++ b/srcpkgs/efl/template @@ -4,6 +4,7 @@ version=1.24.4 revision=1 build_style=meson configure_args=" + -Dbuild-examples=false -Dembedded-lz4=false -Dcrypto=openssl -Dnetwork-backend=none @@ -46,6 +47,7 @@ makedepends=" $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if lottie rlottie-devel) $(vopt_if ibus ibus-devel)" +checkdepends="dbus xvfb-run" short_desc="Enlightenment Foundation Libraries" maintainer="q66 " license="LGPL-2.1-only" @@ -104,6 +106,13 @@ case "$XBPS_TARGET_MACHINE" in ;; esac +do_check() { + if [ "$XBPS_CHECK_PKGS" = full ]; then + # FIXME: tests fail in weird places + xvfb-run dbus-run-session ninja -C build test + fi +} + post_install() { # don't want service file junk rm -rf ${DESTDIR}/usr/lib/systemd From 9b3cc3bc2c679f14fcf7f3f10820fb0f7e54901d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Tue, 2 Feb 2021 17:04:39 -0300 Subject: [PATCH 5/9] seatd: fix build with meson 0.56.x. meson added some new warnings to the warning level used by seatd, including for unused arguments. This made the build generate warnings, and seatd's default of werror=true caused the build to fail. --- srcpkgs/seatd/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/seatd/template b/srcpkgs/seatd/template index d76d4d3a658..e6b6b387444 100644 --- a/srcpkgs/seatd/template +++ b/srcpkgs/seatd/template @@ -3,7 +3,7 @@ pkgname=seatd version=0.4.0 revision=1 build_style=meson -configure_args="-Dexamples=disabled $(vopt_if elogind -Dlogind=enabled)" +configure_args="-Dexamples=disabled $(vopt_if elogind -Dlogind=enabled) -Dwerror=false" hostmakedepends="pkg-config scdoc" makedepends="$(vopt_if elogind elogind-devel)" short_desc="Minimal seat management daemon" From ec7e382a233ca9fb3003158371c3be2d09508b4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Tue, 2 Feb 2021 19:42:48 -0300 Subject: [PATCH 6/9] mako: fix build with meson 0.56.x. --- srcpkgs/mako/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mako/template b/srcpkgs/mako/template index 299305acd78..18c18def196 100644 --- a/srcpkgs/mako/template +++ b/srcpkgs/mako/template @@ -3,7 +3,7 @@ pkgname=mako version=1.4.1 revision=1 build_style=meson -configure_args="-Dzsh-completions=true -Dapparmor=true" +configure_args="-Dzsh-completions=true -Dapparmor=true -Dwerror=false" hostmakedepends="pkg-config scdoc wayland-devel wayland-protocols" makedepends="wayland-devel wayland-protocols pango-devel cairo-devel elogind-devel gdk-pixbuf-devel" From e105835242fe028e0871e8d339a06d06a35a3cc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Tue, 2 Feb 2021 19:59:11 -0300 Subject: [PATCH 7/9] grim: fix build for meson 0.56.x. --- srcpkgs/grim/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/grim/template b/srcpkgs/grim/template index 896434db405..61844769456 100644 --- a/srcpkgs/grim/template +++ b/srcpkgs/grim/template @@ -3,7 +3,7 @@ pkgname=grim version=1.3.1 revision=1 build_style=meson -configure_args="-Djpeg=enabled" +configure_args="-Djpeg=enabled -Dwerror=false" hostmakedepends="pkg-config wayland-devel scdoc" makedepends="wayland-devel wayland-protocols cairo-devel libjpeg-turbo-devel" short_desc="Grab images from a Wayland compositor" From db76cea01cf7caf6cbea813febd2ca2b88ec0b49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Tue, 2 Feb 2021 20:40:19 -0300 Subject: [PATCH 8/9] swayidle: fix build with meson 0.56.x. --- srcpkgs/swayidle/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/swayidle/template b/srcpkgs/swayidle/template index b6f51f47927..e415051946a 100644 --- a/srcpkgs/swayidle/template +++ b/srcpkgs/swayidle/template @@ -3,7 +3,7 @@ pkgname=swayidle version=1.6 revision=1 build_style=meson -configure_args="-Dlogind-provider=elogind" +configure_args="-Dlogind-provider=elogind -Dwerror=false" hostmakedepends="pkg-config wayland-devel scdoc" makedepends="wayland-devel wayland-protocols elogind-devel" short_desc="Idle management daemon for Wayland" From 0e299c43d4b83a7e0e9fd23287c13667711fd0ac 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 9/9] 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() {