pyrox.dev
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.
authored by Maximilian Bosch and committed by Vladimír Čunát d3a7d11e c1d014a9
+5
-5
pkgs/os-specific/linux/dmtcp/default.nix
+5
-5
pkgs/os-specific/linux/dmtcp/default.nix
···
4
5
stdenv.mkDerivation rec {
6
pname = "dmtcp";
7
-
version = "2.6.0";
8
9
src = fetchFromGitHub {
10
owner = pname;
11
repo = pname;
12
-
rev = version;
13
-
sha256 = "01skyhr573w1dygvkwz66lvir2jsq443fjwkysglwxvmrdfz9kwd";
14
};
15
16
dontDisableStatic = true;
···
23
substituteInPlace configure \
24
--replace '#define ELF_INTERPRETER "$interp"' \
25
"#define ELF_INTERPRETER \"$(cat $NIX_CC/nix-support/dynamic-linker)\""
26
-
substituteInPlace src/dmtcp_coordinator.cpp \
27
--replace /bin/bash ${stdenv.shell}
28
-
substituteInPlace util/gdb-add-symbol-file \
29
--replace /bin/bash ${stdenv.shell}
30
substituteInPlace test/autotest.py \
31
--replace /bin/bash ${bash}/bin/bash \
···
4
5
stdenv.mkDerivation rec {
6
pname = "dmtcp";
7
+
version = "unstable-2021-03-01";
8
9
src = fetchFromGitHub {
10
owner = pname;
11
repo = pname;
12
+
rev = "f999adbb8e88fe452a0e57ceb43b6eed7b4409f9";
13
+
sha256 = "sha256-codCHQui3fGfUZSNq8GuH4ad/GjD6I/S9rX83o8oFPc=";
14
};
15
16
dontDisableStatic = true;
···
23
substituteInPlace configure \
24
--replace '#define ELF_INTERPRETER "$interp"' \
25
"#define ELF_INTERPRETER \"$(cat $NIX_CC/nix-support/dynamic-linker)\""
26
+
substituteInPlace src/restartscript.cpp \
27
--replace /bin/bash ${stdenv.shell}
28
+
substituteInPlace util/dmtcp_restart_wrapper.sh \
29
--replace /bin/bash ${stdenv.shell}
30
substituteInPlace test/autotest.py \
31
--replace /bin/bash ${bash}/bin/bash \
+8
-6
pkgs/os-specific/linux/dmtcp/ld-linux-so-buffer-size.patch
+8
-6
pkgs/os-specific/linux/dmtcp/ld-linux-so-buffer-size.patch
···
1
-
--- dmtcp-2.5.1-src/src/util_exec.cpp 2017-09-19 13:36:22.947587034 +0200
2
-
+++ dmtcp-2.5.1-src/src/util_exec.cpp 2017-09-19 13:36:32.221313460 +0200
3
-
@@ -178,7 +178,7 @@
4
-
5
-
static string ld_linux_so_path(int version, bool is32bitElf = false)
6
{
7
- char buf[80];
8
+ char buf[128];
9
#if (defined(__x86_64__) || defined(__aarch64__)) && !defined(CONFIG_M32)
10
if (is32bitElf) {
11
-
sprintf(buf, "/lib/ld-linux.so.%d", version);
···
1
+
diff --git a/src/util_exec.cpp b/src/util_exec.cpp
2
+
index 0e8a13c1..0cc99c1e 100644
3
+
--- a/src/util_exec.cpp
4
+
+++ b/src/util_exec.cpp
5
+
@@ -300,7 +300,7 @@ Util::elfType(const char *pathname, bool *isElf, bool *is32bitElf)
6
+
static string
7
+
ld_linux_so_path(int version, bool is32bitElf = false)
8
{
9
- char buf[80];
10
+ char buf[128];
11
+
12
#if (defined(__x86_64__) || defined(__aarch64__)) && !defined(CONFIG_M32)
13
if (is32bitElf) {