diff options
| author | Orivej Desh <orivej@gmx.fr> | 2017-11-28 08:11:08 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2017-11-28 08:12:32 +0000 |
| commit | f8077b7ef114955ade79bd71ec1c0b2dfc8d98df (patch) | |
| tree | 6cfa5c65e5fb0b9c6f88370d73c4afd1ea51dce3 /pkgs/os-specific/linux/criu | |
| parent | c8a60e36e2521c0ef893b6faaa0aa64427bbbd60 (diff) | |
| download | nixpkgs-f8077b7ef114955ade79bd71ec1c0b2dfc8d98df.tar nixpkgs-f8077b7ef114955ade79bd71ec1c0b2dfc8d98df.tar.gz nixpkgs-f8077b7ef114955ade79bd71ec1c0b2dfc8d98df.tar.bz2 nixpkgs-f8077b7ef114955ade79bd71ec1c0b2dfc8d98df.tar.lz nixpkgs-f8077b7ef114955ade79bd71ec1c0b2dfc8d98df.tar.xz nixpkgs-f8077b7ef114955ade79bd71ec1c0b2dfc8d98df.tar.zst nixpkgs-f8077b7ef114955ade79bd71ec1c0b2dfc8d98df.zip | |
criu: fix build with glibc 2.26
Diffstat (limited to 'pkgs/os-specific/linux/criu')
| -rw-r--r-- | pkgs/os-specific/linux/criu/criu-2.12.1-glibc-2.26.patch | 13 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/criu/default.nix | 4 |
2 files changed, 16 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/criu/criu-2.12.1-glibc-2.26.patch b/pkgs/os-specific/linux/criu/criu-2.12.1-glibc-2.26.patch new file mode 100644 index 00000000000..916161e35a4 --- /dev/null +++ b/pkgs/os-specific/linux/criu/criu-2.12.1-glibc-2.26.patch @@ -0,0 +1,13 @@ +--- a/criu/cr-restore.c ++++ b/criu/cr-restore.c +@@ -650,3 +650,2 @@ static void zombie_prepare_signals(void) + (1 << SIGSYS) |\ +- (1 << SIGUNUSED)|\ + (1 << SIGSTKFLT)|\ +--- a/test/zdtm/static/pthread01.c ++++ b/test/zdtm/static/pthread01.c +@@ -45,3 +45,3 @@ static char *decode_signal(const sigset_t *s, char *buf) + COLLECT(SIGXFSZ); COLLECT(SIGVTALRM); COLLECT(SIGPROF); COLLECT(SIGWINCH); COLLECT(SIGIO); +- COLLECT(SIGPOLL); COLLECT(SIGPWR); COLLECT(SIGSYS); COLLECT(SIGUNUSED); ++ COLLECT(SIGPOLL); COLLECT(SIGPWR); COLLECT(SIGSYS); + #undef COLLECT diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix index 23d1c4821b8..4ceb397d9f8 100644 --- a/pkgs/os-specific/linux/criu/default.nix +++ b/pkgs/os-specific/linux/criu/default.nix @@ -11,11 +11,13 @@ stdenv.mkDerivation rec { sha256 = "18m0sjgcfvzc86w49fd3kxw145nmrsvc5w7zf42nxdiklmszbr1k"; }; + patches = [ ./criu-2.12.1-glibc-2.26.patch ]; + enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig docbook_xsl ]; buildInputs = [ protobuf protobufc asciidoc xmlto libpaper libnl libcap libnet python ]; - patchPhase = '' + postPatch = '' chmod +w ./scripts/gen-offsets.sh substituteInPlace ./scripts/gen-offsets.sh --replace hexdump ${utillinux}/bin/hexdump substituteInPlace ./Documentation/Makefile --replace "2>/dev/null" "" |