pahole: 1.29 -> 1.30

pahole 1.30 has become reproducible by default (and the reproducible option is
now noop), so remove our patch
This commit is contained in:
Dominique Martinet
2025-05-28 14:59:43 +09:00
parent 18ca00d03e
commit 105a92c4ef
2 changed files with 2 additions and 20 deletions
+2 -7
View File
@@ -14,10 +14,10 @@
stdenv.mkDerivation rec {
pname = "pahole";
version = "1.29";
version = "1.30";
src = fetchzip {
url = "https://git.kernel.org/pub/scm/devel/pahole/pahole.git/snapshot/pahole-${version}.tar.gz";
hash = "sha256-ke7WIIz0ZURw3Pgmt7WNL9WPbcv5B998Rflw/8/JQ8U=";
hash = "sha256-JF4KnI05uOlPuunJuetX/fX3ZRT6TDXdjCNG9/ufkgI=";
};
nativeBuildInputs = [
@@ -35,11 +35,6 @@ stdenv.mkDerivation rec {
musl-obstack
];
patches = [
# https://github.com/acmel/dwarves/pull/51 / https://lkml.kernel.org/r/20240626032253.3406460-1-asmadeus@codewreck.org
./threading-reproducibility.patch
];
# Put libraries in "lib" subdirectory, not top level of $out
cmakeFlags = [
"-DCMAKE_INSTALL_LIBDIR=lib"
@@ -1,13 +0,0 @@
--- a/pahole.c
+++ b/pahole.c
@@ -3705,6 +3705,10 @@ int main(int argc, char *argv[])
goto out;
}
+ /* This being set means whoever called us tries to do a reproducible build */
+ if (getenv("SOURCE_DATE_EPOCH"))
+ conf_load.reproducible_build = true;
+
if (show_running_kernel_vmlinux) {
const char *vmlinux = vmlinux_path__find_running_kernel();