- enhanced x32 patch (drop -m32 from vktrace); release 2

diff --git a/vulkan-sdk.spec b/vulkan-sdk.spec
index 1835ef5dbd2b25988729401aca2e8d0d2d6f5f84..45751175076c79a917f82ef9527a6d92b73f778a 100644 (file)
--- 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 5282b6aceba49c95b639783488cdec87f4f68099..80fb45dc5d0e366e33904e550b2dbe11269157d4 100644 (file)
--- 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)