From 8a8ec3f41ba6f38d144e9c8f4c9b900119a75104c701dac3e370dab867c834aa Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 6 Sep 2021 06:24:57 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/spirv-tools?expand=0&rev=74 --- spirv-tools.spec | 3 +++ ver.diff | 57 +++++++++++++++++++++++++++++------------------- 2 files changed, 38 insertions(+), 22 deletions(-) diff --git a/spirv-tools.spec b/spirv-tools.spec index 6d36d77..75dd2d5 100644 --- a/spirv-tools.spec +++ b/spirv-tools.spec @@ -77,6 +77,7 @@ export CXXFLAGS="%optflags -Wno-error=stringop-truncation" %install %cmake_install +perl -i -lpe 's{^#!/usr/bin/env sh$}{#!/bin/sh}' "%buildroot/%_bindir/spirv-lesspipe.sh" %post -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig @@ -88,6 +89,7 @@ export CXXFLAGS="%optflags -Wno-error=stringop-truncation" %files -n %lname %_libdir/libSPIRV-Tools.so.* %_libdir/libSPIRV-Tools-link.so.* +%_libdir/libSPIRV-Tools-lint.so.* %_libdir/libSPIRV-Tools-opt.so.* %_libdir/libSPIRV-Tools-reduce.so.* %_libdir/libSPIRV-Tools-shared.so.* @@ -96,6 +98,7 @@ export CXXFLAGS="%optflags -Wno-error=stringop-truncation" %_libdir/cmake/ %_libdir/libSPIRV-Tools.so %_libdir/libSPIRV-Tools-link.so +%_libdir/libSPIRV-Tools-lint.so %_libdir/libSPIRV-Tools-opt.so %_libdir/libSPIRV-Tools-reduce.so %_libdir/libSPIRV-Tools-shared.so diff --git a/ver.diff b/ver.diff index 5137af6..b783ebb 100644 --- a/ver.diff +++ b/ver.diff @@ -7,15 +7,16 @@ Unversioned libraries suck! source/CMakeLists.txt | 3 +++ source/fuzz/CMakeLists.txt | 1 + source/link/CMakeLists.txt | 1 + + source/lint/CMakeLists.txt | 1 + source/opt/CMakeLists.txt | 1 + source/reduce/CMakeLists.txt | 1 + - 5 files changed, 7 insertions(+) + 6 files changed, 8 insertions(+) -Index: SPIRV-Tools-2020.6/source/CMakeLists.txt +Index: SPIRV-Tools-2021.3/source/CMakeLists.txt =================================================================== ---- SPIRV-Tools-2020.6.orig/source/CMakeLists.txt -+++ SPIRV-Tools-2020.6/source/CMakeLists.txt -@@ -367,6 +367,7 @@ endfunction() +--- SPIRV-Tools-2021.3.orig/source/CMakeLists.txt ++++ SPIRV-Tools-2021.3/source/CMakeLists.txt +@@ -377,6 +377,7 @@ endfunction() add_library(${SPIRV_TOOLS}-shared SHARED ${SPIRV_SOURCES}) spirv_tools_default_target_options(${SPIRV_TOOLS}-shared) set_target_properties(${SPIRV_TOOLS}-shared PROPERTIES CXX_VISIBILITY_PRESET hidden) @@ -23,7 +24,7 @@ Index: SPIRV-Tools-2020.6/source/CMakeLists.txt target_compile_definitions(${SPIRV_TOOLS}-shared PRIVATE SPIRV_TOOLS_IMPLEMENTATION PUBLIC SPIRV_TOOLS_SHAREDLIB -@@ -377,6 +378,7 @@ if(SPIRV_TOOLS_BUILD_STATIC) +@@ -387,6 +388,7 @@ if(SPIRV_TOOLS_BUILD_STATIC) spirv_tools_default_target_options(${SPIRV_TOOLS}-static) # The static target does not have the '-static' suffix. set_target_properties(${SPIRV_TOOLS}-static PROPERTIES OUTPUT_NAME "${SPIRV_TOOLS}") @@ -31,7 +32,7 @@ Index: SPIRV-Tools-2020.6/source/CMakeLists.txt # Create the "${SPIRV_TOOLS}" target as an alias to either "${SPIRV_TOOLS}-static" # or "${SPIRV_TOOLS}-shared" depending on the value of BUILD_SHARED_LIBS. -@@ -389,6 +391,7 @@ if(SPIRV_TOOLS_BUILD_STATIC) +@@ -399,6 +401,7 @@ if(SPIRV_TOOLS_BUILD_STATIC) set(SPIRV_TOOLS_TARGETS ${SPIRV_TOOLS}-static ${SPIRV_TOOLS}-shared) else() add_library(${SPIRV_TOOLS} ${SPIRV_TOOLS_LIBRARY_TYPE} ${SPIRV_SOURCES}) @@ -39,11 +40,11 @@ Index: SPIRV-Tools-2020.6/source/CMakeLists.txt spirv_tools_default_target_options(${SPIRV_TOOLS}) set(SPIRV_TOOLS_TARGETS ${SPIRV_TOOLS} ${SPIRV_TOOLS}-shared) endif() -Index: SPIRV-Tools-2020.6/source/fuzz/CMakeLists.txt +Index: SPIRV-Tools-2021.3/source/fuzz/CMakeLists.txt =================================================================== ---- SPIRV-Tools-2020.6.orig/source/fuzz/CMakeLists.txt -+++ SPIRV-Tools-2020.6/source/fuzz/CMakeLists.txt -@@ -425,6 +425,7 @@ if(SPIRV_BUILD_FUZZER) +--- SPIRV-Tools-2021.3.orig/source/fuzz/CMakeLists.txt ++++ SPIRV-Tools-2021.3/source/fuzz/CMakeLists.txt +@@ -439,6 +439,7 @@ if(SPIRV_BUILD_FUZZER) spvtools_pch(SPIRV_TOOLS_FUZZ_SOURCES pch_source_fuzz) add_library(SPIRV-Tools-fuzz ${SPIRV_TOOLS_FUZZ_SOURCES}) @@ -51,10 +52,10 @@ Index: SPIRV-Tools-2020.6/source/fuzz/CMakeLists.txt spvtools_default_compile_options(SPIRV-Tools-fuzz) -Index: SPIRV-Tools-2020.6/source/link/CMakeLists.txt +Index: SPIRV-Tools-2021.3/source/link/CMakeLists.txt =================================================================== ---- SPIRV-Tools-2020.6.orig/source/link/CMakeLists.txt -+++ SPIRV-Tools-2020.6/source/link/CMakeLists.txt +--- SPIRV-Tools-2021.3.orig/source/link/CMakeLists.txt ++++ SPIRV-Tools-2021.3/source/link/CMakeLists.txt @@ -14,6 +14,7 @@ add_library(SPIRV-Tools-link ${SPIRV_TOOLS_LIBRARY_TYPE} linker.cpp @@ -63,11 +64,23 @@ Index: SPIRV-Tools-2020.6/source/link/CMakeLists.txt spvtools_default_compile_options(SPIRV-Tools-link) target_include_directories(SPIRV-Tools-link -Index: SPIRV-Tools-2020.6/source/opt/CMakeLists.txt +Index: SPIRV-Tools-2021.3/source/lint/CMakeLists.txt =================================================================== ---- SPIRV-Tools-2020.6.orig/source/opt/CMakeLists.txt -+++ SPIRV-Tools-2020.6/source/opt/CMakeLists.txt -@@ -234,6 +234,7 @@ spvtools_pch(SPIRV_TOOLS_OPT_SOURCES pch +--- SPIRV-Tools-2021.3.orig/source/lint/CMakeLists.txt ++++ SPIRV-Tools-2021.3/source/lint/CMakeLists.txt +@@ -25,6 +25,7 @@ endif() + + add_library(SPIRV-Tools-lint ${SPIRV_TOOLS_LIBRARY_TYPE} ${SPIRV_TOOLS_LINT_SOURCES}) + ++set_target_properties(SPIRV-Tools-lint PROPERTIES SOVERSION suse22) + spvtools_default_compile_options(SPIRV-Tools-lint) + target_include_directories(SPIRV-Tools-lint + PUBLIC +Index: SPIRV-Tools-2021.3/source/opt/CMakeLists.txt +=================================================================== +--- SPIRV-Tools-2021.3.orig/source/opt/CMakeLists.txt ++++ SPIRV-Tools-2021.3/source/opt/CMakeLists.txt +@@ -235,6 +235,7 @@ spvtools_pch(SPIRV_TOOLS_OPT_SOURCES pch add_library(SPIRV-Tools-opt ${SPIRV_TOOLS_LIBRARY_TYPE} ${SPIRV_TOOLS_OPT_SOURCES}) @@ -75,11 +88,11 @@ Index: SPIRV-Tools-2020.6/source/opt/CMakeLists.txt spvtools_default_compile_options(SPIRV-Tools-opt) target_include_directories(SPIRV-Tools-opt PUBLIC -Index: SPIRV-Tools-2020.6/source/reduce/CMakeLists.txt +Index: SPIRV-Tools-2021.3/source/reduce/CMakeLists.txt =================================================================== ---- SPIRV-Tools-2020.6.orig/source/reduce/CMakeLists.txt -+++ SPIRV-Tools-2020.6/source/reduce/CMakeLists.txt -@@ -88,6 +88,7 @@ target_include_directories(SPIRV-Tools-r +--- SPIRV-Tools-2021.3.orig/source/reduce/CMakeLists.txt ++++ SPIRV-Tools-2021.3/source/reduce/CMakeLists.txt +@@ -92,6 +92,7 @@ target_include_directories(SPIRV-Tools-r $ PRIVATE ${spirv-tools_BINARY_DIR} )