summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorStelios Tsampas2022-06-06 23:48:42 +0300
committerStelios Tsampas2022-06-06 23:48:42 +0300
commita80eacab9008ed4b5e86e4b110404b0ccc377e79 (patch)
tree7a6ef90af01db15d4775eb5cd83b7cbe52b7f4f9
parent579f644c5f5d0e0262b3ae95580c0ef6ed02bd54 (diff)
downloadaur-a80eacab9008ed4b5e86e4b110404b0ccc377e79.tar.gz
Fix dxvk-nvapi build failure on gcc 12
-rw-r--r--0002-RevertMe-Use-one-job-for-autoconf-targets-because-of.patch29
-rw-r--r--PKGBUILD2
2 files changed, 2 insertions, 29 deletions
diff --git a/0002-RevertMe-Use-one-job-for-autoconf-targets-because-of.patch b/0002-RevertMe-Use-one-job-for-autoconf-targets-because-of.patch
deleted file mode 100644
index 8c968de95d54..000000000000
--- a/0002-RevertMe-Use-one-job-for-autoconf-targets-because-of.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From dcf8aacaca06c5d4305e81e4d7e12b37eff6e88a Mon Sep 17 00:00:00 2001
-From: Stelios Tsampas <loathingkernel@gmail.com>
-Date: Sun, 8 May 2022 12:58:59 +0300
-Subject: [PATCH 2/2] RevertMe: Use one job for autoconf targets because of an
- unresolved build failure in Wine
-
----
- make/rules-autoconf.mk | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/make/rules-autoconf.mk b/make/rules-autoconf.mk
-index 4e6d19f2..41a17e0e 100644
---- a/make/rules-autoconf.mk
-+++ b/make/rules-autoconf.mk
-@@ -31,9 +31,9 @@ $$(OBJ)/.$(1)-configure$(3): $$(OBJ)/.$(1)-pre-configure
- $$(OBJ)/.$(1)-build$(3):
- @echo ":: building $(3)bit $(1)..." >&2
- cd "$$($(2)_OBJ$(3))" && env $$($(2)_ENV$(3)) \
-- $$(MAKE) -j$$(SUBJOBS)
-+ $$(MAKE) -j1
- cd "$$($(2)_OBJ$(3))" && env $$($(2)_ENV$(3)) \
-- $$(MAKE) -j$$(SUBJOBS) install
-+ $$(MAKE) -j1 install
- touch $$@
- endif
- endef
---
-2.36.1
-
diff --git a/PKGBUILD b/PKGBUILD
index 527142401bf6..b6d861424056 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -242,6 +242,8 @@ prepare() {
git submodule init external/Vulkan-Headers
git config submodule.external/Vulkan-Headers.url "$srcdir"/Vulkan-Headers
git submodule update external/Vulkan-Headers
+ # GCC 12 build failure
+ git cherry-pick 33bf3c7a6a3dc9e330cd338bf1877b5481c655e3
popd
for submodule in gst-plugins-rs media-converter; do