diff options
| author | Andrew Geissler <geissonator@yahoo.com> | 2021-02-13 00:55:30 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2021-02-25 23:15:06 +0300 |
| commit | 706d5aacd7ab7b37c00df1a1b210e4ced06119e1 (patch) | |
| tree | ed0bec373424d01accfb2e9c895c177a3e2d7abe /poky/meta/recipes-graphics/shaderc/files/0003-cmake-de-vendor-libs-and-disable-git-versioning.patch | |
| parent | ac970dd705934286df062e0f1501f776dc2ef01d (diff) | |
| download | openbmc-706d5aacd7ab7b37c00df1a1b210e4ced06119e1.tar.xz | |
Reset poky to before our libpam hacks
Things got a bit out of synch with openbmc-config due to the libpam
issues and the migration from the meta-* layers.
Revert the two previous commits and then put the latest poky in with the
libpam revert and get openbmc-config right again.
Revert "Revert "libpam: update 1.3.1 -> 1.5.1""
This reverts commit 87ddd3eab4df68e624b5350ccaab28b3b97547c0.
Revert "poky: subtree update:796be0593a..10c69538c0"
This reverts commit c723b72979bfac6362509cf1fe086900f6641f28.
Change-Id: I3a1f405193aee6a21fe0cd24be9927c143a23d9a
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'poky/meta/recipes-graphics/shaderc/files/0003-cmake-de-vendor-libs-and-disable-git-versioning.patch')
| -rw-r--r-- | poky/meta/recipes-graphics/shaderc/files/0003-cmake-de-vendor-libs-and-disable-git-versioning.patch | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/poky/meta/recipes-graphics/shaderc/files/0003-cmake-de-vendor-libs-and-disable-git-versioning.patch b/poky/meta/recipes-graphics/shaderc/files/0003-cmake-de-vendor-libs-and-disable-git-versioning.patch index e4e3f0be1..0d58925ad 100644 --- a/poky/meta/recipes-graphics/shaderc/files/0003-cmake-de-vendor-libs-and-disable-git-versioning.patch +++ b/poky/meta/recipes-graphics/shaderc/files/0003-cmake-de-vendor-libs-and-disable-git-versioning.patch @@ -1,12 +1,11 @@ -From 180250f098e0ab899eff0db3708d9693f3486ff4 Mon Sep 17 00:00:00 2001 +From e092619a9ef7910ad56acfb8728c66f0125d176a Mon Sep 17 00:00:00 2001 From: Jose Quaresma <quaresma.jose@gmail.com> Date: Sat, 17 Oct 2020 12:51:50 +0100 -Subject: [PATCH] cmake: de-vendor libs and disable git versioning +Subject: [PATCH 3/3] cmake: de-vendor libs and disable git versioning Upstream-Status: Inappropriate [configuration] Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> - --- CMakeLists.txt | 2 -- glslc/CMakeLists.txt | 1 - @@ -15,15 +14,18 @@ Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> create mode 100644 glslc/src/build-version.inc diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5c74cd8..9451fbc 100644 +index a4e779b..cfa7bd8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -102,12 +102,10 @@ endif(MSVC) +@@ -70,7 +70,6 @@ endif(MSVC) # Configure subdirectories. # We depend on these for later projects, so they should come first. -add_subdirectory(third_party) + if(SHADERC_ENABLE_SPVC) + add_subdirectory(libshaderc_spvc) +@@ -79,7 +78,6 @@ endif() add_subdirectory(libshaderc_util) add_subdirectory(libshaderc) add_subdirectory(glslc) @@ -32,10 +34,10 @@ index 5c74cd8..9451fbc 100644 add_custom_target(build-version ${PYTHON_EXECUTABLE} diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt -index 35b3f19..52006b8 100644 +index 0f5d888..08686e0 100644 --- a/glslc/CMakeLists.txt +++ b/glslc/CMakeLists.txt -@@ -53,7 +53,6 @@ shaderc_default_compile_options(glslc_exe) +@@ -26,7 +26,6 @@ shaderc_default_compile_options(glslc_exe) target_include_directories(glslc_exe PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/.. ${spirv-tools_SOURCE_DIR}/include) set_target_properties(glslc_exe PROPERTIES OUTPUT_NAME glslc) target_link_libraries(glslc_exe PRIVATE glslc shaderc_util shaderc) @@ -46,3 +48,6 @@ index 35b3f19..52006b8 100644 diff --git a/glslc/src/build-version.inc b/glslc/src/build-version.inc new file mode 100644 index 0000000..e69de29 +-- +2.28.0 + |