uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
68
pkgs/development/tools/misc/gdb/32-bit-BFD_VMA-format.patch
Normal file
68
pkgs/development/tools/misc/gdb/32-bit-BFD_VMA-format.patch
Normal file
|
|
@ -0,0 +1,68 @@
|
|||
Fix iWerror=format build for 32-bit systems.
|
||||
https://sourceware.org/pipermail/gdb-patches/2022-May/189288.html
|
||||
--- a/sim/cris/sim-if.c
|
||||
+++ b/sim/cris/sim-if.c
|
||||
@@ -257,7 +257,8 @@ cris_load_elf_file (SIM_DESC sd, struct bfd *abfd, sim_write_fn do_write)
|
||||
|
||||
if (verbose)
|
||||
sim_io_printf (sd,
|
||||
- "Loading segment at 0x%" BFD_VMA_FMT "x, size 0x%lx\n",
|
||||
+ "Loading segment at 0x%" BFD_VMA_FMT "x, "
|
||||
+ "size 0x%" BFD_VMA_FMT "x\n",
|
||||
lma, phdr[i].p_filesz);
|
||||
|
||||
if (bfd_seek (abfd, phdr[i].p_offset, SEEK_SET) != 0
|
||||
@@ -265,7 +266,7 @@ cris_load_elf_file (SIM_DESC sd, struct bfd *abfd, sim_write_fn do_write)
|
||||
{
|
||||
sim_io_eprintf (sd,
|
||||
"%s: could not read segment at 0x%" BFD_VMA_FMT "x, "
|
||||
- "size 0x%lx\n",
|
||||
+ "size 0x%" BFD_VMA_FMT "x\n",
|
||||
STATE_MY_NAME (sd), lma, phdr[i].p_filesz);
|
||||
free (buf);
|
||||
return FALSE;
|
||||
@@ -275,7 +276,7 @@ cris_load_elf_file (SIM_DESC sd, struct bfd *abfd, sim_write_fn do_write)
|
||||
{
|
||||
sim_io_eprintf (sd,
|
||||
"%s: could not load segment at 0x%" BFD_VMA_FMT "x, "
|
||||
- "size 0x%lx\n",
|
||||
+ "size 0x%" BFD_VMA_FMT "x\n",
|
||||
STATE_MY_NAME (sd), lma, phdr[i].p_filesz);
|
||||
free (buf);
|
||||
return FALSE;
|
||||
@@ -572,7 +573,8 @@ cris_handle_interpreter (SIM_DESC sd, struct bfd *abfd)
|
||||
memory area, so we go via a temporary area. Luckily, the
|
||||
interpreter is supposed to be small, less than 0x40000
|
||||
bytes. */
|
||||
- sim_do_commandf (sd, "memory region 0x%" BFD_VMA_FMT "x,0x%lx",
|
||||
+ sim_do_commandf (sd, "memory region 0x%" BFD_VMA_FMT "x,"
|
||||
+ "0x%" BFD_VMA_FMT "x",
|
||||
interp_load_addr, interpsiz);
|
||||
|
||||
/* Now that memory for the interpreter is defined, load it. */
|
||||
--- a/sim/m32c/syscalls.c
|
||||
+++ b/sim/m32c/syscalls.c
|
||||
@@ -299,8 +299,8 @@ m32c_syscall (int id)
|
||||
|
||||
rv = gettimeofday (&tv, 0);
|
||||
if (trace)
|
||||
- printf ("gettimeofday: %ld sec %ld usec to 0x%x\n", tv.tv_sec,
|
||||
- tv.tv_usec, tvaddr);
|
||||
+ printf ("gettimeofday: %lld sec %lld usec to 0x%x\n",
|
||||
+ (long long)tv.tv_sec, (long long)tv.tv_usec, tvaddr);
|
||||
mem_put_si (tvaddr, tv.tv_sec);
|
||||
mem_put_si (tvaddr + 4, tv.tv_usec);
|
||||
put_reg (r0, rv);
|
||||
--- a/sim/rx/syscalls.c
|
||||
+++ b/sim/rx/syscalls.c
|
||||
@@ -270,8 +270,8 @@ rx_syscall (int id)
|
||||
|
||||
rv = gettimeofday (&tv, 0);
|
||||
if (trace)
|
||||
- printf ("gettimeofday: %ld sec %ld usec to 0x%x\n", tv.tv_sec,
|
||||
- tv.tv_usec, tvaddr);
|
||||
+ printf ("gettimeofday: %lld sec %lld usec to 0x%x\n",
|
||||
+ (long long)tv.tv_sec, (long long)tv.tv_usec, tvaddr);
|
||||
mem_put_si (tvaddr, tv.tv_sec);
|
||||
mem_put_si (tvaddr + 4, tv.tv_usec);
|
||||
put_reg (1, rv);
|
||||
11
pkgs/development/tools/misc/gdb/darwin-target-match.patch
Normal file
11
pkgs/development/tools/misc/gdb/darwin-target-match.patch
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
--- a/configure 2017-06-05 00:51:26.000000000 +0900
|
||||
+++ b/configure 2018-03-06 23:12:58.000000000 +0900
|
||||
@@ -3644,7 +3644,7 @@
|
||||
noconfigdirs="$noconfigdirs ld gprof"
|
||||
noconfigdirs="$noconfigdirs sim target-rda"
|
||||
;;
|
||||
- x86_64-*-darwin[912]*)
|
||||
+ x86_64-*-darwin*)
|
||||
noconfigdirs="$noconfigdirs ld gas gprof"
|
||||
noconfigdirs="$noconfigdirs sim target-rda"
|
||||
;;
|
||||
17
pkgs/development/tools/misc/gdb/debug-info-from-env.patch
Normal file
17
pkgs/development/tools/misc/gdb/debug-info-from-env.patch
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
--- a/gdb/main.c
|
||||
+++ b/gdb/main.c
|
||||
@@ -708,8 +708,12 @@ captured_main_1 (struct captured_main_args *context)
|
||||
if (gdb_sysroot.empty ())
|
||||
gdb_sysroot = TARGET_SYSROOT_PREFIX;
|
||||
|
||||
- debug_file_directory
|
||||
- = relocate_gdb_directory (DEBUGDIR, DEBUGDIR_RELOCATABLE);
|
||||
+ const char * nix_debug = getenv ("NIX_DEBUG_INFO_DIRS");
|
||||
+ if (nix_debug != NULL)
|
||||
+ debug_file_directory = nix_debug;
|
||||
+ else
|
||||
+ debug_file_directory
|
||||
+ = relocate_gdb_directory (DEBUGDIR, DEBUGDIR_RELOCATABLE);
|
||||
|
||||
gdb_datadir = relocate_gdb_directory (GDB_DATADIR,
|
||||
GDB_DATADIR_RELOCATABLE);
|
||||
145
pkgs/development/tools/misc/gdb/default.nix
Normal file
145
pkgs/development/tools/misc/gdb/default.nix
Normal file
|
|
@ -0,0 +1,145 @@
|
|||
{ lib, stdenv, targetPackages
|
||||
|
||||
# Build time
|
||||
, fetchurl, pkg-config, perl, texinfo, setupDebugInfoDirs, buildPackages
|
||||
|
||||
# Run time
|
||||
, ncurses, readline, gmp, mpfr, expat, libipt, zlib, dejagnu, sourceHighlight
|
||||
|
||||
, pythonSupport ? stdenv.hostPlatform == stdenv.buildPlatform && !stdenv.hostPlatform.isCygwin, python3 ? null
|
||||
, enableDebuginfod ? false, elfutils
|
||||
, guile ? null
|
||||
, safePaths ? [
|
||||
# $debugdir:$datadir/auto-load are whitelisted by default by GDB
|
||||
"$debugdir" "$datadir/auto-load"
|
||||
# targetPackages so we get the right libc when cross-compiling and using buildPackages.gdb
|
||||
targetPackages.stdenv.cc.cc.lib
|
||||
]
|
||||
, writeScript
|
||||
}:
|
||||
|
||||
let
|
||||
basename = "gdb";
|
||||
targetPrefix = lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
|
||||
"${stdenv.targetPlatform.config}-";
|
||||
in
|
||||
|
||||
assert pythonSupport -> python3 != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = targetPrefix + basename;
|
||||
version = "12.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/gdb/${basename}-${version}.tar.xz";
|
||||
hash = "sha256-DheTv48rVNU/Rt6oTM/URvSPgbKXsoxPf8AXuBjWn+0=";
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace gdb/darwin-nat.c \
|
||||
--replace '#include "bfd/mach-o.h"' '#include "mach-o.h"'
|
||||
'' + lib.optionalString stdenv.hostPlatform.isMusl ''
|
||||
substituteInPlace sim/erc32/erc32.c --replace sys/fcntl.h fcntl.h
|
||||
substituteInPlace sim/erc32/interf.c --replace sys/fcntl.h fcntl.h
|
||||
substituteInPlace sim/erc32/sis.c --replace sys/fcntl.h fcntl.h
|
||||
substituteInPlace sim/ppc/emul_unix.c --replace sys/termios.h termios.h
|
||||
'';
|
||||
|
||||
patches = [
|
||||
./debug-info-from-env.patch
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
./darwin-target-match.patch
|
||||
# Does not nave to be conditional. We apply it conditionally
|
||||
# to speed up inclusion to nearby nixos release.
|
||||
] ++ lib.optionals stdenv.is32bit [
|
||||
./32-bit-BFD_VMA-format.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config texinfo perl setupDebugInfoDirs ];
|
||||
|
||||
buildInputs = [ ncurses readline gmp mpfr expat libipt zlib guile sourceHighlight ]
|
||||
++ lib.optional pythonSupport python3
|
||||
++ lib.optional doCheck dejagnu
|
||||
++ lib.optional enableDebuginfod (elfutils.override { enableDebuginfod = true; });
|
||||
|
||||
propagatedNativeBuildInputs = [ setupDebugInfoDirs ];
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# darwin build fails with format hardening since v7.12
|
||||
hardeningDisable = lib.optionals stdenv.isDarwin [ "format" ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral";
|
||||
|
||||
configurePlatforms = [ "build" "host" "target" ];
|
||||
|
||||
# GDB have to be built out of tree.
|
||||
preConfigure = ''
|
||||
mkdir _build
|
||||
cd _build
|
||||
'';
|
||||
configureScript = "../configure";
|
||||
|
||||
configureFlags = with lib; [
|
||||
# Set the program prefix to the current targetPrefix.
|
||||
# This ensures that the prefix always conforms to
|
||||
# nixpkgs' expectations instead of relying on the build
|
||||
# system which only receives `config` which is merely a
|
||||
# subset of the platform description.
|
||||
"--program-prefix=${targetPrefix}"
|
||||
|
||||
"--enable-targets=all" "--enable-64-bit-bfd"
|
||||
"--disable-install-libbfd"
|
||||
"--disable-shared" "--enable-static"
|
||||
"--with-system-zlib"
|
||||
"--with-system-readline"
|
||||
|
||||
"--with-gmp=${gmp.dev}"
|
||||
"--with-mpfr=${mpfr.dev}"
|
||||
"--with-expat" "--with-libexpat-prefix=${expat.dev}"
|
||||
"--with-auto-load-safe-path=${builtins.concatStringsSep ":" safePaths}"
|
||||
] ++ lib.optional (!pythonSupport) "--without-python"
|
||||
++ lib.optional stdenv.hostPlatform.isMusl "--disable-nls"
|
||||
++ lib.optional enableDebuginfod "--with-debuginfod=yes";
|
||||
|
||||
postInstall =
|
||||
'' # Remove Info files already provided by Binutils and other packages.
|
||||
rm -v $out/share/info/bfd.info
|
||||
'';
|
||||
|
||||
# TODO: Investigate & fix the test failures.
|
||||
doCheck = false;
|
||||
|
||||
passthru = {
|
||||
updateScript = writeScript "update-gdb" ''
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p curl pcre common-updater-scripts
|
||||
|
||||
set -eu -o pipefail
|
||||
|
||||
# Expect the text in format of '<h3>GDB version 12.1</h3>'
|
||||
new_version="$(curl -s https://www.sourceware.org/gdb/ |
|
||||
pcregrep -o1 '<h3>GDB version ([0-9.]+)</h3>')"
|
||||
update-source-version ${pname} "$new_version"
|
||||
'';
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "The GNU Project debugger";
|
||||
|
||||
longDescription = ''
|
||||
GDB, the GNU Project debugger, allows you to see what is going
|
||||
on `inside' another program while it executes -- or what another
|
||||
program was doing at the moment it crashed.
|
||||
'';
|
||||
|
||||
homepage = "https://www.gnu.org/software/gdb/";
|
||||
|
||||
license = lib.licenses.gpl3Plus;
|
||||
|
||||
platforms = with platforms; linux ++ cygwin ++ darwin;
|
||||
maintainers = with maintainers; [ pierron globin lsix ];
|
||||
};
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue