pyrox.dev / nixpkgs
lol
fork atom

Merge #248552: gcc10, gcc13: patch-version bumps

...into staging-next

Vladimír Čunát 636fd56f f1d7a132

+21 -50
unified split
+3 -4
pkgs/development/compilers/gcc/10/default.nix
··· 48 48 with builtins; 49 49 50 50 let majorVersion = "10"; 51 - version = "${majorVersion}.4.0"; 51 + version = "${majorVersion}.5.0"; 52 52 53 53 inherit (stdenv) buildPlatform hostPlatform targetPlatform; 54 54 55 55 patches = [ 56 56 # Fix https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80431 57 57 ../fix-bug-80431.patch 58 - ../11/fix-struct-redefinition-on-glibc-2.36.patch 59 58 ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch 60 59 ++ optional noSysDirs ../no-sys-dirs.patch 61 - ++ optional (noSysDirs && hostPlatform.isRiscV) ../no-sys-dirs-riscv.patch 60 + ++ optional noSysDirs ../no-sys-dirs-riscv.patch 62 61 /* ++ optional (hostPlatform != buildPlatform) (fetchpatch { # XXX: Refine when this should be applied 63 62 url = "https://git.busybox.net/buildroot/plain/package/gcc/${version}/0900-remove-selftests.patch?id=11271540bfe6adafbc133caf6b5b902a816f5f02"; 64 63 sha256 = ""; # TODO: uncomment and check hash when available. ··· 150 149 151 150 src = fetchurl { 152 151 url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz"; 153 - sha256 = "1wg4xdizkksmwi66mvv2v4pk3ja8x64m7v9gzhykzd3wrmdpsaf9"; 152 + hash = "sha256-JRCVQ/30bzl8NHtdi3osflaUpaUczkucbh6opxyjB8E="; 154 153 }; 155 154 156 155 inherit patches;
-41
pkgs/development/compilers/gcc/11/fix-struct-redefinition-on-glibc-2.36.patch
··· 1 - From d2356ebb0084a0d80dbfe33040c9afe938c15d19 Mon Sep 17 00:00:00 2001 2 - From: Martin Liska <mliska@suse.cz> 3 - Date: Mon, 11 Jul 2022 22:03:14 +0200 4 - Subject: [PATCH] libsanitizer: cherry-pick 9cf13067cb5088626ba7 from upstream 5 - 6 - 9cf13067cb5088626ba7ee1ec4c42ec59c7995a0 [sanitizer] Remove #include <linux/fs.h> to resolve fsconfig_command/mount_attr conflict with glibc 2.36 7 - 8 - (cherry picked from commit 2701442d0cf6292f6624443c15813d6d1a3562fe) 9 - --- 10 - .../sanitizer_platform_limits_posix.cpp | 10 ++++++---- 11 - 1 file changed, 6 insertions(+), 4 deletions(-) 12 - 13 - diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp 14 - index 025e575b5bc7..5743516c0460 100644 15 - --- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp 16 - +++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp 17 - @@ -72,7 +72,9 @@ 18 - #include <sys/vt.h> 19 - #include <linux/cdrom.h> 20 - #include <linux/fd.h> 21 - +#if SANITIZER_ANDROID 22 - #include <linux/fs.h> 23 - +#endif 24 - #include <linux/hdreg.h> 25 - #include <linux/input.h> 26 - #include <linux/ioctl.h> 27 - @@ -828,10 +830,10 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); 28 - unsigned IOCTL_EVIOCGPROP = IOCTL_NOT_PRESENT; 29 - unsigned IOCTL_EVIOCSKEYCODE_V2 = IOCTL_NOT_PRESENT; 30 - #endif 31 - - unsigned IOCTL_FS_IOC_GETFLAGS = FS_IOC_GETFLAGS; 32 - - unsigned IOCTL_FS_IOC_GETVERSION = FS_IOC_GETVERSION; 33 - - unsigned IOCTL_FS_IOC_SETFLAGS = FS_IOC_SETFLAGS; 34 - - unsigned IOCTL_FS_IOC_SETVERSION = FS_IOC_SETVERSION; 35 - + unsigned IOCTL_FS_IOC_GETFLAGS = _IOR('f', 1, long); 36 - + unsigned IOCTL_FS_IOC_GETVERSION = _IOR('v', 1, long); 37 - + unsigned IOCTL_FS_IOC_SETFLAGS = _IOW('f', 2, long); 38 - + unsigned IOCTL_FS_IOC_SETVERSION = _IOW('v', 2, long); 39 - unsigned IOCTL_GIO_CMAP = GIO_CMAP; 40 - unsigned IOCTL_GIO_FONT = GIO_FONT; 41 - unsigned IOCTL_GIO_UNIMAP = GIO_UNIMAP;
+5 -5
pkgs/development/compilers/gcc/13/default.nix
··· 55 55 with builtins; 56 56 57 57 let majorVersion = "13"; 58 - version = "${majorVersion}.1.0"; 58 + version = "${majorVersion}.2.0"; 59 59 disableBootstrap = !stdenv.hostPlatform.isDarwin && !profiledCompiler; 60 60 61 61 inherit (stdenv) buildPlatform hostPlatform targetPlatform; ··· 63 63 patches = 64 64 optional (targetPlatform != hostPlatform) ../libstdc++-target.patch 65 65 ++ optional noSysDirs ../gcc-12-no-sys-dirs.patch 66 - ++ optional noSysDirs ../no-sys-dirs-riscv.patch 66 + ++ optional noSysDirs ./no-sys-dirs-riscv.patch 67 67 ++ [ 68 68 ../gnat-cflags-11.patch 69 69 ../gcc-12-gfortran-driving.patch ··· 73 73 # a foreign one: https://github.com/iains/gcc-12-branch/issues/18 74 74 ++ optional (stdenv.isDarwin && stdenv.isAarch64 && buildPlatform == hostPlatform && hostPlatform == targetPlatform) (fetchpatch { 75 75 name = "gcc-13-darwin-aarch64-support.patch"; 76 - url = "https://github.com/Homebrew/formula-patches/raw/5c206c47e2a08d522ec9795bb314346fff5fc4c5/gcc/gcc-13.1.0.diff"; 77 - sha256 = "sha256-sMgA7nwE2ULa54t5g6VE6eJQYa69XvQrefi9U9f2t4g="; 76 + url = "https://raw.githubusercontent.com/Homebrew/formula-patches/3c5cbc8e9cf444a1967786af48e430588e1eb481/gcc/gcc-13.2.0.diff"; 77 + sha256 = "sha256-Y5r3U3dwAFG6+b0TNCFd18PNxYu2+W/5zDbZ5cHvv+U="; 78 78 }) 79 79 ++ optional langD ../libphobos.patch 80 80 ··· 201 201 202 202 src = fetchurl { 203 203 url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz"; 204 - sha256 = "sha256-YdaE8Kpedqxlha2ImKJCeq3ol57V5/hUkihsTfwT7oY="; 204 + hash = "sha256-4nXnZEKmBnNBon8Exca4PYYTFEAEwEE1KIY9xrXHQ9o="; 205 205 }; 206 206 207 207 inherit patches;
+13
pkgs/development/compilers/gcc/13/no-sys-dirs-riscv.patch
··· 1 + --- a/gcc/config/riscv/linux.h 2 + +++ b/gcc/config/riscv/linux.h 3 + @@ -69,9 +69,5 @@ 4 + 5 + #define TARGET_ASM_FILE_END file_end_indicate_exec_stack 6 + 7 + -#define STARTFILE_PREFIX_SPEC \ 8 + - "/lib" XLEN_SPEC "/" ABI_SPEC "/ " \ 9 + - "/usr/lib" XLEN_SPEC "/" ABI_SPEC "/ " \ 10 + - "/lib/ " \ 11 + - "/usr/lib/ " 12 + +#define STARTFILE_PREFIX_SPEC "" 13 +