diff options
| author |   Sam James <sam@gentoo.org> | 2022-08-22 02:26:20 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2022-08-22 02:27:39 +0100 |
| commit | 8a2f4e420da5afb22c05c56434a4d6a59050d7c4 (patch) | |
| tree | 3ff5b58dc037762ffc7214f9ec160e80b86ab95f /sys-devel | |
| parent | sys-devel/gcc: fix glibc-2.36 build for Go too for 11.3.0 (diff) | |
| download | gentoo-8a2f4e420da5afb22c05c56434a4d6a59050d7c4.tar.gz gentoo-8a2f4e420da5afb22c05c56434a4d6a59050d7c4.tar.bz2 gentoo-8a2f4e420da5afb22c05c56434a4d6a59050d7c4.zip | |
sys-devel/gcc: fix glibc-2.36 build for Go too for 10.4.0
Bug: https://bugs.gentoo.org/865879
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sys-devel')
| -rw-r--r-- | sys-devel/gcc/Manifest | 1 | ||||
| -rw-r--r-- | sys-devel/gcc/files/gcc-10.4.0-glibc-2.36.patch | 39 | ||||
| -rw-r--r-- | sys-devel/gcc/gcc-10.4.0.ebuild | 6 |
3 files changed, 3 insertions, 43 deletions
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest index db2cddc22cbd..bdd835f3bd3a 100644 --- a/sys-devel/gcc/Manifest +++ b/sys-devel/gcc/Manifest @@ -8,6 +8,7 @@ DIST gcc-10.3.0.tar.xz 76692288 BLAKE2B ac7898f5eb8a7c5f151a526d1bb38913a68b50a6 DIST gcc-10.4.0-musl-patches-1.tar.xz 3808 BLAKE2B 804d1fcc451dcd03be71240dd498ec2d179869571d44012967c48dccf5a478dd8c55000a964a80fdd5584d739a777dee1c83241cffce514ef002df2572854a67 SHA512 83e4a9c0f7062baf0c606a2bcc56a818494991403d7577dea65f04bbc25bdb786a5889b80d45d80e7f4be07c1aef786802cbfcfafd1a17ec255a2d4e93a77570 DIST gcc-10.4.0-patches-0.tar.bz2 15231 BLAKE2B f64a2e7f317acf9416da69c129ea869116be2780828f9d3cda59f7ea8d39634df7f0347f745275bb167f95aae2a3b8e97ec7c78f775d9002718dd67cb9429f68 SHA512 d1497930ccf4d6ee8700faeb676945e65b3aa2ba3a580a3564575fad1590ad076741f2ecad778ab48d0c4e8ed7723b84b0a660cb67cc4530495691702159a43a DIST gcc-10.4.0-patches-2.tar.xz 15000 BLAKE2B 59a61f7de4b6d2338a8b4fbc88a8e55838d5fdce1bd906b798540839a7efca9b97024779b515df6a7673ee6908540834bc1f58188ed9ef311c51e1f351ed003e SHA512 e1c8f0bf9d64db3f84a6eab0f41ee848643a67ba6ab57df7a8267139928f6e292d95c5b4ed865ff8d9a80028bb07cec714d56438b97004cd2a27f111f1f336da +DIST gcc-10.4.0-patches-3.tar.xz 15820 BLAKE2B e9deca8304a770e5e7bfea504c386325fe0c5663bdae105abdce37ad63138b8a3425a6900594a1c0cc628b70d9166275df01632fad8d33673ddc77d726c87fb7 SHA512 ec83b464c45cb568a8eb7f95a0964382ab0470d8f996a24a6985c7771bb93cbcef29f1619095fa0e1af85e54c7392465e159964775c185a24d97a1dea203253e DIST gcc-10.4.0.tar.xz 75018092 BLAKE2B ec1169025d3896b70ab80a4b8ce5040763a95529fc7e120c6bc3a3eb1db5cf938ebde347c1e595a8ff7d4081e79ded6252702d7a1a09648449b7a0783188e434 SHA512 440c08ca746da450d9a1b35e8fd2305cb27e7e6987cd9d0f7d375f3b1fc9e4b0bd7acb3cd7bf795e72fcbead59cdef5b6c152862f5d35cd9fbfe6902101ce648 DIST gcc-11-20220812.tar.xz 75781320 BLAKE2B f7776dcc0168cd0b624760deab9185b36e2f5718cdacb7cff911813791ed31321b34b5f14ee6e3264c61a95c5cd8cf80c93e6e80f6fdac5f49818e0f5c242486 SHA512 d2fbc18dcac84951c541d90a78719254429b133de05e4f6f37e3d3c160695ea5e2e6563cd78b90bdce29cb2e465aabe4215ec1262bb74c23eba2be57be074070 DIST gcc-11-20220819.tar.xz 75783200 BLAKE2B f047e2839932eb648f43e80cd80d940262f618093f340a51143eb857323b47a14725d733587dec06808c356cb153d0f35cf210806f5f8990e290f78dcb277568 SHA512 aa1418df17221d999ae4d3dd4fcab0f9c7a481e67dae98231b82bbc04f4df06b2add85e664e68e39616255644aa0dfb2df95cad485ec3f02e9db58740e37d8ca diff --git a/sys-devel/gcc/files/gcc-10.4.0-glibc-2.36.patch b/sys-devel/gcc/files/gcc-10.4.0-glibc-2.36.patch deleted file mode 100644 index e773071188b7..000000000000 --- a/sys-devel/gcc/files/gcc-10.4.0-glibc-2.36.patch +++ /dev/null @@ -1,39 +0,0 @@ -https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=6bd956e31b2fb6fe1eee4eb1bf309247dcd19b23 -https://bugs.gentoo.org/864717 - -From 6bd956e31b2fb6fe1eee4eb1bf309247dcd19b23 Mon Sep 17 00:00:00 2001 -From: Martin Liska <mliska@suse.cz> -Date: Mon, 11 Jul 2022 22:03:14 +0200 -Subject: [PATCH] libsanitizer: cherry-pick 9cf13067cb5088626ba7 from upstream - -9cf13067cb5088626ba7ee1ec4c42ec59c7995a0 [sanitizer] Remove #include <linux/fs.h> to resolve fsconfig_command/mount_attr conflict with glibc 2.36 - -(cherry picked from commit 2701442d0cf6292f6624443c15813d6d1a3562fe) ---- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp -+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp -@@ -72,7 +72,9 @@ - #include <sys/vt.h> - #include <linux/cdrom.h> - #include <linux/fd.h> -+#if SANITIZER_ANDROID - #include <linux/fs.h> -+#endif - #include <linux/hdreg.h> - #include <linux/input.h> - #include <linux/ioctl.h> -@@ -822,10 +824,10 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); - unsigned IOCTL_EVIOCGPROP = IOCTL_NOT_PRESENT; - unsigned IOCTL_EVIOCSKEYCODE_V2 = IOCTL_NOT_PRESENT; - #endif -- unsigned IOCTL_FS_IOC_GETFLAGS = FS_IOC_GETFLAGS; -- unsigned IOCTL_FS_IOC_GETVERSION = FS_IOC_GETVERSION; -- unsigned IOCTL_FS_IOC_SETFLAGS = FS_IOC_SETFLAGS; -- unsigned IOCTL_FS_IOC_SETVERSION = FS_IOC_SETVERSION; -+ unsigned IOCTL_FS_IOC_GETFLAGS = _IOR('f', 1, long); -+ unsigned IOCTL_FS_IOC_GETVERSION = _IOR('v', 1, long); -+ unsigned IOCTL_FS_IOC_SETFLAGS = _IOW('f', 2, long); -+ unsigned IOCTL_FS_IOC_SETVERSION = _IOW('v', 2, long); - unsigned IOCTL_GIO_CMAP = GIO_CMAP; - unsigned IOCTL_GIO_FONT = GIO_FONT; - unsigned IOCTL_GIO_UNIMAP = GIO_UNIMAP; - diff --git a/sys-devel/gcc/gcc-10.4.0.ebuild b/sys-devel/gcc/gcc-10.4.0.ebuild index 311d04b1e636..7c5902bdee1b 100644 --- a/sys-devel/gcc/gcc-10.4.0.ebuild +++ b/sys-devel/gcc/gcc-10.4.0.ebuild @@ -3,11 +3,11 @@ EAPI=8 -TOOLCHAIN_PATCH_SUFFIX="xz" TOOLCHAIN_PATCH_DEV="sam" +TOOLCHAIN_PATCH_SUFFIX="xz" #TOOLCHAIN_GCC_RC=1 PATCH_GCC_VER="10.4.0" -PATCH_VER="2" +PATCH_VER="3" MUSL_VER="1" MUSL_GCC_VER="10.4.0" @@ -43,8 +43,6 @@ RDEPEND="" BDEPEND="${CATEGORY}/binutils" src_prepare() { - eapply "${FILESDIR}"/${P}-glibc-2.36.patch - local p upstreamed_patches=( # add them here ) |