[packages/vulkan-sdk] - enhanced x32 patch (drop -m32 from vktrace); release 2
qboosh
qboosh at pld-linux.org
Sun Mar 4 19:03:21 CET 2018
commit 75c346aa597f89ccc80adcf154f341bca8420178
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Mar 4 19:05:55 2018 +0100
- enhanced x32 patch (drop -m32 from vktrace); release 2
vulkan-sdk.spec | 2 +-
x32.patch | 16 ++++++++++++++++
2 files changed, 17 insertions(+), 1 deletion(-)
---
diff --git a/vulkan-sdk.spec b/vulkan-sdk.spec
index 1835ef5..4575117 100644
--- a/vulkan-sdk.spec
+++ b/vulkan-sdk.spec
@@ -17,7 +17,7 @@ Summary: LunarG Vulkan SDK
Summary(pl.UTF-8): Pakiet programistyczny (SDK) LunarG Vulkan
Name: vulkan-sdk
Version: 1.0.68.0
-Release: 1
+Release: 2
License: Apache v2.0, parts MIT-like
Group: Development
Source0: https://github.com/LunarG/VulkanTools/archive/sdk-%{version}/VulkanTools-%{version}.tar.gz
diff --git a/x32.patch b/x32.patch
index 5282b6a..80fb45d 100644
--- a/x32.patch
+++ b/x32.patch
@@ -9,3 +9,19 @@
defined(__aarch64__) || defined(__powerpc64__)
// If pointers are 64-bit, then there can be separate counters for each
// NONDISPATCHABLE_HANDLE type. Otherwise they are all typedef uint64_t.
+--- VulkanTools-sdk-1.0.68.0/vktrace/CMakeLists.txt.orig 2018-02-07 18:36:10.000000000 +0100
++++ VulkanTools-sdk-1.0.68.0/vktrace/CMakeLists.txt 2018-03-04 18:47:46.848025808 +0100
+@@ -128,13 +128,8 @@
+
+
+ if ((NOT MSVC) AND (NOT BUILD_X64) AND (NOT CMAKE_SIZEOF_VOID_P EQUAL 8))
+- set(CMAKE_CXX_FLAGS_LIST "${CMAKE_CXX_FLAGS_LIST} -m32")
+- set(CMAKE_EXE_LINK_FLAGS_LIST "${CMAKE_EXE_LINK_FLAGS_LIST} -m32")
+- set(CMAKE_SHARED_LINK_FLAGS_LIST "${CMAKE_SHARED_LINK_FLAGS_LIST} -m32")
+
+ set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS OFF)
+- set(CMAKE_SYSTEM_LIBRARY_PATH /lib32 /usr/lib32 /usr/lib/i386-linux-gnu /usr/local/lib32)
+- set(CMAKE_IGNORE_PATH /lib /usr/lib /usr/lib/x86_64-linux-gnu /usr/lib64 /usr/local/lib)
+ endif()
+
+ function(add_compiler_flag flag)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/vulkan-sdk.git/commitdiff/75c346aa597f89ccc80adcf154f341bca8420178
More information about the pld-cvs-commit
mailing list