llvm

2 files changed, 12 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 905622f56c23..17c26fe7e3d9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -9,6 +9,7 @@ pkgbase = mingw-w64-mesa
 	makedepends = scons
 	makedepends = python2-mako
 	depends = mingw-w64-dlfcn
+	depends = mingw-w64-llvm
 	options = staticlibs
 	options = !strip
 	options = !buildflags
diff --git a/PKGBUILD b/PKGBUILD
index b47ad8546ffd..ad0f2445238b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ arch=('any')
 url="https://www.mesa3d.org/"
 license=("custom")
 makedepends=('mingw-w64-gcc' 'scons' 'python2-mako')
-depends=('mingw-w64-dlfcn')
+depends=('mingw-w64-dlfcn' 'mingw-w64-llvm')
 options=('staticlibs' '!strip' '!buildflags')
 validpgpkeys=('71C4B75620BC75708B4BDB254C95FAAB3EB073EC') # Dylan Baker <dylan@pnwbakers.com>
 source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig})
@@ -14,6 +14,15 @@ sha256sums=('1a2edc3ce56906a676c91e6851298db45903df1f5cb9827395a922c1452db802' S
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
+prepare () {
+  cd "${srcdir}"/mesa-${pkgver}
+  # sh: /usr/bin/i686-w64-mingw32-g++-posix: No such file or directory
+  sed -i "s|env\['CXX'\] = env\['CXX'\] + '-posix'||g" scons/llvm.py
+
+  # hack: libLLVMSupport.a: undefined reference to `compressBound'
+  sed -i "s|'LLVMSupport',|'LLVMSupport','z',|g" scons/llvm.py
+}
+
 build() {
   cd "${srcdir}"/mesa-${pkgver}
   for _arch in ${_architectures}; do
@@ -23,7 +32,7 @@ build() {
     else
       machine="x86"
     fi
-    scons platform=windows toolchain=crossmingw machine=${machine} build=release libgl-gdi
+    LLVM=/usr/${_arch} scons platform=windows toolchain=crossmingw machine=${machine} build=release libgl-gdi
   done
 }