dmtcp: 2.6.0 -> unstable-2021-03-01

Fixes build for glibc-2.33. The upstream patches don't really apply
after 600 different changes so it makes sense to bump the package now.
This commit is contained in:
Maximilian Bosch 2021-05-31 13:41:21 +02:00 committed by Vladimír Čunát
parent c1d014a975
commit d3a7d11e5c
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
2 changed files with 13 additions and 11 deletions

View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "dmtcp";
version = "2.6.0";
version = "unstable-2021-03-01";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
sha256 = "01skyhr573w1dygvkwz66lvir2jsq443fjwkysglwxvmrdfz9kwd";
rev = "f999adbb8e88fe452a0e57ceb43b6eed7b4409f9";
sha256 = "sha256-codCHQui3fGfUZSNq8GuH4ad/GjD6I/S9rX83o8oFPc=";
};
dontDisableStatic = true;
@ -23,9 +23,9 @@ stdenv.mkDerivation rec {
substituteInPlace configure \
--replace '#define ELF_INTERPRETER "$interp"' \
"#define ELF_INTERPRETER \"$(cat $NIX_CC/nix-support/dynamic-linker)\""
substituteInPlace src/dmtcp_coordinator.cpp \
substituteInPlace src/restartscript.cpp \
--replace /bin/bash ${stdenv.shell}
substituteInPlace util/gdb-add-symbol-file \
substituteInPlace util/dmtcp_restart_wrapper.sh \
--replace /bin/bash ${stdenv.shell}
substituteInPlace test/autotest.py \
--replace /bin/bash ${bash}/bin/bash \

View file

@ -1,11 +1,13 @@
--- dmtcp-2.5.1-src/src/util_exec.cpp 2017-09-19 13:36:22.947587034 +0200
+++ dmtcp-2.5.1-src/src/util_exec.cpp 2017-09-19 13:36:32.221313460 +0200
@@ -178,7 +178,7 @@
static string ld_linux_so_path(int version, bool is32bitElf = false)
diff --git a/src/util_exec.cpp b/src/util_exec.cpp
index 0e8a13c1..0cc99c1e 100644
--- a/src/util_exec.cpp
+++ b/src/util_exec.cpp
@@ -300,7 +300,7 @@ Util::elfType(const char *pathname, bool *isElf, bool *is32bitElf)
static string
ld_linux_so_path(int version, bool is32bitElf = false)
{
- char buf[80];
+ char buf[128];
#if (defined(__x86_64__) || defined(__aarch64__)) && !defined(CONFIG_M32)
if (is32bitElf) {
sprintf(buf, "/lib/ld-linux.so.%d", version);