From dc1e382f94f90b0fa8559a42d034f1742a8f94c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 11 Aug 2023 17:27:37 +0200 Subject: [PATCH] gcc13: 13.1.0 -> 13.2.0 The patch would no longer apply, as the the changed part is no longer exactly at the end of the file. There's more content now, but it suffices to just add a preserved empty line into the diff. --- pkgs/development/compilers/gcc/13/default.nix | 6 +++--- .../compilers/gcc/13/no-sys-dirs-riscv.patch | 13 +++++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/compilers/gcc/13/no-sys-dirs-riscv.patch diff --git a/pkgs/development/compilers/gcc/13/default.nix b/pkgs/development/compilers/gcc/13/default.nix index 82b30a0e5102..b32f8f2ece1b 100644 --- a/pkgs/development/compilers/gcc/13/default.nix +++ b/pkgs/development/compilers/gcc/13/default.nix @@ -55,7 +55,7 @@ with lib; with builtins; let majorVersion = "13"; - version = "${majorVersion}.1.0"; + version = "${majorVersion}.2.0"; disableBootstrap = !stdenv.hostPlatform.isDarwin && !profiledCompiler; inherit (stdenv) buildPlatform hostPlatform targetPlatform; @@ -63,7 +63,7 @@ let majorVersion = "13"; patches = optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional noSysDirs ../gcc-12-no-sys-dirs.patch - ++ optional noSysDirs ../no-sys-dirs-riscv.patch + ++ optional noSysDirs ./no-sys-dirs-riscv.patch ++ [ ../gnat-cflags-11.patch ../gcc-12-gfortran-driving.patch @@ -201,7 +201,7 @@ lib.pipe ((callFile ../common/builder.nix {}) ({ src = fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz"; - sha256 = "sha256-YdaE8Kpedqxlha2ImKJCeq3ol57V5/hUkihsTfwT7oY="; + hash = "sha256-4nXnZEKmBnNBon8Exca4PYYTFEAEwEE1KIY9xrXHQ9o="; }; inherit patches; diff --git a/pkgs/development/compilers/gcc/13/no-sys-dirs-riscv.patch b/pkgs/development/compilers/gcc/13/no-sys-dirs-riscv.patch new file mode 100644 index 000000000000..add4d59b41ae --- /dev/null +++ b/pkgs/development/compilers/gcc/13/no-sys-dirs-riscv.patch @@ -0,0 +1,13 @@ +--- a/gcc/config/riscv/linux.h ++++ b/gcc/config/riscv/linux.h +@@ -69,9 +69,5 @@ + + #define TARGET_ASM_FILE_END file_end_indicate_exec_stack + +-#define STARTFILE_PREFIX_SPEC \ +- "/lib" XLEN_SPEC "/" ABI_SPEC "/ " \ +- "/usr/lib" XLEN_SPEC "/" ABI_SPEC "/ " \ +- "/lib/ " \ +- "/usr/lib/ " ++#define STARTFILE_PREFIX_SPEC "" +