diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-07-09 15:43:36 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-07-09 15:43:36 +0100 |
commit | 2719f73b6813d11d13a9650cdd2ab8ec6e69385d (patch) | |
tree | 8c816148bcbd22757d892089c989ae614eae4f5a /dev-util/rizin/files | |
parent | 0f558761aa2dee1017b4751e4017205e015a9560 (diff) |
gentoo resync : 09.07.2022
Diffstat (limited to 'dev-util/rizin/files')
-rw-r--r-- | dev-util/rizin/files/rizin-0.4.0-capstone.patch | 22 | ||||
-rw-r--r-- | dev-util/rizin/files/rizin-0.4.0-never-rebuild-parser.patch | 38 |
2 files changed, 60 insertions, 0 deletions
diff --git a/dev-util/rizin/files/rizin-0.4.0-capstone.patch b/dev-util/rizin/files/rizin-0.4.0-capstone.patch new file mode 100644 index 000000000000..4132e97095f6 --- /dev/null +++ b/dev-util/rizin/files/rizin-0.4.0-capstone.patch @@ -0,0 +1,22 @@ +From 2b8104bc5e763ed841d6dbffacbeaf02e86b8421 Mon Sep 17 00:00:00 2001 +From: Mario Haustein <mario.haustein@hrz.tu-chemnitz.de> +Date: Thu, 7 Jul 2022 07:50:10 +0200 +Subject: [PATCH] Fix capstone include directory + +--- + librz/analysis/arch/arm/arm_il64.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/librz/analysis/arch/arm/arm_il64.c b/librz/analysis/arch/arm/arm_il64.c +index 2e9da10aece..6b552596c9e 100644 +--- a/librz/analysis/arch/arm/arm_il64.c ++++ b/librz/analysis/arch/arm/arm_il64.c +@@ -2,7 +2,7 @@ + // SPDX-License-Identifier: LGPL-3.0-only + + #include <rz_analysis.h> +-#include <capstone.h> ++#include <capstone/capstone.h> + + #include "arm_cs.h" + diff --git a/dev-util/rizin/files/rizin-0.4.0-never-rebuild-parser.patch b/dev-util/rizin/files/rizin-0.4.0-never-rebuild-parser.patch new file mode 100644 index 000000000000..0e6e95c09318 --- /dev/null +++ b/dev-util/rizin/files/rizin-0.4.0-never-rebuild-parser.patch @@ -0,0 +1,38 @@ +commit 7af437dbedaaa478b579d19133b6711923b037d8 +Author: John Helmert III <ajak@gentoo.org> +Date: Mon Jul 4 12:44:43 2022 -0500 + + subprojects/rizin-shell-parser/src: Never rebuild parser.c + + This requires dev-libs/tree-sitter[ts-cli] and net-libs/nodejs, both + of which would be heavy new dependencies. However, these are only + needed to rebuild the already-existing tree-sitter parser, which + doesn't do much for us (if anything) since it already exists. In this + case, it's better to just reduce fragility by unconditionally + disabling this. + + Newly forward-ported from the 0.3.2 version. + + Bug: https://bugs.gentoo.org/830068 + Signed-off-by: John Helmert III <ajak@gentoo.org> + +diff --git a/subprojects/rizin-shell-parser/src/meson.build b/subprojects/rizin-shell-parser/src/meson.build +index ae31896a98..14324daba0 100644 +--- a/subprojects/rizin-shell-parser/src/meson.build ++++ b/subprojects/rizin-shell-parser/src/meson.build +@@ -1,14 +1,4 @@ +-tree_sitter_bin = find_program('tree-sitter', required: false) +-node_bin = find_program('node', required: false) +-if tree_sitter_bin.found() and node_bin.found() and tree_sitter_dep.type_name() != 'internal' +- parser_c = custom_target('parser_src_c', +- command: [tree_sitter_wrap_py, tree_sitter_bin, '@OUTDIR@/..', '@INPUT@'], +- input: [grammar_js], +- output: 'parser.c', +- ) +-else +- parser_c = files('parser.c') +-endif ++parser_c = files('parser.c') + + shell_parser_files = [files('scanner.c'), parser_c] + shell_parser_inc = [include_directories('tree_sitter')] |