From f47c39b0cae93143154d7515cc497d9166caf067 Mon Sep 17 00:00:00 2001 From: LW-archlinux Date: Sun, 28 Apr 2019 01:51:13 +0200 Subject: [PATCH] ninja uses MAKEFLAGS envvar now, switched to llvm-lw-git and associated packages for llvm trunk --- .SRCINFO | 8 ++++---- PKGBUILD | 12 ++++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 15138ef..e0fab94 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,14 +1,14 @@ pkgbase = mesa-git pkgdesc = an open-source implementation of the OpenGL specification, git version - pkgver = 19.1.0_devel.110021.c4478889b71 + pkgver = 19.1.0_devel.110426.07745f94948 pkgrel = 1 url = https://www.mesa3d.org arch = x86_64 license = custom makedepends = git makedepends = python-mako - makedepends = llvm-git - makedepends = clang-git + makedepends = llvm-lw-git + makedepends = clang-lw-git makedepends = xorgproto makedepends = libxml2 makedepends = libx11 @@ -29,7 +29,7 @@ pkgbase = mesa-git depends = libxshmfence depends = libelf depends = libomxil-bellagio - depends = llvm-libs-git + depends = llvm-libs-lw-git depends = libunwind depends = libglvnd depends = wayland diff --git a/PKGBUILD b/PKGBUILD index 4824243..0d03001 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -12,14 +12,14 @@ pkgbase=mesa-git pkgname=('mesa-git') pkgdesc="an open-source implementation of the OpenGL specification, git version" -pkgver=19.1.0_devel.110021.c4478889b71 +pkgver=19.1.0_devel.110426.07745f94948 pkgrel=1 arch=('x86_64') -makedepends=('git' 'python-mako' 'llvm-git' 'clang-git' 'xorgproto' +makedepends=('git' 'python-mako' 'llvm-lw-git' 'clang-lw-git' 'xorgproto' 'libxml2' 'libx11' 'libvdpau' 'libva' 'elfutils' 'libomxil-bellagio' 'libxrandr' 'ocl-icd' 'vulkan-icd-loader' 'libgcrypt' 'wayland' 'wayland-protocols' 'meson') depends=('libdrm' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'libelf' - 'libomxil-bellagio' 'llvm-libs-git' 'libunwind' 'libglvnd' 'wayland' 'lm_sensors' 'libclc' 'glslang') + 'libomxil-bellagio' 'llvm-libs-lw-git' 'libunwind' 'libglvnd' 'wayland' 'lm_sensors' 'libclc' 'glslang') optdepends=('opengl-man-pages: for the OpenGL API man pages') provides=('mesa' 'vulkan-intel' 'vulkan-radeon' 'libva-mesa-driver' 'mesa-vdpau' 'vulkan-driver' 'opencl-mesa' 'opengl-driver' 'opencl-driver') conflicts=('mesa' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'libva-mesa-driver' 'mesa-vdpau') @@ -75,7 +75,11 @@ build () { -D vulkan-overlay-layer=true \ -D tools=[] meson configure _build - ninja "$MAKEFLAGS" -C _build + if [[ ! $MAKEFLAGS ]]; then + ninja "$MAKEFLAGS" -C _build + else + ninja "$MAKEFLAGS" -C _build + fi }