blob: c16e05112f9a60505fef5bfde55b60c04b6950f7 [file] [log] [blame]
Andrew Geissler5082cc72023-09-11 08:41:39 -04001From d998c753254649c7cf7c64e3fed78e41c11ad7ed Mon Sep 17 00:00:00 2001
2From: Richard Purdie <richard.purdie@linuxfoundation.org>
3Date: Wed, 23 Aug 2023 09:38:37 +0200
4Subject: [PATCH] vulkan-samples: Fix reproducibility issue
5
Andrew Geisslerd1e89492021-02-12 15:35:20 -06006There is code to remove the prefix CMAKE_SOURCE_DIR from __FILENAME__ paths
7used for logging with LOGE() in the code. We need to make this match the value we use
8in the debug source remapping from CFLAGS
9
10We export the right path to use in the recipe with:
11
Patrick Williamsac13d5f2023-11-24 18:59:46 -060012EXTRA_OECMAKE = "-DCMAKE_DEBUG_SRCDIR=${TARGET_DBGSRC_DIR}/"
Andrew Geisslerd1e89492021-02-12 15:35:20 -060013
14and we then patch this into the code instead of the broken use
15of CMAKE_SOURCE_DIR since __FILENAME__ will match our path prefix
16changes.
17
18This also breaks reproducibility since the path length of the build directory
19will currently change the output!
20
21Upstream-Status: Pending [needs to be discussed upstream]
22Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
23
Andrew Geissler5082cc72023-09-11 08:41:39 -040024Signed-off-by: Julien Stephan <jstephan@baylibre.com>
25---
26 bldsys/cmake/global_options.cmake | 2 +-
27 1 file changed, 1 insertion(+), 1 deletion(-)
28
29diff --git a/bldsys/cmake/global_options.cmake b/bldsys/cmake/global_options.cmake
30index b15c2da..d8952e5 100644
31--- a/bldsys/cmake/global_options.cmake
32+++ b/bldsys/cmake/global_options.cmake
33@@ -62,7 +62,7 @@ set(CMAKE_CXX_STANDARD 14)
Andrew Geisslerd1e89492021-02-12 15:35:20 -060034 set(CMAKE_DISABLE_SOURCE_CHANGES ON)
35 set(CMAKE_DISABLE_IN_SOURCE_BUILD ON)
36
37-string(LENGTH "${CMAKE_SOURCE_DIR}/" ROOT_PATH_SIZE)
38+string(LENGTH "${CMAKE_DEBUG_SRCDIR}/" ROOT_PATH_SIZE)
39 add_definitions(-DROOT_PATH_SIZE=${ROOT_PATH_SIZE})
40
41 set(CMAKE_C_FLAGS_DEBUG "-DDEBUG=0 ${CMAKE_C_FLAGS_DEBUG}")
Andrew Geissler5082cc72023-09-11 08:41:39 -040042--
432.41.0