moved removal of _build folder to prepare()

This commit is contained in:
LW-archlinux 2019-05-12 14:57:09 +02:00
parent 551d1aaf9f
commit ffc8c0ee04
2 changed files with 15 additions and 10 deletions

View File

@ -1,6 +1,6 @@
pkgbase = mesa-git pkgbase = mesa-git
pkgdesc = an open-source implementation of the OpenGL specification, git version pkgdesc = an open-source implementation of the OpenGL specification, git version
pkgver = 19.2.0_devel.110857.8b3baa27440 pkgver = 19.2.0_devel.110903.974c4d679c2
pkgrel = 1 pkgrel = 1
url = https://www.mesa3d.org url = https://www.mesa3d.org
arch = x86_64 arch = x86_64
@ -38,13 +38,13 @@ pkgbase = mesa-git
depends = glslang depends = glslang
depends = lone_wolf-llvm-libs-git depends = lone_wolf-llvm-libs-git
optdepends = opengl-man-pages: for the OpenGL API man pages optdepends = opengl-man-pages: for the OpenGL API man pages
provides = mesa=19.2.0_devel.110857.8b3baa27440-1 provides = mesa=19.2.0_devel.110903.974c4d679c2-1
provides = vulkan-intel=19.2.0_devel.110857.8b3baa27440-1 provides = vulkan-intel=19.2.0_devel.110903.974c4d679c2-1
provides = vulkan-radeon=19.2.0_devel.110857.8b3baa27440-1 provides = vulkan-radeon=19.2.0_devel.110903.974c4d679c2-1
provides = libva-mesa-driver=19.2.0_devel.110857.8b3baa27440-1 provides = libva-mesa-driver=19.2.0_devel.110903.974c4d679c2-1
provides = mesa-vdpau=19.2.0_devel.110857.8b3baa27440-1 provides = mesa-vdpau=19.2.0_devel.110903.974c4d679c2-1
provides = vulkan-driver=19.2.0_devel.110857.8b3baa27440-1 provides = vulkan-driver=19.2.0_devel.110903.974c4d679c2-1
provides = opencl-mesa=19.2.0_devel.110857.8b3baa27440-1 provides = opencl-mesa=19.2.0_devel.110903.974c4d679c2-1
provides = opengl-driver provides = opengl-driver
provides = opencl-driver provides = opencl-driver
conflicts = mesa conflicts = mesa

View File

@ -11,7 +11,7 @@
pkgname=mesa-git pkgname=mesa-git
pkgdesc="an open-source implementation of the OpenGL specification, git version" pkgdesc="an open-source implementation of the OpenGL specification, git version"
pkgver=19.2.0_devel.110857.8b3baa27440 pkgver=19.2.0_devel.110903.974c4d679c2
pkgrel=1 pkgrel=1
arch=('x86_64') arch=('x86_64')
makedepends=('git' 'python-mako' 'xorgproto' makedepends=('git' 'python-mako' 'xorgproto'
@ -75,10 +75,15 @@ pkgver() {
echo ${_ver/-/_}.$(git rev-list --count HEAD).$(git rev-parse --short HEAD) echo ${_ver/-/_}.$(git rev-list --count HEAD).$(git rev-parse --short HEAD)
} }
build () { prepare() {
# although removing _build folder in build() function feels more natural,
# that interferes with the spirit of makepkg --noextract
if [ -d _build ]; then if [ -d _build ]; then
rm -rf _build rm -rf _build
fi fi
}
build () {
meson setup mesa _build \ meson setup mesa _build \
-D b_ndebug=true \ -D b_ndebug=true \
-D buildtype=plain \ -D buildtype=plain \