Skip to contentSkip to conversation

spirv-tools: python3 is need not only for the tests

PATCH New Jose Quaresma 1 participant 2 messages Mar 14, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 spirv-tools: python3 is need not only for the tests

commit acf109c1a1a30907f7401f6225fcbfb5f2e39a58 remove the python3native when disabling the tests but python is needed not only for the tests, so re add it.

---
 meta/recipes-graphics/spir/spirv-tools_2020.6.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/spir/spirv-tools_2020.6.bb +1 -1
index ea89766e92..bfd5d7932b 100644
@@ -14,7 +14,7 @@ SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git \
 UPSTREAM_CHECK_GITTAGREGEX = "^v(?P<pver>\d+(\.\d+)+)$"
 S = "${WORKDIR}/git"
 
-inherit cmake
+inherit cmake python3native
 
 DEPENDS = "spirv-headers"
 
Signature · 1 line
2.30.2
#1 lore raw

PATCH 2/2 spirv-tools: cleanup an old patch that is not used anymore

---
 ...STALL_LIBDIR-in-installed-CMake-file.patch | 35 -------------------
 1 file changed, 35 deletions(-)
 delete mode 100644 meta/recipes-graphics/spir/files/0001-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-file.patch
meta/recipes-graphics/spir/files/0001-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-file.patch deleted +0 -35
deleted file mode 100644
index 5d37da8fe0..0000000000
@@ -1,35 +0,0 @@
-From caf59c46ea5dc49e4dbf756c642b03e52c1b5468 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Fri, 20 Dec 2019 07:02:24 -0800
-Subject: [PATCH] Respect CMAKE_INSTALL_LIBDIR in installed CMake files
-
-Upstream-Status: Submitted [https://github.com/google/effcee/pull/36]
-Signed-off-by: Khem Raj <[email protected]>
----
- CMakeLists.txt        | 1 +
- effcee/CMakeLists.txt | 4 ++--
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
---- a/external/effcee/CMakeLists.txt
-+++ b/external/effcee/CMakeLists.txt
-@@ -27,6 +27,7 @@ endif()
- 
- include(cmake/setup_build.cmake)
- include(cmake/utils.cmake)
-+include(GNUInstallDirs)
- 
- add_subdirectory(third_party)
- add_subdirectory(effcee)
---- a/external/effcee/effcee/CMakeLists.txt
-+++ b/external/effcee/effcee/CMakeLists.txt
-@@ -14,8 +14,8 @@ install(
-   DESTINATION
-     include/effcee)
- install(TARGETS effcee
--  LIBRARY DESTINATION lib
--  ARCHIVE DESTINATION lib)
-+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
- 
- if(EFFCEE_BUILD_TESTING)
-   add_executable(effcee-test
Signature · 1 line
2.30.2