summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorReza Jahanbakhshi2021-07-12 17:07:35 +0200
committerReza Jahanbakhshi2021-07-12 17:07:35 +0200
commit708ed352b68a237a71c0d0a3c23ec10feffeb9d7 (patch)
tree2d0a777877cf1358c70030e8fc0d429ae2131f1d
parent72a5e589968299b5e8e526791519f7dea39d8906 (diff)
downloadaur-708ed352b68a237a71c0d0a3c23ec10feffeb9d7.tar.gz
added patch to solve build failure
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD14
-rw-r--r--do-not-use-StackAlignmentOverride.patch14
3 files changed, 27 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f6753cee14d..7f52103073c 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 = 21.2.0_devel.142376.c70f45c7596
+ pkgver = 21.2.0_devel.142393.05dc72f863f
pkgrel = 1
url = https://www.mesa3d.org
arch = x86_64
@@ -51,6 +51,7 @@ pkgbase = lib32-mesa-git
source = mesa::git+https://gitlab.freedesktop.org/mesa/mesa.git#branch=main
source = LICENSE
source = llvm32.native
+ source = do-not-use-StackAlignmentOverride.patch
md5sums = SKIP
md5sums = 5c65a0fe315dd347e09b1f2826a1df5a
md5sums = 6b4a19068a323d7f90a3d3cd315ed1f9
diff --git a/PKGBUILD b/PKGBUILD
index e1573895aa7..b537dce3259 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@
pkgname=lib32-mesa-git
pkgdesc="an open-source implementation of the OpenGL specification, git version"
-pkgver=21.2.0_devel.142376.c70f45c7596
+pkgver=21.2.0_devel.142434.81670a47f08
pkgrel=1
arch=('x86_64')
makedepends=('python-mako' 'lib32-libxml2' 'lib32-libx11' 'xorgproto'
@@ -28,14 +28,17 @@ license=('custom')
source=('mesa::git+https://gitlab.freedesktop.org/mesa/mesa.git#branch=main'
'LICENSE'
'llvm32.native'
+ 'do-not-use-StackAlignmentOverride.patch'
)
md5sums=('SKIP'
'5c65a0fe315dd347e09b1f2826a1df5a'
- '6b4a19068a323d7f90a3d3cd315ed1f9')
+ '6b4a19068a323d7f90a3d3cd315ed1f9'
+ '0905857c2c48c53bd607ac3398686f10')
sha512sums=('SKIP'
'25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2'
- 'c7dbb390ebde291c517a854fcbe5166c24e95206f768cc9458ca896b2253aabd6df12a7becf831998721b2d622d0c02afdd8d519e77dea8e1d6807b35f0166fe')
+ 'c7dbb390ebde291c517a854fcbe5166c24e95206f768cc9458ca896b2253aabd6df12a7becf831998721b2d622d0c02afdd8d519e77dea8e1d6807b35f0166fe'
+ '7990f28f1bf758e2a9c62471dea5c4f77ffb832cd619a739e85377d0cc27088ce14a52b3bf97592ea6c64f9a556ddb671952c6e7000360f950fc331372b8732f')
# 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.
@@ -93,6 +96,11 @@ prepare() {
if [ -d _build ]; then
rm -rf _build
fi
+
+ # build fails due to a change in llvm 13. only x86 32-bit uses the option , removing it as temp workaround seems safe.
+ # https://gitlab.freedesktop.org/mesa/mesa/-/issues/4906
+ cd mesa
+ patch --forward --strip=1 --input="${srcdir}/do-not-use-StackAlignmentOverride.patch"
}
build () {
export CC="gcc -m32"
diff --git a/do-not-use-StackAlignmentOverride.patch b/do-not-use-StackAlignmentOverride.patch
new file mode 100644
index 00000000000..393b7fd0af9
--- /dev/null
+++ b/do-not-use-StackAlignmentOverride.patch
@@ -0,0 +1,14 @@
+diff --unified --recursive --text mesa.org/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp mesa.new/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+--- mesa.org/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp 2021-06-18 12:47:17.096083970 +0200
++++ mesa.new/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp 2021-06-18 12:51:39.656887107 +0200
+@@ -351,7 +351,8 @@
+ */
+ TargetOptions options;
+ #if defined(PIPE_ARCH_X86)
+- options.StackAlignmentOverride = 4;
++ // options.StackAlignmentOverride = 4;
++ // fails with llvm 13 , see https://gitlab.freedesktop.org/mesa/mesa/-/issues/4906
+ #endif
+
+ builder.setEngineKind(EngineKind::JIT)
+