summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorLW-archlinux2019-05-27 15:22:22 +0200
committerLW-archlinux2019-05-27 15:22:22 +0200
commit0bd70b577c767b4257e9657bac95161c7d04d0ca (patch)
tree9544387417135c97d4a00f416ca714a709cc767b
parent6aa61f58999acb744aacf59c0f41f8fba58923dc (diff)
downloadaur-0bd70b577c767b4257e9657bac95161c7d04d0ca.tar.gz
users should validate NINJAFLAGS value, not PKGBUILD
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD14
2 files changed, 13 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 59243b328a3..418a07b4093 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.111007.6b0b8f132aa
+ pkgver = 19.2.0_devel.111223.7a7be613983
pkgrel = 1
url = https://www.mesa3d.org
arch = x86_64
@@ -36,11 +36,11 @@ pkgbase = lib32-mesa-git
depends = glslang
depends = lib32-llvm-libs-minimal-git
optdepends = opengl-man-pages: for the OpenGL API man pages
- provides = lib32-mesa=19.2.0_devel.111007.6b0b8f132aa-1
- provides = lib32-vulkan-intel=19.2.0_devel.111007.6b0b8f132aa-1
- provides = lib32-vulkan-radeon=19.2.0_devel.111007.6b0b8f132aa-1
- provides = lib32-libva-mesa-driver=19.2.0_devel.111007.6b0b8f132aa-1
- provides = lib32-mesa-vdpau=19.2.0_devel.111007.6b0b8f132aa-1
+ provides = lib32-mesa=19.2.0_devel.111223.7a7be613983-1
+ provides = lib32-vulkan-intel=19.2.0_devel.111223.7a7be613983-1
+ provides = lib32-vulkan-radeon=19.2.0_devel.111223.7a7be613983-1
+ provides = lib32-libva-mesa-driver=19.2.0_devel.111223.7a7be613983-1
+ provides = lib32-mesa-vdpau=19.2.0_devel.111223.7a7be613983-1
provides = lib32-opengl-driver
conflicts = lib32-mesa
conflicts = lib32-vulkan-intel
diff --git a/PKGBUILD b/PKGBUILD
index c093adc12ee..71b30aa7e40 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.111007.6b0b8f132aa
+pkgver=19.2.0_devel.111223.7a7be613983
pkgrel=1
arch=('x86_64')
makedepends=('python-mako' 'lib32-libxml2' 'lib32-libx11' 'xorgproto'
@@ -36,6 +36,9 @@ sha512sums=('SKIP'
'25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2'
'c7dbb390ebde291c517a854fcbe5166c24e95206f768cc9458ca896b2253aabd6df12a7becf831998721b2d622d0c02afdd8d519e77dea8e1d6807b35f0166fe')
+# NINJAFLAGS is an env var used to pass commandline options to ninja
+# NOTE: It's your responbility to validate the value of $NINJAFLAGS. If unsure, don't set it.
+
# MESA_WHICH_LLVM is an environment variable used to determine which llvm package tree is used to built mesa-git against.
# Adding a line to makepkg.conf that sets this value is the simplest way to ensure a specific choice.
#
@@ -131,17 +134,14 @@ build () {
-D tools=[] \
meson configure _build
- if [[ ! $NINJAFLAGS ]]; then
- ninja -C _build
- else
- ninja "$NINJAFLAGS" -C _build
- fi
+
+ ninja "$NINJAFLAGS" -C _build
}
package() {
- DESTDIR="$pkgdir" ninja -C _build install
+ DESTDIR="$pkgdir" ninja "$NINJAFLAGS" -C _build install
# remove files provided by mesa-git
rm -rf "$pkgdir"/etc