Timo Aaltonen pushed to branch debian-unstable at X Strike Force / vulkan / spirv-tools
Commits: 0b635eda by Timo Aaltonen at 2022-02-16T18:37:09+02:00 disable-shared-harder.diff: Modify the build to actually disable building a shared library and what it brings. - - - - - 0d54cb34 by Timo Aaltonen at 2022-02-16T18:37:25+02:00 release to sid - - - - - 4 changed files: - debian/changelog - + debian/patches/disable-shared-harder.diff - debian/patches/series - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +spirv-tools (2022.1+1.3.204.0-2) unstable; urgency=medium + + * disable-shared-harder.diff: Modify the build to actually disable + building a shared library and what it brings. + + -- Timo Aaltonen <[email protected]> Wed, 16 Feb 2022 18:37:15 +0200 + spirv-tools (2022.1+1.3.204.0-1) unstable; urgency=medium * New upstream snapshot based on sdk-1.3.204.0 tag. ===================================== debian/patches/disable-shared-harder.diff ===================================== @@ -0,0 +1,83 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -356,7 +356,10 @@ if (NOT "${SPIRV_SKIP_TESTS}") + endif() + + set(SPIRV_LIBRARIES "-lSPIRV-Tools-opt -lSPIRV-Tools -lSPIRV-Tools-link") +-set(SPIRV_SHARED_LIBRARIES "-lSPIRV-Tools-shared") ++ ++if(BUILD_SHARED_LIBS) ++ set(SPIRV_SHARED_LIBRARIES "-lSPIRV-Tools-shared") ++endif() + + # Build pkg-config file + # Use a first-class target so it's regenerated when relevant files are updated. +@@ -371,6 +374,7 @@ add_custom_target(spirv-tools-pkg-config + -DSPIRV_LIBRARIES=${SPIRV_LIBRARIES} + -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/write_pkg_config.cmake + DEPENDS "CHANGES" "cmake/SPIRV-Tools.pc.in" "cmake/write_pkg_config.cmake") ++if(BUILD_SHARED_LIBS) + add_custom_target(spirv-tools-shared-pkg-config ALL + COMMAND ${CMAKE_COMMAND} + -DCHANGES_FILE=${CMAKE_CURRENT_SOURCE_DIR}/CHANGES +@@ -382,13 +386,20 @@ add_custom_target(spirv-tools-shared-pkg + -DSPIRV_SHARED_LIBRARIES=${SPIRV_SHARED_LIBRARIES} + -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/write_pkg_config.cmake + DEPENDS "CHANGES" "cmake/SPIRV-Tools-shared.pc.in" "cmake/write_pkg_config.cmake") ++endif() + + # Install pkg-config file + if (ENABLE_SPIRV_TOOLS_INSTALL) + install( + FILES + ${CMAKE_CURRENT_BINARY_DIR}/SPIRV-Tools.pc +- ${CMAKE_CURRENT_BINARY_DIR}/SPIRV-Tools-shared.pc + DESTINATION + ${CMAKE_INSTALL_LIBDIR}/pkgconfig) ++ if(BUILD_SHARED_LIBS) ++ install( ++ FILES ++ ${CMAKE_CURRENT_BINARY_DIR}/SPIRV-Tools-shared.pc ++ DESTINATION ++ ${CMAKE_INSTALL_LIBDIR}/pkgconfig) ++ endif() + endif() +--- a/source/CMakeLists.txt ++++ b/source/CMakeLists.txt +@@ -371,13 +371,15 @@ endfunction() + + # Always build ${SPIRV_TOOLS}-shared. This is expected distro packages, and + # unlike the other SPIRV_TOOLS target, defaults to hidden symbol visibility. +-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) +-target_compile_definitions(${SPIRV_TOOLS}-shared +- PRIVATE SPIRV_TOOLS_IMPLEMENTATION +- PUBLIC SPIRV_TOOLS_SHAREDLIB +-) ++if(BUILD_SHARED_LIBS) ++ 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) ++ target_compile_definitions(${SPIRV_TOOLS}-shared ++ PRIVATE SPIRV_TOOLS_IMPLEMENTATION ++ PUBLIC SPIRV_TOOLS_SHAREDLIB ++ ) ++endif() + + if(SPIRV_TOOLS_BUILD_STATIC) + add_library(${SPIRV_TOOLS}-static STATIC ${SPIRV_SOURCES}) +@@ -389,11 +391,11 @@ if(SPIRV_TOOLS_BUILD_STATIC) + # or "${SPIRV_TOOLS}-shared" depending on the value of BUILD_SHARED_LIBS. + if(BUILD_SHARED_LIBS) + add_library(${SPIRV_TOOLS} ALIAS ${SPIRV_TOOLS}-shared) ++ set(SPIRV_TOOLS_TARGETS ${SPIRV_TOOLS}-static ${SPIRV_TOOLS}-shared) + else() + add_library(${SPIRV_TOOLS} ALIAS ${SPIRV_TOOLS}-static) ++ set(SPIRV_TOOLS_TARGETS ${SPIRV_TOOLS}-static) + endif() +- +- set(SPIRV_TOOLS_TARGETS ${SPIRV_TOOLS}-static ${SPIRV_TOOLS}-shared) + else() + add_library(${SPIRV_TOOLS} ${SPIRV_TOOLS_LIBRARY_TYPE} ${SPIRV_SOURCES}) + spirv_tools_default_target_options(${SPIRV_TOOLS}) ===================================== debian/patches/series ===================================== @@ -1 +1 @@ -#placeholder +disable-shared-harder.diff ===================================== debian/rules ===================================== @@ -15,8 +15,6 @@ override_dh_auto_test: override_dh_install: dh_install - rm debian/spirv-tools/usr/lib/*/pkgconfig/SPIRV-Tools-shared.pc - rm debian/spirv-tools/usr/lib/*/libSPIRV-Tools-shared.so gentarball: SOURCE=spirv-tools View it on GitLab: https://salsa.debian.org/xorg-team/vulkan/spirv-tools/-/compare/cc63311726fbd31394a33fe375682ae876e5c155...0d54cb34f3c7d573a810954873715b9db1ca40aa -- View it on GitLab: https://salsa.debian.org/xorg-team/vulkan/spirv-tools/-/compare/cc63311726fbd31394a33fe375682ae876e5c155...0d54cb34f3c7d573a810954873715b9db1ca40aa You're receiving this email because of your account on salsa.debian.org.
