summary refs log tree commit diff
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2019-02-19 18:01:18 +0100
committerVladimír Čunát <vcunat@gmail.com>2019-02-19 18:02:29 +0100
commitbdd47aaf831fbefb60ac1a2681025b3ba73edf68 (patch)
tree29077cfe52bf3c8deb6a7e37fa24f5e6e91d7f07
parent024407bf9adeadc115eeeb3fdf8dba166ea17d7c (diff)
downloadnixpkgs-bdd47aaf831fbefb60ac1a2681025b3ba73edf68.tar
nixpkgs-bdd47aaf831fbefb60ac1a2681025b3ba73edf68.tar.gz
nixpkgs-bdd47aaf831fbefb60ac1a2681025b3ba73edf68.tar.bz2
nixpkgs-bdd47aaf831fbefb60ac1a2681025b3ba73edf68.tar.lz
nixpkgs-bdd47aaf831fbefb60ac1a2681025b3ba73edf68.tar.xz
nixpkgs-bdd47aaf831fbefb60ac1a2681025b3ba73edf68.tar.zst
nixpkgs-bdd47aaf831fbefb60ac1a2681025b3ba73edf68.zip
gcl*: fix with updated binutils
The patch was taken from Debian; they apparently don't have a src repo.
-rw-r--r--pkgs/development/compilers/gcl/2.6.13-pre.nix5
-rw-r--r--pkgs/development/compilers/gcl/default.nix6
2 files changed, 11 insertions, 0 deletions
diff --git a/pkgs/development/compilers/gcl/2.6.13-pre.nix b/pkgs/development/compilers/gcl/2.6.13-pre.nix
index 2ea95b332fe..16450cf24ab 100644
--- a/pkgs/development/compilers/gcl/2.6.13-pre.nix
+++ b/pkgs/development/compilers/gcl/2.6.13-pre.nix
@@ -19,6 +19,11 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     sed -e 's/<= obj-date/<= (if (= 0 obj-date) 1 obj-date)/' -i lsp/make.lisp
+  ''
+  # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=902475
+  + ''
+    substituteInPlace h/elf64_i386_reloc.h \
+      --replace 'case R_X86_64_PC32:' 'case R_X86_64_PC32: case R_X86_64_PLT32:'
   '';
 
   sourceRoot = "gcl/gcl";
diff --git a/pkgs/development/compilers/gcl/default.nix b/pkgs/development/compilers/gcl/default.nix
index 643dd4b7dbd..50d397d2cd4 100644
--- a/pkgs/development/compilers/gcl/default.nix
+++ b/pkgs/development/compilers/gcl/default.nix
@@ -21,6 +21,12 @@ stdenv.mkDerivation rec {
     sha256 = "00jbsn0qp8ki2w7dx8caha7g2hr9076xa6bg48j3qqqncff93zdh";
   })];
 
+  # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=902475
+  postPatch = ''
+    substituteInPlace h/elf64_i386_reloc.h \
+      --replace 'case R_X86_64_PC32:' 'case R_X86_64_PC32: case R_X86_64_PLT32:'
+  '';
+
   buildInputs = [
     mpfr m4 binutils emacs gmp
     libX11 xorgproto libXi