forked from mirrors/nixpkgs
e9c8925d1b
A very ugly decision: in order to register the diff between 0.57 and 0.60 releases of Meson in Nixpkgs, I copied the whole directory before actually write it by hand.
21 lines
889 B
Diff
21 lines
889 B
Diff
diff --git a/mesonbuild/scripts/depfixer.py b/mesonbuild/scripts/depfixer.py
|
||
index 4176b9a03..faaabf616 100644
|
||
--- a/mesonbuild/scripts/depfixer.py
|
||
+++ b/mesonbuild/scripts/depfixer.py
|
||
@@ -336,6 +336,15 @@ class Elf(DataSizes):
|
||
if not new_rpath:
|
||
self.remove_rpath_entry(entrynum)
|
||
else:
|
||
+ # Clear old rpath to avoid stale references,
|
||
+ # not heeding the warning above about de-duplication
|
||
+ # since it does not seem to cause issues for us
|
||
+ # and not doing so trips up Nix’s reference checker.
|
||
+ # See https://github.com/NixOS/nixpkgs/pull/46020
|
||
+ # and https://github.com/NixOS/nixpkgs/issues/95163
|
||
+ self.bf.seek(rp_off)
|
||
+ self.bf.write(b'\0'*len(old_rpath))
|
||
+
|
||
self.bf.seek(rp_off)
|
||
self.bf.write(new_rpath)
|
||
self.bf.write(b'\0')
|