From b92dfcb4b02f6f0971ff5f78b9c6ef4ab751e889 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 16 Aug 2022 10:27:54 -0700 Subject: spirv-tools: Remove default copy constructor in header Fixes build with when clang libc++ runtime is used. Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- ...-default-copy-constructor-in-header.-4879.patch | 34 ++++++++++++++++++++++ .../recipes-graphics/spir/spirv-tools_1.3.216.0.bb | 4 ++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-graphics/spir/spirv-tools/0001-Remove-default-copy-constructor-in-header.-4879.patch (limited to 'meta') diff --git a/meta/recipes-graphics/spir/spirv-tools/0001-Remove-default-copy-constructor-in-header.-4879.patch b/meta/recipes-graphics/spir/spirv-tools/0001-Remove-default-copy-constructor-in-header.-4879.patch new file mode 100644 index 0000000000..044c366a75 --- /dev/null +++ b/meta/recipes-graphics/spir/spirv-tools/0001-Remove-default-copy-constructor-in-header.-4879.patch @@ -0,0 +1,34 @@ +From a90ccc240501bf3362b23f67771f65b7dec2ccf9 Mon Sep 17 00:00:00 2001 +From: Jamie Madill +Date: Fri, 29 Jul 2022 14:26:37 -0400 +Subject: [PATCH] Remove default copy constructor in header. (#4879) + +A recent libc++ roll in Chrome warned of a deprecated copy. We're +still looking if this is a bug in libc++ or a valid warning, but +removing the redundant line is a safe workaround or fix in either +case. + +See discussion in https://crrev.com/c/3791771 + +Upstream-Status: Backport [https://github.com/KhronosGroup/SPIRV-Tools/pull/4879] +Signed-off-by: Khem Raj +--- + source/opt/merge_return_pass.h | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/source/opt/merge_return_pass.h b/source/opt/merge_return_pass.h +index a35cf269..d15db2f6 100644 +--- a/source/opt/merge_return_pass.h ++++ b/source/opt/merge_return_pass.h +@@ -118,8 +118,6 @@ class MergeReturnPass : public MemPass { + StructuredControlState(Instruction* break_merge, Instruction* merge) + : break_merge_(break_merge), current_merge_(merge) {} + +- StructuredControlState(const StructuredControlState&) = default; +- + bool InBreakable() const { return break_merge_; } + bool InStructuredFlow() const { return CurrentMergeId() != 0; } + +-- +2.37.2 + diff --git a/meta/recipes-graphics/spir/spirv-tools_1.3.216.0.bb b/meta/recipes-graphics/spir/spirv-tools_1.3.216.0.bb index eb907326c4..fc1074d8b8 100644 --- a/meta/recipes-graphics/spir/spirv-tools_1.3.216.0.bb +++ b/meta/recipes-graphics/spir/spirv-tools_1.3.216.0.bb @@ -8,7 +8,9 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" SRCREV = "c94501352d545e84c821ce031399e76d1af32d18" -SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=master;protocol=https" +SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=master;protocol=https \ + file://0001-Remove-default-copy-constructor-in-header.-4879.patch \ + " PE = "1" UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P\d+(\.\d+)+)" S = "${WORKDIR}/git" -- cgit 1.2.3-korg