app-emulation/dxvk: New patch for adding compiler/linker flags.
The old patch stopped working after <https://github.com/doitsujin/dxvk/commit/77af102> and <https://github.com/doitsujin/dxvk/commit/7d67306>.
This commit is contained in:
parent
023062408c
commit
c588a77c2d
|
@ -1,4 +1,4 @@
|
||||||
# Copyright 1999-2020 Gentoo Authors
|
# Copyright 1999-2021 Gentoo Authors
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
EAPI=7
|
EAPI=7
|
||||||
|
@ -43,7 +43,7 @@ RDEPEND="
|
||||||
"
|
"
|
||||||
|
|
||||||
PATCHES=(
|
PATCHES=(
|
||||||
"${FILESDIR}/9999-add_compiler_flags.patch"
|
"${FILESDIR}/dxvk-1.7.3_add-compiler-flags.patch"
|
||||||
)
|
)
|
||||||
|
|
||||||
RESTRICT="!test? ( test )"
|
RESTRICT="!test? ( test )"
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
# Copyright 1999-2020 Gentoo Authors
|
# Copyright 1999-2021 Gentoo Authors
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
EAPI=7
|
EAPI=7
|
||||||
|
@ -43,7 +43,7 @@ RDEPEND="
|
||||||
"
|
"
|
||||||
|
|
||||||
PATCHES=(
|
PATCHES=(
|
||||||
"${FILESDIR}/9999-add_compiler_flags.patch"
|
"${FILESDIR}/dxvk-1.7.3_add-compiler-flags.patch"
|
||||||
)
|
)
|
||||||
|
|
||||||
RESTRICT="!test? ( test )"
|
RESTRICT="!test? ( test )"
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
# Copyright 1999-2020 Gentoo Authors
|
# Copyright 1999-2021 Gentoo Authors
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
EAPI=7
|
EAPI=7
|
||||||
|
@ -43,7 +43,7 @@ RDEPEND="
|
||||||
"
|
"
|
||||||
|
|
||||||
PATCHES=(
|
PATCHES=(
|
||||||
"${FILESDIR}/9999-add_compiler_flags.patch"
|
"${FILESDIR}/dxvk-9999_add-compiler-flags.patch"
|
||||||
)
|
)
|
||||||
|
|
||||||
RESTRICT="!test? ( test )"
|
RESTRICT="!test? ( test )"
|
||||||
|
|
59
app-emulation/dxvk/files/dxvk-9999_add-compiler-flags.patch
Normal file
59
app-emulation/dxvk/files/dxvk-9999_add-compiler-flags.patch
Normal file
|
@ -0,0 +1,59 @@
|
||||||
|
From 3af87af2759dc63738f50dda2482b809e2ba247f Mon Sep 17 00:00:00 2001
|
||||||
|
From: tastytea <tastytea@tastytea.de>
|
||||||
|
Date: Tue, 5 Jan 2021 00:16:38 +0100
|
||||||
|
Subject: [PATCH] Add compiler and linker flags.
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
Revert “built-in options” to “properties” for <meson-0.56 compatibility.
|
||||||
|
---
|
||||||
|
build-win32.txt | 9 +++++----
|
||||||
|
build-win64.txt | 9 +++++----
|
||||||
|
2 files changed, 10 insertions(+), 8 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/build-win32.txt b/build-win32.txt
|
||||||
|
index 2cb5cf0a..f2252c3e 100644
|
||||||
|
--- a/build-win32.txt
|
||||||
|
+++ b/build-win32.txt
|
||||||
|
@@ -4,11 +4,12 @@ cpp = 'i686-w64-mingw32-g++'
|
||||||
|
ar = 'i686-w64-mingw32-ar'
|
||||||
|
strip = 'i686-w64-mingw32-strip'
|
||||||
|
|
||||||
|
-[built-in options]
|
||||||
|
-c_link_args = ['-static', '-static-libgcc']
|
||||||
|
-cpp_link_args = ['-static', '-static-libgcc', '-static-libstdc++']
|
||||||
|
-
|
||||||
|
[properties]
|
||||||
|
+c_args = @CFLAGS@
|
||||||
|
+cpp_args = @CXXFLAGS@
|
||||||
|
+c_link_args = @LDFLAGS@ + ['-static', '-static-libgcc']
|
||||||
|
+cpp_link_args = @LDFLAGS@ + ['-static', '-static-libgcc', '-static-libstdc++']
|
||||||
|
+
|
||||||
|
needs_exe_wrapper = true
|
||||||
|
|
||||||
|
[host_machine]
|
||||||
|
diff --git a/build-win64.txt b/build-win64.txt
|
||||||
|
index 1fad5ab7..6e9c7340 100644
|
||||||
|
--- a/build-win64.txt
|
||||||
|
+++ b/build-win64.txt
|
||||||
|
@@ -4,11 +4,12 @@ cpp = 'x86_64-w64-mingw32-g++'
|
||||||
|
ar = 'x86_64-w64-mingw32-ar'
|
||||||
|
strip = 'x86_64-w64-mingw32-strip'
|
||||||
|
|
||||||
|
-[built-in options]
|
||||||
|
-c_link_args = ['-static', '-static-libgcc']
|
||||||
|
-cpp_link_args = ['-static', '-static-libgcc', '-static-libstdc++']
|
||||||
|
-
|
||||||
|
[properties]
|
||||||
|
+c_args = @CFLAGS@
|
||||||
|
+cpp_args = @CXXFLAGS@
|
||||||
|
+c_link_args = @LDFLAGS@ + ['-static', '-static-libgcc']
|
||||||
|
+cpp_link_args = @LDFLAGS@ + ['-static', '-static-libgcc', '-static-libstdc++']
|
||||||
|
+
|
||||||
|
needs_exe_wrapper = true
|
||||||
|
|
||||||
|
[host_machine]
|
||||||
|
--
|
||||||
|
2.26.2
|
||||||
|
|
Reference in New Issue
Block a user