ghidra: fix build on gradle 8.12 (#374706)

2025-01-18 23:57:58 +03:00
parent debb4c5fec 8308da21f7
commit 620dd33909
2 changed files with 17 additions and 0 deletions
@@ -0,0 +1,13 @@
+diff --git a/gradle/hasPythonPackage.gradle b/gradle/hasPythonPackage.gradle
+index 2d83cf0cd3..8f3205f9ff 100644
+--- a/gradle/hasPythonPackage.gradle
+++ b/gradle/hasPythonPackage.gradle
+@@ -44,7 +44,7 @@ task buildPyPackage {
+ 	doLast {
+ 		File setuptools = project(":Debugger-rmi-trace").findPyDep(".")
+ 		exec {
+-			workingDir { "build/pypkg" }
+			workingDir { file("build/pypkg") }
+ 			commandLine	rootProject.PYTHON3, "-m", "pip"
+ 			args "wheel", "-w", "dist/", "--no-index", "--no-deps"
+ 			args "-f", setuptools
@@ -52,6 +52,10 @@ let

    # Remove build dates from output filenames for easier reference
    ./0003-Remove-build-datestamp.patch
+
+    # Fix build on Gradle 8.12
+    # Upstream: https://github.com/NationalSecurityAgency/ghidra/commit/20285e267d110cfa585676dfd40804a59031598b
+    ./0004-Fix-build-on-Gradle-8.12.patch
  ];

  postPatch = ''