| Message ID | 20231116224836.2696913-9-martin.jansa@gmail.com |
|---|---|
| State | Accepted, archived |
| Commit | 23c40b46af0ede566b854fdeaeae9675c2f48549 |
| Headers | show |
| Series | [PATCHv4,01/12] bitbake.conf: drop ${PE} and ${PR} from -f{file,macro,debug}-prefix-map | expand |
diff --git a/meta/recipes-graphics/vulkan/vulkan-samples/0001-vulkan-samples-Fix-reproducibility-issue.patch b/meta/recipes-graphics/vulkan/vulkan-samples/0001-vulkan-samples-Fix-reproducibility-issue.patch index 7609011421..c16e05112f 100644 --- a/meta/recipes-graphics/vulkan/vulkan-samples/0001-vulkan-samples-Fix-reproducibility-issue.patch +++ b/meta/recipes-graphics/vulkan/vulkan-samples/0001-vulkan-samples-Fix-reproducibility-issue.patch @@ -9,7 +9,7 @@ in the debug source remapping from CFLAGS We export the right path to use in the recipe with: -EXTRA_OECMAKE = "-DCMAKE_DEBUG_SRCDIR=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}/" +EXTRA_OECMAKE = "-DCMAKE_DEBUG_SRCDIR=${TARGET_DBGSRC_DIR}/" and we then patch this into the code instead of the broken use of CMAKE_SOURCE_DIR since __FILENAME__ will match our path prefix diff --git a/meta/recipes-graphics/vulkan/vulkan-samples_git.bb b/meta/recipes-graphics/vulkan/vulkan-samples_git.bb index 66f1ef5e9d..d60c0f3190 100644 --- a/meta/recipes-graphics/vulkan/vulkan-samples_git.bb +++ b/meta/recipes-graphics/vulkan/vulkan-samples_git.bb @@ -29,7 +29,7 @@ FILES:${PN} += "${datadir}" # used for logging with LOGE in the code. We need to make this match the value we use # in the debug source remapping from CFLAGS # -EXTRA_OECMAKE += "-DCMAKE_DEBUG_SRCDIR=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}/" +EXTRA_OECMAKE += "-DCMAKE_DEBUG_SRCDIR=${TARGET_DBGSRC_DIR}/" # Binaries built with PCH enabled don't appear reproducible, differing results were seen # from some builds depending on the point the PCH was compiled. Disable it to be # deterministic
Signed-off-by: Martin Jansa <martin.jansa@gmail.com> --- .../0001-vulkan-samples-Fix-reproducibility-issue.patch | 2 +- meta/recipes-graphics/vulkan/vulkan-samples_git.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)