From 3d34dd0d18b01dd8d5e067d19849a4c9549c7818 Mon Sep 17 00:00:00 2001 From: Matt Coffin Date: Tue, 11 Jun 2019 11:23:40 -0600 Subject: [PATCH] Use release builds, and run meson in build() 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. --- PKGBUILD | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index aa24b75..a4665bb 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,11 +1,11 @@ # Maintainer: Drew DeVault pkgname=sway-git _pkgname=sway -pkgver=r5893.e6fbb3c6 +pkgver=r5942.3f77591b pkgrel=1 license=("MIT") pkgdesc="i3-compatible Wayland compositor" -makedepends=("meson" "git" "scdoc" "wayland-protocols") +makedepends=("meson" "git" "scdoc" "wayland-protocols" "ninja") depends=( "json-c" "pcre" "wlroots-git" "cairo" "pango" "gdk-pixbuf2" "pam" "xorg-server-xwayland" "swaybg-git" @@ -20,7 +20,7 @@ optdepends=( arch=("i686" "x86_64") url="https://swaywm.org" source=("${pkgname%-*}::git+https://github.com/swaywm/sway.git") -sha1sums=("SKIP") +sha512sums=('SKIP') provides=("sway") conflicts=("sway") options=(debug !strip) @@ -32,11 +32,14 @@ pkgver() { prepare() { cd "$_pkgname" - meson -Dwerror=false --prefix /usr "$srcdir/build" } build() { cd "$_pkgname" + meson \ + -Dwerror=false \ + --prefix /usr \ + "$srcdir/build" ninja -C "$srcdir/build" }