diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/hotpatch')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/hotpatch/default.nix | 2 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/hotpatch/no-loader-test.patch | 25 |
2 files changed, 27 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/libraries/hotpatch/default.nix b/nixpkgs/pkgs/development/libraries/hotpatch/default.nix index 84803159a2b3..66be524a86ca 100644 --- a/nixpkgs/pkgs/development/libraries/hotpatch/default.nix +++ b/nixpkgs/pkgs/development/libraries/hotpatch/default.nix @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { LD_LIBRARY_PATH=$(pwd)/src make test ''; + patches = [ ./no-loader-test.patch ]; + meta = with lib; { description = "Hot patching executables on Linux using .so file injection"; homepage = src.meta.homepage; diff --git a/nixpkgs/pkgs/development/libraries/hotpatch/no-loader-test.patch b/nixpkgs/pkgs/development/libraries/hotpatch/no-loader-test.patch new file mode 100644 index 000000000000..5bc975bb848a --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/hotpatch/no-loader-test.patch @@ -0,0 +1,25 @@ +diff --git a/test/loader.c b/test/loader.c +index 4e3dfdc..7f98d94 100644 +--- a/test/loader.c ++++ b/test/loader.c +@@ -54,20 +54,6 @@ int main(int argc, char **argv) + assert(ret < 0); + ret = ld_find_library(maps, mapnum, "libc", false, NULL, 6); + assert(ret >= 0); +-#if __WORDSIZE == 64 +- ret = ld_find_library(maps, mapnum, "/lib64/ld-linux-x86-64.so.2", +- true, NULL, 6); +- assert(ret >= 0); +- ret = ld_find_library(maps, mapnum, "/lib/ld-linux-x86-64.so.2", +- false, NULL, 6); +-#else +- ret = ld_find_library(maps, mapnum, "/lib/ld-linux.so.2", +- true, NULL, 6); +- assert(ret >= 0); +- ret = ld_find_library(maps, mapnum, "/lib32/ld-linux.so.2", +- false, NULL, 6); +-#endif +- assert(ret < 0); + ld_free_maps(maps, mapnum); + return 0; + } |