mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-05-08 17:39:24 +00:00
Code Issues Projects Releases Wiki Activity

spirv-tools: Fix multilib builds

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2019-12-20 07:26:14 -08:00
parent d396990e8a
commit 26090d61ec
2 changed files with 37 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-graphics/spir/files/0001-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-file.patch
+35
View File
@@ -0,0 +1,35 @@
From caf59c46ea5dc49e4dbf756c642b03e52c1b5468 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
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 <raj.khem@gmail.com>
---
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
meta-oe/recipes-graphics/spir/spirv-tools_git.bb
+2 -1
View File
@@ -9,11 +9,12 @@ SECTION = "graphics"
S = "${WORKDIR}/git"
DEST_DIR = "${S}/external"
SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;name=spirv-tools \
file://0001-tools-lesspipe-Allow-generic-shell.patch \
git://github.com/KhronosGroup/SPIRV-Headers.git;name=spirv-headers;destsuffix=${DEST_DIR}/spirv-headers \
git://github.com/google/effcee.git;name=effcee;destsuffix=${DEST_DIR}/effcee \
git://github.com/google/re2.git;name=re2;destsuffix=${DEST_DIR}/re2 \
git://github.com/google/googletest.git;name=googletest;destsuffix=${DEST_DIR}/googletest \
file://0001-tools-lesspipe-Allow-generic-shell.patch \
file://0001-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-file.patch \
"
SRCREV_spirv-tools = "167f1270a9ee641b17c016a545741e4aadfabe86"
SRCREV_spirv-headers = "4618b86e9e4b027a22040732dfee35e399cd2c47"