summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorLW-archlinux2019-05-12 15:34:46 +0200
committerLW-archlinux2019-05-12 15:34:46 +0200
commit8f42f3a189b3342e580093ec8341d814019c605a (patch)
tree0b791526277f7b8d4252a05b1a2d04aa88c53602
parent6c6ae675836e6008ace8ef5c3ca102a455b6fa67 (diff)
downloadaur-8f42f3a189b3342e580093ec8341d814019c605a.tar.gz
moved removal of _build folder to prepare()
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD12
2 files changed, 14 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4c80ae018d5..d7ad7e34eba 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = lib32-mesa-git
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
url = https://www.mesa3d.org
arch = x86_64
@@ -36,11 +36,11 @@ pkgbase = lib32-mesa-git
depends = glslang
depends = lone_wolf-lib32-llvm-libs-git
optdepends = opengl-man-pages: for the OpenGL API man pages
- provides = lib32-mesa=19.2.0_devel.110857.8b3baa27440-1
- provides = lib32-vulkan-intel=19.2.0_devel.110857.8b3baa27440-1
- provides = lib32-vulkan-radeon=19.2.0_devel.110857.8b3baa27440-1
- provides = lib32-libva-mesa-driver=19.2.0_devel.110857.8b3baa27440-1
- provides = lib32-mesa-vdpau=19.2.0_devel.110857.8b3baa27440-1
+ provides = lib32-mesa=19.2.0_devel.110903.974c4d679c2-1
+ provides = lib32-vulkan-intel=19.2.0_devel.110903.974c4d679c2-1
+ provides = lib32-vulkan-radeon=19.2.0_devel.110903.974c4d679c2-1
+ provides = lib32-libva-mesa-driver=19.2.0_devel.110903.974c4d679c2-1
+ provides = lib32-mesa-vdpau=19.2.0_devel.110903.974c4d679c2-1
provides = lib32-opengl-driver
conflicts = lib32-mesa
conflicts = lib32-vulkan-intel
diff --git a/PKGBUILD b/PKGBUILD
index 997464715d5..66ae24388a0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@
pkgname=(lib32-mesa-git)
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
arch=('x86_64')
makedepends=('python-mako' 'lib32-libxml2' 'lib32-libx11' 'xorgproto'
@@ -79,14 +79,18 @@ pkgver() {
echo ${_ver/-/_}.$(git rev-list --count HEAD).$(git rev-parse --short HEAD)
}
+prepare() {
+ # although removing _build folder in build() function feels more natural,
+ # that interferes with the spirit of makepkg --noextract
+ if [ -d _build ]; then
+ rm -rf _build
+ fi
+}
build () {
export CC="gcc -m32"
export CXX="g++ -m32"
export PKG_CONFIG=/usr/bin/pkg-config-32
- if [ -d _build ]; then
- rm -rf _build
- fi
meson setup mesa _build \
--native-file llvm32.native \
-D b_ndebug=true \