diff options
| author |   Nick Sarnie <sarnex@gentoo.org> | 2022-11-05 18:10:54 -0400 |
|---|---|---|
| committer | Nick Sarnie <sarnex@gentoo.org> | 2022-11-08 18:56:27 -0500 |
| commit | 5b3406b932a28470270a2b83993c1358d9d0a62a (patch) | |
| tree | cf5cf85d660a4b7f2b1aca5785ca7ab58128fada /dev-util/glslang | |
| parent | app-admin/salt: remove unused patch (diff) | |
| download | gentoo-5b3406b932a28470270a2b83993c1358d9d0a62a.tar.gz gentoo-5b3406b932a28470270a2b83993c1358d9d0a62a.tar.bz2 gentoo-5b3406b932a28470270a2b83993c1358d9d0a62a.zip | |
dev-util/glslang: Add subslot, install static libs
Signed-off-by: Nick Sarnie <sarnex@gentoo.org>
Diffstat (limited to 'dev-util/glslang')
| -rw-r--r-- | dev-util/glslang/files/glslang-1.3.231-Install-static-libs.patch | 57 | ||||
| -rw-r--r-- | dev-util/glslang/glslang-1.3.231-r1.ebuild (renamed from dev-util/glslang/glslang-1.3.231.ebuild) | 4 | ||||
| -rw-r--r-- | dev-util/glslang/glslang-9999.ebuild | 4 |
3 files changed, 63 insertions, 2 deletions
diff --git a/dev-util/glslang/files/glslang-1.3.231-Install-static-libs.patch b/dev-util/glslang/files/glslang-1.3.231-Install-static-libs.patch new file mode 100644 index 000000000000..b7ed014d92b3 --- /dev/null +++ b/dev-util/glslang/files/glslang-1.3.231-Install-static-libs.patch @@ -0,0 +1,57 @@ +diff --git a/OGLCompilersDLL/CMakeLists.txt b/OGLCompilersDLL/CMakeLists.txt +index b44cbc73..41f6de93 100644 +--- a/OGLCompilersDLL/CMakeLists.txt ++++ b/OGLCompilersDLL/CMakeLists.txt +@@ -41,7 +41,7 @@ if(WIN32) + source_group("Source" FILES ${SOURCES}) + endif(WIN32) + +-if(ENABLE_GLSLANG_INSTALL AND NOT BUILD_SHARED_LIBS) ++if(ENABLE_GLSLANG_INSTALL) + install(TARGETS OGLCompiler EXPORT glslang-targets) + + # Backward compatibility +@@ -49,7 +49,7 @@ if(ENABLE_GLSLANG_INSTALL AND NOT BUILD_SHARED_LIBS) + message(WARNING \"Using `OGLCompilerTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\") + + if (NOT TARGET glslang::OGLCompiler) +- include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/glslang-targets.cmake\") ++ include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\") + endif() + + add_library(OGLCompiler ALIAS glslang::OGLCompiler) +diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt +index a8b14911..57ec1efd 100644 +--- a/glslang/CMakeLists.txt ++++ b/glslang/CMakeLists.txt +@@ -203,7 +203,7 @@ endif() + ################################################################################ + if(ENABLE_GLSLANG_INSTALL) + install(TARGETS glslang EXPORT glslang-targets) +- if(NOT BUILD_SHARED_LIBS) ++ if(BUILD_SHARED_LIBS) + install(TARGETS MachineIndependent EXPORT glslang-targets) + install(TARGETS GenericCodeGen EXPORT glslang-targets) + +diff --git a/glslang/OSDependent/Unix/CMakeLists.txt b/glslang/OSDependent/Unix/CMakeLists.txt +index 16eb939b..959788dc 100644 +--- a/glslang/OSDependent/Unix/CMakeLists.txt ++++ b/glslang/OSDependent/Unix/CMakeLists.txt +@@ -52,7 +52,7 @@ else() + target_link_libraries(OSDependent Threads::Threads) + endif() + +-if(ENABLE_GLSLANG_INSTALL AND NOT BUILD_SHARED_LIBS) ++if(ENABLE_GLSLANG_INSTALL) + install(TARGETS OSDependent EXPORT glslang-targets) + + # Backward compatibility +@@ -60,7 +60,7 @@ if(ENABLE_GLSLANG_INSTALL AND NOT BUILD_SHARED_LIBS) + message(WARNING \"Using `OSDependentTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\") + + if (NOT TARGET glslang::OSDependent) +- include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/glslang-targets.cmake\") ++ include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\") + endif() + + add_library(OSDependent ALIAS glslang::OSDependent) diff --git a/dev-util/glslang/glslang-1.3.231.ebuild b/dev-util/glslang/glslang-1.3.231-r1.ebuild index a87aaeeb9345..dc652e36d9b8 100644 --- a/dev-util/glslang/glslang-1.3.231.ebuild +++ b/dev-util/glslang/glslang-1.3.231-r1.ebuild @@ -19,8 +19,10 @@ fi DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator" HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https://github.com/KhronosGroup/glslang" +PATCHES=( "${FILESDIR}/${P}-Install-static-libs.patch" ) + LICENSE="BSD" -SLOT="0" +SLOT="0/1" BDEPEND="${PYTHON_DEPS}" diff --git a/dev-util/glslang/glslang-9999.ebuild b/dev-util/glslang/glslang-9999.ebuild index a87aaeeb9345..1f9728bad96e 100644 --- a/dev-util/glslang/glslang-9999.ebuild +++ b/dev-util/glslang/glslang-9999.ebuild @@ -19,8 +19,10 @@ fi DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator" HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https://github.com/KhronosGroup/glslang" +PATCHES=( "${FILESDIR}/${PN}-1.3.231-Install-static-libs.patch" ) + LICENSE="BSD" -SLOT="0" +SLOT="0/1" BDEPEND="${PYTHON_DEPS}" |