summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntonin Décimo2022-01-29 13:13:33 +0100
committerAntonin Décimo2022-01-29 13:13:33 +0100
commit5f08842925175d4bd152dba3784fd1dc7c653811 (patch)
treeb650e7853ca5edad304420384620a898014c202c
parentd54e6557b54615d3c2211e4576159342fec485eb (diff)
downloadaur-5f08842925175d4bd152dba3784fd1dc7c653811.tar.gz
Fix debug package by running meson setup twice
Inspired by @yrlf patch. Thanks to @yrlf, @Scrumplex, @FreeFull for explanations.
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD18
2 files changed, 14 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b92fbdebb66f..f049594db821 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = wlroots-git
pkgdesc = Modular Wayland compositor library (git version)
- pkgver = 0.16.0.r5320.6cdf843a
+ pkgver = 0.16.0.r5339.2c59435e
pkgrel = 1
url = https://gitlab.freedesktop.org/wlroots/wlroots
arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 1535646483d0..5a160a3862b8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Adrian Perez de Castro <aperez@igalia.com>
# Maintainer: Antonin Décimo <antonin dot decimo at gmail dot com>
pkgname=wlroots-git
-pkgver=0.16.0.r5320.6cdf843a
+pkgver=0.16.0.r5339.2c59435e
pkgrel=1
license=(custom:MIT)
pkgdesc='Modular Wayland compositor library (git version)'
@@ -34,18 +34,25 @@ makedepends=(
source=("${pkgname}::git+${url}.git")
md5sums=('SKIP')
-prepare () {
+_builddir="build"
+_builddir_pkgver="build-pkgver"
+
+_meson_setup () {
arch-meson \
--buildtype=debug \
-Dwerror=false \
-Dexamples=false \
- "${pkgname}" build
+ "${pkgname}" "$1"
+}
+
+prepare () {
+ _meson_setup "${_builddir_pkgver}"
}
pkgver () {
(
set -o pipefail
- meson introspect --projectinfo build \
+ meson introspect --projectinfo "${_builddir_pkgver}" \
| awk 'match($0, /"version":\s*"([[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+)"/, ret) {printf "%s",ret[1]}'
)
cd "${pkgname}"
@@ -53,7 +60,8 @@ pkgver () {
}
build () {
- meson compile -C build
+ _meson_setup "${_builddir}"
+ meson compile -C "${_builddir}"
}
package () {