diff options
| author | Leo <thinkabit.ukim@gmail.com> | 2019-06-27 17:21:40 -0300 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-06-28 15:18:09 +0000 |
| commit | d036718feb2cfbebbcc9f72fbf57d4d56338623d (patch) | |
| tree | 5af2cc1526cfac12429692b3c7086f68beb855c0 /community/shaderc/fix-link-order.patch | |
| parent | 5e4ce4138dcdd19c0e272c9ccc354dfff63c6e74 (diff) | |
| download | aports-d036718feb2cfbebbcc9f72fbf57d4d56338623d.tar.bz2 aports-d036718feb2cfbebbcc9f72fbf57d4d56338623d.tar.xz | |
community/shaderc: move from testing
Diffstat (limited to 'community/shaderc/fix-link-order.patch')
| -rw-r--r-- | community/shaderc/fix-link-order.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/community/shaderc/fix-link-order.patch b/community/shaderc/fix-link-order.patch new file mode 100644 index 0000000000..f356959837 --- /dev/null +++ b/community/shaderc/fix-link-order.patch @@ -0,0 +1,44 @@ +Original upstream PR: https://github.com/google/shaderc/pull/463 + +From 21c8be385b3fab5edcb934a6d99f69fd389c4e67 Mon Sep 17 00:00:00 2001 +From: Niklas Haas <git@haasn.xyz> +Date: Tue, 29 May 2018 07:34:00 +0200 +Subject: [PATCH] Fix the link order of libglslang and libHLSL + +libglslang depends on libHLSL, so the latter needs to be specified last. +This fixes an issue when trying to build shaderc against system-wide +versions of libglslang/libHLSL, rather than the in-tree versions from +third_party. + +Additionally, libshaderc_util also depends on SPIRV-Tools +--- + glslc/CMakeLists.txt | 2 +- + libshaderc_util/CMakeLists.txt | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +--- a/glslc/CMakeLists.txt ++++ b/glslc/CMakeLists.txt +@@ -18,7 +18,7 @@ add_library(glslc STATIC + shaderc_default_compile_options(glslc) + target_include_directories(glslc PUBLIC ${glslang_SOURCE_DIR}) + target_link_libraries(glslc PRIVATE glslang OSDependent OGLCompiler +- HLSL glslang SPIRV ${CMAKE_THREAD_LIBS_INIT}) ++ glslang SPIRV HLSL ${CMAKE_THREAD_LIBS_INIT}) + target_link_libraries(glslc PRIVATE shaderc_util shaderc) + + add_executable(glslc_exe src/main.cc) +--- a/libshaderc_util/CMakeLists.txt ++++ b/libshaderc_util/CMakeLists.txt +@@ -34,8 +34,8 @@ endif(SHADERC_ENABLE_INSTALL) + + find_package(Threads) + target_link_libraries(shaderc_util PRIVATE +- glslang OSDependent OGLCompiler HLSL glslang SPIRV +- SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT}) ++ glslang OSDependent OGLCompiler glslang HLSL SPIRV ++ SPIRV-Tools-opt SPIRV-Tools ${CMAKE_THREAD_LIBS_INIT}) + + shaderc_add_tests( + TEST_PREFIX shaderc_util + + |