PKGBUILD/sway-hidpi
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use release builds, and run meson in build()

Browse Source 
meson/configure should be run in build() and not prepare(), as
CFLAGS/CXXFLAGS/etc. from makepkg.conf are not set in prepare().

This patch moves the meson run from build() -> prepare() so that the
flags from makepkg are included in the environment.
This commit is contained in:
Matt Coffin 2019-06-11 11:23:40 -06:00 committed by Drew DeVault
parent 4037cf2d5c
commit 3d34dd0d18
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
PKGBUILD
View File

@ -1,11 +1,11 @@
# Maintainer: Drew DeVault <sir@cmpwn.com> # Maintainer: Drew DeVault <sir@cmpwn.com>
pkgname=sway-git pkgname=sway-git
_pkgname=sway _pkgname=sway
pkgver=r5893.e6fbb3c6 pkgver=r5942.3f77591b
pkgrel=1 pkgrel=1
license=("MIT") license=("MIT")
pkgdesc="i3-compatible Wayland compositor" pkgdesc="i3-compatible Wayland compositor"
makedepends=("meson" "git" "scdoc" "wayland-protocols") makedepends=("meson" "git" "scdoc" "wayland-protocols" "ninja")
depends=( depends=(
"json-c" "pcre" "wlroots-git" "cairo" "pango" "gdk-pixbuf2" "pam" "json-c" "pcre" "wlroots-git" "cairo" "pango" "gdk-pixbuf2" "pam"
"xorg-server-xwayland" "swaybg-git" "xorg-server-xwayland" "swaybg-git"
@ -20,7 +20,7 @@ optdepends=(
arch=("i686" "x86_64") arch=("i686" "x86_64")
url="https://swaywm.org" url="https://swaywm.org"
source=("${pkgname%-*}::git+https://github.com/swaywm/sway.git") source=("${pkgname%-*}::git+https://github.com/swaywm/sway.git")
sha1sums=("SKIP") sha512sums=('SKIP')
provides=("sway") provides=("sway")
conflicts=("sway") conflicts=("sway")
options=(debug !strip) options=(debug !strip)
@ -32,11 +32,14 @@ pkgver() {
prepare() { prepare() {
cd "$_pkgname" cd "$_pkgname"
meson -Dwerror=false --prefix /usr "$srcdir/build"
} }
build() { build() {
cd "$_pkgname" cd "$_pkgname"
meson \
-Dwerror=false \
--prefix /usr \
"$srcdir/build"
ninja -C "$srcdir/build" ninja -C "$srcdir/build"
} }