ghidra: always use our protoc

This commit is contained in:
Andrew Benson 2023-05-12 19:01:10 -05:00
parent 3336e65a7f
commit 08b050dd2f
2 changed files with 37 additions and 1 deletions

View file

@ -0,0 +1,36 @@
--- ghidra-10.3/ghidra_build/Ghidra/Debug/Debugger-gadp/build.gradle.orig
+++ ghidra-10.3/ghidra_build/Ghidra/Debug/Debugger-gadp/build.gradle
@@ -81,14 +81,9 @@
ext.outdir = file("build/generated/source/proto/main/java")
outputs.dir(outdir)
inputs.files(src)
- dependsOn(configurations.protocArtifact)
doLast {
- def exe = configurations.protocArtifact.first()
- if (!isCurrentWindows()) {
- exe.setExecutable(true)
- }
exec {
- commandLine exe, "--java_out=$outdir", "-I$srcdir"
+ commandLine '/usr/bin/protoc', "--java_out=$outdir", "-I$srcdir"
args src
}
}
--- ghidra-10.3/ghidra_build/Ghidra/Debug/Debugger-isf/build.gradle.orig
+++ ghidra-10.3/ghidra_build/Ghidra/Debug/Debugger-isf/build.gradle
@@ -72,14 +72,9 @@
ext.outdir = file("build/generated/source/proto/main/java")
outputs.dir(outdir)
inputs.files(src)
- dependsOn(configurations.protocArtifact)
doLast {
- def exe = configurations.protocArtifact.first()
- if (!isCurrentWindows()) {
- exe.setExecutable(true)
- }
exec {
- commandLine exe, "--java_out=$outdir", "-I$srcdir"
+ commandLine '/usr/bin/protoc', "--java_out=$outdir", "-I$srcdir"
args src
}
}

View file

@ -1,7 +1,7 @@
# Template file for 'ghidra'
pkgname=ghidra
version=10.3
revision=1
revision=2
_dex_ver=2.1
_yajsw_ver=13.09
archs="x86_64* aarch64*"