summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2021-07-26 14:27:57 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2021-07-26 14:32:57 +0200
commitc56eee789b46631fa815f469a487e50fb674a6e8 (patch)
tree8b1927195d248ac153a9d3d328befcfabc98cf19
parent709de2ca8f5344e087510e091837bdc20a4612bc (diff)
downloadptxdist-c56eee789b46631fa815f469a487e50fb674a6e8.tar.gz
ptxdist-c56eee789b46631fa815f469a487e50fb674a6e8.tar.xz
shaderc: drop patch
This is actually caused by a gcc bug[1]. No OSELAS.Toolchain is affected by this. And the only default host compiler that has this issue is on Arch. And several other packages fail to built because of this as well. So lets just drop the patch. The issue will go away soon anyways. [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100392 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--patches/shaderc-v2021.0/0001-make-sure-the-generated-files-end-with-a-newline.patch77
-rw-r--r--patches/shaderc-v2021.0/series4
2 files changed, 0 insertions, 81 deletions
diff --git a/patches/shaderc-v2021.0/0001-make-sure-the-generated-files-end-with-a-newline.patch b/patches/shaderc-v2021.0/0001-make-sure-the-generated-files-end-with-a-newline.patch
deleted file mode 100644
index 2504c6e86..000000000
--- a/patches/shaderc-v2021.0/0001-make-sure-the-generated-files-end-with-a-newline.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Sun, 4 Jul 2021 08:53:07 +0200
-Subject: [PATCH] make sure the generated files end with a newline
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- third_party/spirv-tools/utils/generate_grammar_tables.py | 14 +++++++-------
- third_party/spirv-tools/utils/generate_registry_tables.py | 2 +-
- 2 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/third_party/spirv-tools/utils/generate_grammar_tables.py b/third_party/spirv-tools/utils/generate_grammar_tables.py
-index c4ed180ad108..6233837fcb61 100755
---- a/third_party/spirv-tools/utils/generate_grammar_tables.py
-+++ b/third_party/spirv-tools/utils/generate_grammar_tables.py
-@@ -829,18 +829,18 @@ def main():
- make_path_to_file(args.operand_kinds_output)
- with open(args.core_insts_output, 'w') as f:
- f.write(generate_instruction_table(
-- core_grammar['instructions']))
-+ core_grammar['instructions']) + '\n')
- with open(args.operand_kinds_output, 'w') as f:
-- f.write(generate_operand_kind_table(operand_kinds))
-+ f.write(generate_operand_kind_table(operand_kinds) + '\n')
- if args.extension_enum_output is not None:
- make_path_to_file(args.extension_enum_output)
- with open(args.extension_enum_output, 'w') as f:
-- f.write(generate_extension_enum(extensions))
-+ f.write(generate_extension_enum(extensions) + '\n')
- if args.enum_string_mapping_output is not None:
- make_path_to_file(args.enum_string_mapping_output)
- with open(args.enum_string_mapping_output, 'w') as f:
- f.write(generate_all_string_enum_mappings(
-- extensions, operand_kinds))
-+ extensions, operand_kinds) + '\n')
-
- if args.extinst_glsl_grammar is not None:
- with open(args.extinst_glsl_grammar) as json_file:
-@@ -848,7 +848,7 @@ def main():
- make_path_to_file(args.glsl_insts_output)
- with open(args.glsl_insts_output, 'w') as f:
- f.write(generate_extended_instruction_table(
-- grammar, 'glsl'))
-+ grammar, 'glsl') + '\n')
-
- if args.extinst_opencl_grammar is not None:
- with open(args.extinst_opencl_grammar) as json_file:
-@@ -856,7 +856,7 @@ def main():
- make_path_to_file(args.opencl_insts_output)
- with open(args.opencl_insts_output, 'w') as f:
- f.write(generate_extended_instruction_table(
-- grammar, 'opencl'))
-+ grammar, 'opencl') + '\n')
-
- if args.extinst_vendor_grammar is not None:
- with open(args.extinst_vendor_grammar) as json_file:
-@@ -867,7 +867,7 @@ def main():
- name = name[start:-len('.grammar.json')].replace('-', '_')
- with open(args.vendor_insts_output, 'w') as f:
- f.write(generate_extended_instruction_table(
-- grammar, name, args.vendor_operand_kind_prefix))
-+ grammar, name, args.vendor_operand_kind_prefix) + '\n')
-
-
- if __name__ == '__main__':
-diff --git a/third_party/spirv-tools/utils/generate_registry_tables.py b/third_party/spirv-tools/utils/generate_registry_tables.py
-index 28152ef3eb07..a08a5734e99a 100755
---- a/third_party/spirv-tools/utils/generate_registry_tables.py
-+++ b/third_party/spirv-tools/utils/generate_registry_tables.py
-@@ -83,7 +83,7 @@ def main():
-
- mkdir_p(os.path.dirname(args.generator_output))
- with open(args.generator_output, 'w') as f:
-- f.write(generate_vendor_table(registry))
-+ f.write(generate_vendor_table(registry) + '\n')
-
-
- if __name__ == '__main__':
diff --git a/patches/shaderc-v2021.0/series b/patches/shaderc-v2021.0/series
deleted file mode 100644
index 02c15c19f..000000000
--- a/patches/shaderc-v2021.0/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-make-sure-the-generated-files-end-with-a-newline.patch
-# c67a9e12bff18f525a03683a01188de8 - git-ptx-patches magic