Merge pull request #208327 from trofi/gdb-fix-for-readline

gdb: backport readline-8.2 fix
This commit is contained in:
Sergei Trofimovich 2022-12-30 15:56:20 +00:00 committed by GitHub
commit eedd93a413
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,7 +1,7 @@
{ lib, stdenv, targetPackages
# Build time
, fetchurl, pkg-config, perl, texinfo, setupDebugInfoDirs, buildPackages
, fetchurl, fetchpatch, pkg-config, perl, texinfo, setupDebugInfoDirs, buildPackages
# Run time
, ncurses, readline, gmp, mpfr, expat, libipt, zlib, dejagnu, sourceHighlight
@ -47,6 +47,12 @@ stdenv.mkDerivation rec {
patches = [
./debug-info-from-env.patch
# backport readline=8.2 support
(fetchpatch {
name = "readline-8.2.patch";
url = "https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff_plain;h=1add37b567a7dee39d99f37b37802034c3fce9c4";
hash = "sha256-KmQXylPAWNGXF8wtXCCArhUzHi+GUY8ii2Xpx8R08jE=";
})
] ++ lib.optionals stdenv.isDarwin [
./darwin-target-match.patch
# Does not nave to be conditional. We apply it conditionally