From: oreo639 <oreo639@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] gcc: update to 13.2.0.
Date: Sat, 27 Jan 2024 23:34:06 +0100 [thread overview]
Message-ID: <20240127223407.8DE3D22BF6@inbox.vuxu.org> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-45500@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1358 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages gcc13
https://github.com/void-linux/void-packages/pull/45500
gcc: update to 13.2.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
[ci skip]
#### Testing the changes
- I tested the changes in this PR: **briefly**
You can test the ISOs here: https://drive.google.com/drive/u/0/folders/1y5dkzI9R60eDjRA4mVYBdnn9e9PDGwNt
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/45500.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gcc13-45500.patch --]
[-- Type: text/x-diff, Size: 120382 bytes --]
From dadfe64be884cf9db214a44355a5a3790775415e Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 7 Aug 2023 03:19:31 -0700
Subject: [PATCH 01/41] binutils: update to 2.41.
---
common/shlibs | 3 ++
srcpkgs/binutils-libs | 1 +
.../fix-libcollector-without-java.patch | 53 -------------------
srcpkgs/binutils/template | 29 ++++++----
4 files changed, 22 insertions(+), 64 deletions(-)
create mode 120000 srcpkgs/binutils-libs
delete mode 100644 srcpkgs/binutils/patches/fix-libcollector-without-java.patch
diff --git a/common/shlibs b/common/shlibs
index d66a3f71f3e02..f409db8f7bbf0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -73,6 +73,9 @@ libmpfr.so.6 mpfr-4.0.0_1
libppl.so.14 ppl-1.2_1
libppl_c.so.4 ppl-0.11_1
libstdc++.so.6 libstdc++-4.4.0_1
+libsframe.so.1 binutils-libs-2.41_1
+libctf-nobfd.so.0 binutils-libs-2.41_1
+libctf.so.0 binutils-libs-2.41_1
libncurses.so.6 ncurses-libs-6.0_1 ignore
libncursesw.so.6 ncurses-libs-5.8_1 ignore
libtinfo.so.6 ncurses-libtinfo-libs-6.2_2
diff --git a/srcpkgs/binutils-libs b/srcpkgs/binutils-libs
new file mode 120000
index 0000000000000..695eb82eae648
--- /dev/null
+++ b/srcpkgs/binutils-libs
@@ -0,0 +1 @@
+binutils
\ No newline at end of file
diff --git a/srcpkgs/binutils/patches/fix-libcollector-without-java.patch b/srcpkgs/binutils/patches/fix-libcollector-without-java.patch
deleted file mode 100644
index 54384875f358f..0000000000000
--- a/srcpkgs/binutils/patches/fix-libcollector-without-java.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 49ddd814ac1071af7c4f45d5f8398b91862f2c7f Mon Sep 17 00:00:00 2001
-From: Vladimir Mezentsev <vladimir.mezentsev@oracle.com>
-Date: Wed, 17 Aug 2022 19:55:23 -0700
-Subject: [PATCH] gprofng: fix bug 29479 Collection fails when built without
- java support
-
-gprofng/ChangeLog
-2022-08-17 Vladimir Mezentsev <vladimir.mezentsev@oracle.com>
-
- PR gprofng/29479
- * libcollector/collector.c: Add #if defined(GPROFNG_JAVA_PROFILING) for
- java specific code.
- * libcollector/unwind.c: Likewise.
----
- gprofng/libcollector/collector.c | 2 ++
- gprofng/libcollector/unwind.c | 2 ++
- 2 files changed, 4 insertions(+)
-
-diff --git a/gprofng/libcollector/collector.c b/gprofng/libcollector/collector.c
-index 93c9d3330de5..ceff2c1caccb 100644
---- a/gprofng/libcollector/collector.c
-+++ b/gprofng/libcollector/collector.c
-@@ -913,8 +913,10 @@ __collector_open_experiment (const char *exp, const char *params, sp_origin_t or
- __collector_ext_unwind_key_init (1, NULL);
-
- /* start java attach if suitable */
-+#if defined(GPROFNG_JAVA_PROFILING)
- if (exp_origin == SP_ORIGIN_DBX_ATTACH)
- __collector_jprofile_start_attach ();
-+#endif
- start_sec_time = CALL_UTIL (time)(NULL);
- __collector_start_time = collector_interface.getHiResTime ();
- TprintfT (DBG_LT0, "\t__collector_open_experiment; resetting start_time\n");
-diff --git a/gprofng/libcollector/unwind.c b/gprofng/libcollector/unwind.c
-index 119243788020..f8e11823c81e 100644
---- a/gprofng/libcollector/unwind.c
-+++ b/gprofng/libcollector/unwind.c
-@@ -557,6 +557,7 @@ __collector_get_frame_info (hrtime_t ts, int mode, void *arg)
- int size = max_frame_size;
-
- #define MIN(a,b) ((a)<(b)?(a):(b))
-+#if defined(GPROFNG_JAVA_PROFILING)
- /* get Java info */
- if (__collector_java_mode && __collector_java_asyncgetcalltrace_loaded && context && !pseudo_context)
- {
-@@ -569,6 +570,7 @@ __collector_get_frame_info (hrtime_t ts, int mode, void *arg)
- size -= sz;
- }
- }
-+#endif
-
- /* get native stack */
- if (context)
diff --git a/srcpkgs/binutils/template b/srcpkgs/binutils/template
index 36b71c2b5e92c..382684c150532 100644
--- a/srcpkgs/binutils/template
+++ b/srcpkgs/binutils/template
@@ -1,16 +1,16 @@
# Template file for 'binutils'
pkgname=binutils
-version=2.39
-revision=3
+version=2.41
+revision=1
bootstrap=yes
hostmakedepends="pkgconf"
-makedepends="zlib-devel"
+makedepends="zlib-devel libzstd-devel"
short_desc="GNU binary utilities"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://www.gnu.org/software/binutils/"
distfiles="${GNU_SITE}/binutils/binutils-${version}.tar.xz"
-checksum=645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
+checksum=ae9a5789e23459e59606e6714723f2d3ffc31c03174191ef0d015bdf06007450
build_options="all_targets"
desc_option_all_targets="Enable all supported targets"
@@ -21,8 +21,8 @@ if [ "$CHROOT_READY" ]; then
hostmakedepends+=" flex perl texinfo"
makedepends+=" elfutils-devel"
checkdepends="bc"
- depends="binutils-doc"
- subpackages+=" libiberty-devel binutils-devel"
+ depends="binutils-doc binutils-libs"
+ subpackages+=" libiberty-devel binutils-libs binutils-devel"
fi
_get_triplet() {
@@ -138,9 +138,9 @@ do_install() {
# Remove these symlinks, they are not ABI stable.
# Programs should compile static to the .a file.
rm -f ${DESTDIR}/usr/lib/lib{bfd,opcodes}.so
- echo "INPUT ( /usr/lib/libbfd.a -liberty -lz )" \
+ echo "INPUT ( /usr/lib${XBPS_TARGET_WORDSIZE}/libbfd.a -lsframe -liberty -lzstd -lz )" \
>${DESTDIR}/usr/lib/libbfd.so
- echo "INPUT ( /usr/lib/libopcodes.a -lbfd )" \
+ echo "INPUT ( /usr/lib${XBPS_TARGET_WORDSIZE}/libopcodes.a -lbfd )" \
>${DESTDIR}/usr/lib/libopcodes.so
# Install PIC version of libiberty.a
@@ -158,13 +158,20 @@ do_install() {
}
binutils-devel_package() {
- depends="zlib-devel libiberty-devel"
+ depends="binutils-libs zlib-devel libzstd-devel libiberty-devel"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
- vmove "usr/lib/libbfd.so"
- vmove "usr/lib/libopcodes.so"
+ vmove "usr/lib/*.so"
+ }
+}
+
+binutils-libs_package() {
+ short_desc+=" - shared libraries"
+ pkg_install() {
+ vmove "usr/lib/lib*-${version}.so"
+ vmove "usr/lib/*.so.*"
}
}
From d08e066e680c1a0ae8b82d8456595d7d93131c57 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 7 Aug 2023 15:41:41 -0700
Subject: [PATCH 02/41] gcc: update to 13.2.0.
---
common/shlibs | 7 +-
srcpkgs/gcc/files/gccgo-musl.patch | 340 ++++++++++--------
srcpkgs/gcc/files/libssp-musl.patch | 28 --
...-go-fix-build-error-with-SYS_SECCOMP.patch | 41 ---
.../patches/consistent-library-paths.patch | 25 +-
...ad833631486e337e541e692d9b4a1ca14edd.patch | 30 +-
...9de35fb1b293a4fd586574b1b4b73ddf7880.patch | 60 ++++
.../patches/fix-pretty-printer-warnings.patch | 18 +-
srcpkgs/gcc/patches/libatomic-autolink.patch | 56 ++-
srcpkgs/gcc/template | 55 +--
10 files changed, 354 insertions(+), 306 deletions(-)
delete mode 100644 srcpkgs/gcc/patches/0042-gcc-go-fix-build-error-with-SYS_SECCOMP.patch
create mode 100644 srcpkgs/gcc/patches/f4029de35fb1b293a4fd586574b1b4b73ddf7880.patch
diff --git a/common/shlibs b/common/shlibs
index f409db8f7bbf0..71f172740e5c6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -63,7 +63,7 @@ libcc1plugin.so.0 gcc-6.2.1_1
libitm.so.1 libitm-4.7.3_1
liblto_plugin.so.0 gcc-4.7.3_1
libgcc_s.so.1 libgcc-4.4.0_1
-libgo.so.21 libgo-12.2.0_1
+libgo.so.22 libgo-13.2.0_1
libgccjit.so.0 libgccjit-10.2.1pre1_1
libperl.so.5.38 perl-5.38.0_1
libgmp.so.10 gmp-5.0.1_1
@@ -855,8 +855,8 @@ libgdkmm-2.4.so.1 gtkmm2-2.24.0_1
libgtkmm-2.4.so.1 gtkmm2-2.24.0_1
libquadmath.so.0 libquadmath-4.4.0_1
libgfortran.so.5 libgfortran-8.2.0_1
-libgnarl-12.so libada-12.2.0_1
-libgnat-12.so libada-12.2.0_1
+libgnarl-13.so libada-13.2.0_1
+libgnat-13.so libada-13.2.0_1
libsharpyuv.so.0 libsharpyuv-1.3.0_1
libwebp.so.7 libwebp-0.6.0_1
libwebpmux.so.3 libwebp-0.6.0_1
@@ -1669,6 +1669,7 @@ libubsan.so.1 libsanitizer-8.2.0_1
libtsan.so.2 libsanitizer-12.2.0_1
libasan.so.8 libsanitizer-12.2.0_1
liblsan.so.0 libsanitizer-6.3.0_1
+libhwasan.so.0 libsanitizer-13.2.0_1
libvtv.so.0 libvtv-6.3.0_1
libatomic.so.1 libatomic-4.9.0_1
libpcsclite.so.1 libpcsclite-1.8.11_1
diff --git a/srcpkgs/gcc/files/gccgo-musl.patch b/srcpkgs/gcc/files/gccgo-musl.patch
index 12ec68dd8aa30..b2ccebbed7893 100644
--- a/srcpkgs/gcc/files/gccgo-musl.patch
+++ b/srcpkgs/gcc/files/gccgo-musl.patch
@@ -1,173 +1,199 @@
This is not among the normal patches as these changes are musl specific and
there is no way to easily conditionalize it in source for some of the changes.
-Added by q66: runtime.h now uses libucontext_ prefixed APIs to allow build
-with freestanding versions of libucontext
-
Souurce: Adélie Linux, q66
URL: https://code.foxkit.us/adelie/packages/tree/master/system/gcc
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -46325,7 +46325,7 @@ configure-target-libgo:
- esac; \
- module_srcdir=libgo; \
- rm -f no-such-file || : ; \
-- CONFIG_SITE=no-such-file $(SHELL) \
-+ CONFIG_SITE=no-such-file LIBS="-lucontext $$LIBS" $(SHELL) \
- $$s/$$module_srcdir/configure \
- --srcdir=$${topdir}/$$module_srcdir \
- $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
---- a/libgo/mksysinfo.sh
-+++ b/libgo/mksysinfo.sh
-@@ -379,11 +379,7 @@ fi
- # Some basic types.
- echo 'type Size_t _size_t' >> ${OUT}
- echo "type Ssize_t _ssize_t" >> ${OUT}
--if grep '^const _HAVE_OFF64_T = ' gen-sysinfo.go > /dev/null 2>&1; then
-- echo "type Offset_t _off64_t" >> ${OUT}
--else
-- echo "type Offset_t _off_t" >> ${OUT}
--fi
-+echo "type Offset_t _off_t" >> ${OUT}
- echo "type Mode_t _mode_t" >> ${OUT}
- echo "type Pid_t _pid_t" >> ${OUT}
- echo "type Uid_t _uid_t" >> ${OUT}
---- a/libgo/go/runtime/mem_gccgo.go
-+++ b/libgo/go/runtime/mem_gccgo.go
-@@ -16,7 +16,7 @@ import (
- //go:linkname sysFree runtime.sysFree
-
- //extern mmap
--func sysMmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off uintptr) unsafe.Pointer
-+func sysMmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off int64) unsafe.Pointer
-
- //extern munmap
- func munmap(addr unsafe.Pointer, length uintptr) int32
-@@ -38,7 +38,7 @@ func init() {
- }
- }
+From 4bfcb35bc43d3e3b7510620362d7c28d9e4c17ca Mon Sep 17 00:00:00 2001
+From: psykose <alice@ayaya.dev>
+Date: Mon, 10 Jul 2023 23:23:29 +0000
+Subject: [PATCH 34/35] libgo: fix lfs64 use
+
+---
+ .../go/internal/syscall/unix/at_largefile.go | 2 +-
+ libgo/go/os/dir_largefile.go | 2 +-
+ libgo/go/syscall/libcall_glibc.go | 2 +-
+ libgo/go/syscall/libcall_linux.go | 4 +--
+ libgo/go/syscall/libcall_posix_largefile.go | 26 +++++++++----------
+ libgo/runtime/go-varargs.c | 2 +-
+ libgo/sysinfo.c | 9 +++----
+ 7 files changed, 22 insertions(+), 25 deletions(-)
+
+diff --git a/libgo/go/internal/syscall/unix/at_largefile.go b/libgo/go/internal/syscall/unix/at_largefile.go
+index 82e0dcfd074..16151ecad1b 100644
+--- a/libgo/go/internal/syscall/unix/at_largefile.go
++++ b/libgo/go/internal/syscall/unix/at_largefile.go
+@@ -10,5 +10,5 @@ import (
+ "syscall"
+ )
--func mmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off uintptr) (unsafe.Pointer, int) {
-+func mmap(addr unsafe.Pointer, n uintptr, prot, flags, fd int32, off int64) (unsafe.Pointer, int) {
- p := sysMmap(addr, n, prot, flags, fd, off)
- if uintptr(p) == _MAP_FAILED {
- return nil, errno()
---- a/libgo/go/syscall/errstr.go
-+++ b/libgo/go/syscall/errstr.go
-@@ -5,7 +5,6 @@
- // license that can be found in the LICENSE file.
+-//extern fstatat64
++//extern fstatat
+ func fstatat(int32, *byte, *syscall.Stat_t, int32) int32
+diff --git a/libgo/go/os/dir_largefile.go b/libgo/go/os/dir_largefile.go
+index 1fc5ee0771f..0c6dffe1a75 100644
+--- a/libgo/go/os/dir_largefile.go
++++ b/libgo/go/os/dir_largefile.go
+@@ -11,5 +11,5 @@ package os
- // +build !hurd
--// +build !linux
+ import "syscall"
- package syscall
+-//extern readdir64
++//extern readdir
+ func libc_readdir(*syscall.DIR) *syscall.Dirent
+diff --git a/libgo/go/syscall/libcall_glibc.go b/libgo/go/syscall/libcall_glibc.go
+index 5c1ec483c75..5a1245ed44b 100644
+--- a/libgo/go/syscall/libcall_glibc.go
++++ b/libgo/go/syscall/libcall_glibc.go
+@@ -114,7 +114,7 @@ func Pipe2(p []int, flags int) (err error) {
+ }
---- a/libgo/go/syscall/errstr_glibc.go
-+++ /dev/null
-@@ -1,33 +0,0 @@
--// errstr_glibc.go -- GNU/Linux and GNU/Hurd specific error strings.
--
--// Copyright 2010 The Go Authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
--
--// We use this rather than errstr.go because on GNU/Linux sterror_r
--// returns a pointer to the error message, and may not use buf at all.
--
--// +build hurd linux
--
--package syscall
--
--import "unsafe"
--
--//sysnb strerror_r(errnum int, b []byte) (errstr *byte)
--//strerror_r(errnum _C_int, b *byte, len Size_t) *byte
--
--func Errstr(errnum int) string {
-- a := make([]byte, 128)
-- p := strerror_r(errnum, a)
-- b := (*[1000]byte)(unsafe.Pointer(p))
-- i := 0
-- for b[i] != 0 {
-- i++
-- }
-- // Lowercase first letter: Bad -> bad, but STREAM -> STREAM.
-- if i > 1 && 'A' <= b[0] && b[0] <= 'Z' && 'a' <= b[1] && b[1] <= 'z' {
-- c := b[0] + 'a' - 'A'
-- return string(c) + string(b[1:i])
-- }
-- return string(b[:i])
--}
+ //sys sendfile(outfd int, infd int, offset *Offset_t, count int) (written int, err error)
+-//sendfile64(outfd _C_int, infd _C_int, offset *Offset_t, count Size_t) Ssize_t
++//sendfile(outfd _C_int, infd _C_int, offset *Offset_t, count Size_t) Ssize_t
+
+ func Sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
+ if race.Enabled {
+diff --git a/libgo/go/syscall/libcall_linux.go b/libgo/go/syscall/libcall_linux.go
+index 03ca7261b59..ad21fd0b3ac 100644
--- a/libgo/go/syscall/libcall_linux.go
+++ b/libgo/go/syscall/libcall_linux.go
-@@ -206,19 +206,19 @@ func Gettid() (tid int) {
- //sys Setxattr(path string, attr string, data []byte, flags int) (err error)
- //setxattr(path *byte, name *byte, value *byte, size Size_t, flags _C_int) _C_int
-
--//sys splice(rfd int, roff *_loff_t, wfd int, woff *_loff_t, len int, flags int) (n int64, err error)
--//splice(rfd _C_int, roff *_loff_t, wfd _C_int, woff *_loff_t, len Size_t, flags _C_uint) Ssize_t
-+//sys splice(rfd int, roff *_off_t, wfd int, woff *_off_t, len int, flags int) (n int64, err error)
-+//splice(rfd _C_int, roff *_off_t, wfd _C_int, woff *_off_t, len Size_t, flags _C_uint) Ssize_t
- func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error) {
-- var lroff _loff_t
-- var plroff *_loff_t
-+ var lroff _off_t
-+ var plroff *_off_t
- if roff != nil {
-- lroff = _loff_t(*roff)
-+ lroff = _off_t(*roff)
- plroff = &lroff
- }
-- var lwoff _loff_t
-- var plwoff *_loff_t
-+ var lwoff _off_t
-+ var plwoff *_off_t
- if woff != nil {
-- lwoff = _loff_t(*woff)
-+ lwoff = _off_t(*woff)
- plwoff = &lwoff
- }
- n, err = splice(rfd, plroff, wfd, plwoff, len, flags)
---- a/libgo/runtime/runtime.h
-+++ b/libgo/runtime/runtime.h
-@@ -500,10 +500,13 @@ int __go_setcontext(__go_context_t*);
- void __go_makecontext(__go_context_t*, void (*)(), void*, size_t);
- #else
- #define __go_context_t ucontext_t
--#define __go_getcontext(c) getcontext(c)
--#define __go_setcontext(c) setcontext(c)
-+int libucontext_getcontext(__go_context_t *);
-+void libucontext_makecontext(__go_context_t *, void (*)(), int, ...);
-+int libucontext_setcontext(const __go_context_t *);
-+#define __go_getcontext(c) libucontext_getcontext(c)
-+#define __go_setcontext(c) libucontext_setcontext(c)
- #define __go_makecontext(c, fn, sp, size) \
-- ((c)->uc_stack.ss_sp = sp, (c)->uc_stack.ss_size = size, makecontext(c, fn, 0))
-+ ((c)->uc_stack.ss_sp = sp, (c)->uc_stack.ss_size = size, libucontext_makecontext(c, fn, 0))
- #endif
+@@ -158,7 +158,7 @@ func Reboot(cmd int) (err error) {
+ //adjtimex(buf *Timex) _C_int
+
+ //sys Fstatfs(fd int, buf *Statfs_t) (err error)
+-//fstatfs64(fd _C_int, buf *Statfs_t) _C_int
++//fstatfs(fd _C_int, buf *Statfs_t) _C_int
+
+ func Gettid() (tid int) {
+ r1, _, _ := Syscall(SYS_GETTID, 0, 0, 0)
+@@ -245,7 +245,7 @@ func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n i
+ }
+
+ //sys Statfs(path string, buf *Statfs_t) (err error)
+-//statfs64(path *byte, buf *Statfs_t) _C_int
++//statfs(path *byte, buf *Statfs_t) _C_int
+
+ //sysnb Sysinfo(info *Sysinfo_t) (err error)
+ //sysinfo(info *Sysinfo_t) _C_int
+diff --git a/libgo/go/syscall/libcall_posix_largefile.go b/libgo/go/syscall/libcall_posix_largefile.go
+index f90055bb29a..334212f0af1 100644
+--- a/libgo/go/syscall/libcall_posix_largefile.go
++++ b/libgo/go/syscall/libcall_posix_largefile.go
+@@ -10,40 +10,40 @@
+ package syscall
+
+ //sys Creat(path string, mode uint32) (fd int, err error)
+-//creat64(path *byte, mode Mode_t) _C_int
++//creat(path *byte, mode Mode_t) _C_int
+
+ //sys Fstat(fd int, stat *Stat_t) (err error)
+-//fstat64(fd _C_int, stat *Stat_t) _C_int
++//fstat(fd _C_int, stat *Stat_t) _C_int
+
+ //sys Ftruncate(fd int, length int64) (err error)
+-//ftruncate64(fd _C_int, length Offset_t) _C_int
++//ftruncate(fd _C_int, length Offset_t) _C_int
+
+ //sysnb Getrlimit(resource int, rlim *Rlimit) (err error)
+-//getrlimit64(resource _C_int, rlim *Rlimit) _C_int
++//getrlimit(resource _C_int, rlim *Rlimit) _C_int
+
+ //sys Lstat(path string, stat *Stat_t) (err error)
+-//lstat64(path *byte, stat *Stat_t) _C_int
++//lstat(path *byte, stat *Stat_t) _C_int
+
+ //sys mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error)
+-//mmap64(addr *byte, length Size_t, prot _C_int, flags _C_int, fd _C_int, offset Offset_t) *byte
++//mmap(addr *byte, length Size_t, prot _C_int, flags _C_int, fd _C_int, offset Offset_t) *byte
- // Symbols defined by the linker.
+ //sys Open(path string, mode int, perm uint32) (fd int, err error)
+-//__go_open64(path *byte, mode _C_int, perm Mode_t) _C_int
++//__go_open(path *byte, mode _C_int, perm Mode_t) _C_int
+
+ //sys Pread(fd int, p []byte, offset int64) (n int, err error)
+-//pread64(fd _C_int, buf *byte, count Size_t, offset Offset_t) Ssize_t
++//pread(fd _C_int, buf *byte, count Size_t, offset Offset_t) Ssize_t
+
+ //sys Pwrite(fd int, p []byte, offset int64) (n int, err error)
+-//pwrite64(fd _C_int, buf *byte, count Size_t, offset Offset_t) Ssize_t
++//pwrite(fd _C_int, buf *byte, count Size_t, offset Offset_t) Ssize_t
+
+ //sys Seek(fd int, offset int64, whence int) (off int64, err error)
+-//lseek64(fd _C_int, offset Offset_t, whence _C_int) Offset_t
++//lseek(fd _C_int, offset Offset_t, whence _C_int) Offset_t
+
+ //sysnb Setrlimit(resource int, rlim *Rlimit) (err error)
+-//setrlimit64(resource int, rlim *Rlimit) _C_int
++//setrlimit(resource int, rlim *Rlimit) _C_int
+
+ //sys Stat(path string, stat *Stat_t) (err error)
+-//stat64(path *byte, stat *Stat_t) _C_int
++//stat(path *byte, stat *Stat_t) _C_int
+
+ //sys Truncate(path string, length int64) (err error)
+-//truncate64(path *byte, length Offset_t) _C_int
++//truncate(path *byte, length Offset_t) _C_int
+diff --git a/libgo/runtime/go-varargs.c b/libgo/runtime/go-varargs.c
+index f84860891e6..7efc9615985 100644
+--- a/libgo/runtime/go-varargs.c
++++ b/libgo/runtime/go-varargs.c
+@@ -84,7 +84,7 @@ __go_ioctl_ptr (int d, int request, void *arg)
+ int
+ __go_open64 (char *path, int mode, mode_t perm)
+ {
+- return open64 (path, mode, perm);
++ return open (path, mode, perm);
+ }
+
+ #endif
+diff --git a/libgo/sysinfo.c b/libgo/sysinfo.c
+index 180f5c31d74..1d717d55c0e 100644
--- a/libgo/sysinfo.c
+++ b/libgo/sysinfo.c
-@@ -73,9 +73,6 @@
- #include <sys/times.h>
- #include <sys/wait.h>
- #include <sys/un.h>
--#if defined(HAVE_SYS_USER_H)
--#include <sys/user.h>
--#endif
- #if defined(HAVE_SYS_UTSNAME_H)
- #include <sys/utsname.h>
+@@ -366,7 +366,7 @@ typedef loff_t libgo_loff_t_type;
+ #endif
+
+ #if defined(HAVE_OFF64_T)
+-typedef off64_t libgo_off_t_type;
++typedef off_t libgo_off_t_type;
+ #else
+ typedef off_t libgo_off_t_type;
#endif
---- a/libgo/go/runtime/os_linux.go
-+++ b/libgo/go/runtime/os_linux.go
-@@ -365,7 +365,7 @@ func setThreadCPUProfiler(hz int32) {
- var sevp _sigevent
- sevp.sigev_notify = _SIGEV_THREAD_ID
- sevp.sigev_signo = _SIGPROF
-- *((*int32)(unsafe.Pointer(&sevp._sigev_un))) = int32(mp.procid)
-+ *((*int32)(unsafe.Pointer(&sevp.__sev_fields))) = int32(mp.procid)
- ret := timer_create(_CLOCK_THREAD_CPUTIME_ID, &sevp, &timerid)
- if ret != 0 {
- // If we cannot create a timer for this M, leave profileTimerValid false
+@@ -398,13 +398,11 @@ typedef off_t libgo_off_t_type;
+
+ // From dirent.h
+ SREF(dirent);
+-SREF(dirent64);
+ OTREF(DIR);
+ EREF(DT_UNKNOWN);
+
+ // From fcntl.h
+ SREF(flock);
+-SREF(flock64);
+
+ // From ffi headers
+ SREF(_ffi_type);
+@@ -485,11 +483,10 @@ EREF(SS_ONSTACK);
+ EREF(SEGV_MAPERR);
+
+ // From stat.h
+-SREF(stat64);
++SREF(stat);
+
+ // From statfs.h
+ SREF(statfs);
+-SREF(statfs64);
+
+ // From sysinfo.h
+ SREF(sysinfo);
+@@ -519,7 +516,7 @@ EREF(PTRACE_PEEKTEXT);
+
+ // From sys/resource.h
+ SREF(rusage);
+-SREF(rlimit64);
++SREF(rlimit);
+ EREF(RLIMIT_NOFILE);
+ EREF(PRIO_USER);
+ EREF(RUSAGE_SELF);
+
diff --git a/srcpkgs/gcc/files/libssp-musl.patch b/srcpkgs/gcc/files/libssp-musl.patch
index 99f248401a1cc..8da164bf8276b 100644
--- a/srcpkgs/gcc/files/libssp-musl.patch
+++ b/srcpkgs/gcc/files/libssp-musl.patch
@@ -1,7 +1,5 @@
First part taken from Alpine.
-Second part added to prevent gccgo from thinking it can -fsplit-stack on musl.
-
--- a/gcc/gcc.cc
+++ b/gcc/gcc.cc
@@ -984,10 +984,15 @@ proper position among the other output f
@@ -42,29 +40,3 @@ Second part added to prevent gccgo from thinking it can -fsplit-stack on musl.
The lower bound for a buffer to be considered for stack smashing protection.
-param=stack-clash-protection-guard-size=
---- a/gcc/config/i386/gnu-user-common.h
-+++ b/gcc/config/i386/gnu-user-common.h
-@@ -64,9 +64,3 @@ along with GCC; see the file COPYING3. If not see
-
- /* Static stack checking is supported by means of probes. */
- #define STACK_CHECK_STATIC_BUILTIN 1
--
--/* We only build the -fsplit-stack support in libgcc if the
-- assembler has full support for the CFI directives. */
--#if HAVE_GAS_CFI_PERSONALITY_DIRECTIVE
--#define TARGET_CAN_SPLIT_STACK
--#endif
---- a/gcc/config/i386/gnu.h
-+++ b/gcc/config/i386/gnu.h
-@@ -40,11 +40,6 @@ along with GCC. If not, see <http://www.gnu.org/licenses/>.
- /* i386 glibc provides __stack_chk_guard in %gs:0x14. */
- #define TARGET_THREAD_SSP_OFFSET 0x14
-
--/* We only build the -fsplit-stack support in libgcc if the
-- assembler has full support for the CFI directives. */
--#if HAVE_GAS_CFI_PERSONALITY_DIRECTIVE
--#define TARGET_CAN_SPLIT_STACK
--#endif
- /* We steal the last transactional memory word. */
- #define TARGET_THREAD_SPLIT_STACK_OFFSET 0x30
- #endif
diff --git a/srcpkgs/gcc/patches/0042-gcc-go-fix-build-error-with-SYS_SECCOMP.patch b/srcpkgs/gcc/patches/0042-gcc-go-fix-build-error-with-SYS_SECCOMP.patch
deleted file mode 100644
index db38df3b010ab..0000000000000
--- a/srcpkgs/gcc/patches/0042-gcc-go-fix-build-error-with-SYS_SECCOMP.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 548720bca6bff21ebc9aba22249d9ce45bbd90c7 Mon Sep 17 00:00:00 2001
-From: Ian Lance Taylor <iant@golang.org>
-Date: Wed, 29 Jun 2022 15:32:04 -0700
-Subject: [PATCH] libgo: handle stat st_atim32 field and SYS_SECCOMP
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Patches for musl support, from Sören Tempel.
-
-Fixes https://gcc.gnu.org/PR105225
-
-Change-Id: If396877d4a4c7d27962226d7a6e3bb91b1344413
-Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/415294
-Reviewed-by: Than McIntosh <thanm@google.com>
-Reviewed-by: Ian Lance Taylor <iant@google.com>
----
- libgo/mksysinfo.sh | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh
-index 5aa30915..ea1fa17d 100755
---- a/libgo/mksysinfo.sh
-+++ b/libgo/mksysinfo.sh
-@@ -127,6 +127,7 @@ fi
-
- # The syscall numbers. We force the names to upper case.
- grep '^const _SYS_' gen-sysinfo.go | \
-+ grep -v '^const _SYS_SECCOMP = ' | \
- sed -e 's/const _\(SYS_[^= ]*\).*$/\1/' | \
- while read sys; do
- sup=`echo $sys | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`
-@@ -506,7 +507,7 @@ fi
-
- # For historical reasons Go uses the suffix "timespec" instead of "tim" for
- # stat_t's time fields on NetBSD.
--st_times='-e s/st_atim/Atim/ -e s/st_mtim/Mtim/ -e s/st_ctim/Ctim/'
-+st_times='-e s/st_atim/Atim/g -e s/st_mtim/Mtim/g -e s/st_ctim/Ctim/g'
- if test "${GOOS}" = "netbsd"; then
- st_times='-e s/st_atim/Atimespec/ -e s/st_mtim/Mtimespec/ -e s/st_ctim/Ctimespec/'
- fi
diff --git a/srcpkgs/gcc/patches/consistent-library-paths.patch b/srcpkgs/gcc/patches/consistent-library-paths.patch
index 333dc53a4eca3..d421fbd9607d5 100644
--- a/srcpkgs/gcc/patches/consistent-library-paths.patch
+++ b/srcpkgs/gcc/patches/consistent-library-paths.patch
@@ -28,13 +28,34 @@ When adding a new platform, fix this up too.
MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)
--- a/gcc/config/mips/t-linux64
+++ b/gcc/config/mips/t-linux64
-@@ -21,6 +21,6 @@ MULTILIB_DIRNAMES = n32 32 64
+@@ -20,26 +20,7 @@ MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi
+ MULTILIB_DIRNAMES = n32 32 64
MIPS_EL = $(if $(filter %el, $(firstword $(subst -, ,$(target)))),el)
MIPS_SOFT = $(if $(strip $(filter MASK_SOFT_FLOAT_ABI, $(target_cpu_default)) $(filter soft, $(with_float))),soft)
- MULTILIB_OSDIRNAMES = \
+-ifeq (yes,$(enable_multiarch))
+- ifneq (,$(findstring gnuabi64,$(target)))
+- MULTILIB_OSDIRNAMES = \
+- ../lib32$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \
+- ../libo32$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \
+- ../lib$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT))
+- else ifneq (,$(findstring gnuabin32,$(target)))
+- MULTILIB_OSDIRNAMES = \
+- ../lib$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \
+- ../libo32$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \
+- ../lib64$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT))
+- else
+- MULTILIB_OSDIRNAMES = \
+- ../lib32$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \
+- ../lib$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \
+- ../lib64$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT))
+- endif
+-else
+- MULTILIB_OSDIRNAMES = \
- ../lib32$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \
- ../lib$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \
- ../lib64$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT))
+-endif
++MULTILIB_OSDIRNAMES = \
+ ../lib32 \
+ ../lib \
+ ../lib64
diff --git a/srcpkgs/gcc/patches/d7bead833631486e337e541e692d9b4a1ca14edd.patch b/srcpkgs/gcc/patches/d7bead833631486e337e541e692d9b4a1ca14edd.patch
index b7078600fb3a5..f9dfee0621553 100644
--- a/srcpkgs/gcc/patches/d7bead833631486e337e541e692d9b4a1ca14edd.patch
+++ b/srcpkgs/gcc/patches/d7bead833631486e337e541e692d9b4a1ca14edd.patch
@@ -106,22 +106,28 @@ diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cp
index a04eed7aa5a6e3..6d61d276d77e35 100644
--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp
+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp
-@@ -154,7 +154,6 @@ typedef struct user_fpregs elf_fpregset_
- #include <linux/serial.h>
- #include <sys/msg.h>
- #include <sys/ipc.h>
--#include <crypt.h>
- #endif // SANITIZER_ANDROID
+@@ -177,10 +177,6 @@ typedef struct user_fpregs elf_fpregset_t;
+ # include "sanitizer_platform_interceptors.h"
+ # include "sanitizer_platform_limits_posix.h"
- #include <link.h>
-@@ -254,7 +253,6 @@ namespace __sanitizer {
- unsigned struct_ustat_sz = SIZEOF_STRUCT_USTAT;
- unsigned struct_rlimit64_sz = sizeof(struct rlimit64);
+-#if SANITIZER_INTERCEPT_CRYPT_R
+-#include <crypt.h>
+-#endif
+-
+ namespace __sanitizer {
+ unsigned struct_utsname_sz = sizeof(struct utsname);
+ unsigned struct_stat_sz = sizeof(struct stat);
+@@ -300,10 +296,6 @@ namespace __sanitizer {
unsigned struct_statvfs64_sz = sizeof(struct statvfs64);
-- unsigned struct_crypt_data_sz = sizeof(struct crypt_data);
- #endif // SANITIZER_LINUX && !SANITIZER_ANDROID
+ #endif // SANITIZER_GLIBC
+-#if SANITIZER_INTERCEPT_CRYPT_R
+- unsigned struct_crypt_data_sz = sizeof(struct crypt_data);
+-#endif
+-
#if SANITIZER_LINUX && !SANITIZER_ANDROID
+ unsigned struct_timex_sz = sizeof(struct timex);
+ unsigned struct_msqid_ds_sz = sizeof(struct msqid_ds);
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
index e6f298c26e1fb6..58244c9944a03a 100644
--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
diff --git a/srcpkgs/gcc/patches/f4029de35fb1b293a4fd586574b1b4b73ddf7880.patch b/srcpkgs/gcc/patches/f4029de35fb1b293a4fd586574b1b4b73ddf7880.patch
new file mode 100644
index 0000000000000..7338b3dd1ede3
--- /dev/null
+++ b/srcpkgs/gcc/patches/f4029de35fb1b293a4fd586574b1b4b73ddf7880.patch
@@ -0,0 +1,60 @@
+From f4029de35fb1b293a4fd586574b1b4b73ddf7880 Mon Sep 17 00:00:00 2001
+From: Prathamesh Kulkarni <prathamesh.kulkarni@linaro.org>
+Date: Wed, 26 Jul 2023 22:36:26 +0530
+Subject: [PATCH] [aarch64/match.pd] Fix ICE observed in PR110280.
+
+gcc/ChangeLog:
+ PR tree-optimization/110280
+ * match.pd (vec_perm_expr(v, v, mask) -> v): Explicitly build vector
+ using build_vector_from_val with the element of input operand, and
+ mask's type if operand and mask's types don't match.
+
+gcc/testsuite/ChangeLog:
+ PR tree-optimization/110280
+ * gcc.target/aarch64/sve/pr110280.c: New test.
+
+(cherry picked from commit 85d8e0d8d5342ec8b4e6a54e22741c30b33c6f04)
+---
+ gcc/match.pd | 9 ++++++++-
+ gcc/testsuite/gcc.target/aarch64/sve/pr110280.c | 12 ++++++++++++
+ 2 files changed, 20 insertions(+), 1 deletion(-)
+ create mode 100644 gcc/testsuite/gcc.target/aarch64/sve/pr110280.c
+
+diff --git a/gcc/match.pd b/gcc/match.pd
+index 9118244825054..c3bb4fbc0a7a2 100644
+--- a/gcc/match.pd
++++ b/gcc/match.pd
+@@ -8292,7 +8292,14 @@ and,
+
+ (simplify
+ (vec_perm vec_same_elem_p@0 @0 @1)
+- @0)
++ (if (types_match (type, TREE_TYPE (@0)))
++ @0
++ (with
++ {
++ tree elem = uniform_vector_p (@0);
++ }
++ (if (elem)
++ { build_vector_from_val (type, elem); }))))
+
+ /* Push VEC_PERM earlier if that may help FMA perception (PR101895). */
+ (simplify
+diff --git a/gcc/testsuite/gcc.target/aarch64/sve/pr110280.c b/gcc/testsuite/gcc.target/aarch64/sve/pr110280.c
+new file mode 100644
+index 0000000000000..d3279f383629f
+--- /dev/null
++++ b/gcc/testsuite/gcc.target/aarch64/sve/pr110280.c
+@@ -0,0 +1,12 @@
++/* { dg-do compile } */
++/* { dg-options "-O3 -fdump-tree-optimized" } */
++
++#include "arm_sve.h"
++
++svuint32_t l()
++{
++ _Alignas(16) const unsigned int lanes[4] = {0, 0, 0, 0};
++ return svld1rq_u32(svptrue_b8(), lanes);
++}
++
++/* { dg-final { scan-tree-dump-not "VEC_PERM_EXPR" "optimized" } } */
diff --git a/srcpkgs/gcc/patches/fix-pretty-printer-warnings.patch b/srcpkgs/gcc/patches/fix-pretty-printer-warnings.patch
index 2091ca69a401c..4eeb69b69b1bb 100644
--- a/srcpkgs/gcc/patches/fix-pretty-printer-warnings.patch
+++ b/srcpkgs/gcc/patches/fix-pretty-printer-warnings.patch
@@ -9,15 +9,15 @@
self.val = val
self.contained_type = None
contained_value = None
-@@ -1216,7 +1216,7 @@
- mgrname = m.group(1)
- # FIXME need to expand 'std::string' so that gdb.lookup_type works
- if 'std::string' in mgrname:
-- mgrname = re.sub("std::string(?!\w)", str(gdb.lookup_type('std::string').strip_typedefs()), m.group(1))
-+ mgrname = re.sub(r"std::string(?!\w)", str(gdb.lookup_type('std::string').strip_typedefs()), m.group(1))
-
- mgrtype = gdb.lookup_type(mgrname)
- self.contained_type = mgrtype.template_argument(0)
+@@ -1299,7 +1299,7 @@
+ mgrtypes = []
+ for s in strings:
+ try:
+- x = re.sub("std::string(?!\w)", s, m.group(1))
++ x = re.sub(r"std::string(?!\w)", s, m.group(1))
+ # The following lookup might raise gdb.error if the
+ # manager function was never instantiated for 's' in the
+ # program, because there will be no such type.
@@ -1246,7 +1246,7 @@
def __init__ (self, typename, val):
valtype = self._recognize (val.type.template_argument(0))
diff --git a/srcpkgs/gcc/patches/libatomic-autolink.patch b/srcpkgs/gcc/patches/libatomic-autolink.patch
index 20cdc42308dc5..e703b02cd786b 100644
--- a/srcpkgs/gcc/patches/libatomic-autolink.patch
+++ b/srcpkgs/gcc/patches/libatomic-autolink.patch
@@ -2,10 +2,10 @@ Add --enable-autolink-libatomic, to make gcc link -latomic by default.
Taken from Alpine: https://git.alpinelinux.org/aports/tree/main/gcc/0035-configure-Add-enable-autolink-libatomic-use-in-LINK_.patch
-From 573a66e4146c9a65d895af9081a4d3d49cfc9e7a Mon Sep 17 00:00:00 2001
+From 7b50823d8a4131e5a55d2499a0f5a52b3d91eed2 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
-Date: Wed, 9 Dec 2020 16:07:26 +0000
-Subject: [PATCH] configure: Add --enable-autolink-libatomic, use in
+Date: Wed, 9 Dec 2020 07:42:06 +0000
+Subject: [PATCH 27/35] configure: Add --enable-autolink-libatomic, use in
LINK_GCC_C_SEQUENCE_SPEC [PR81358]
This fixes issues with RISC-V.
@@ -13,19 +13,19 @@ This fixes issues with RISC-V.
Makefile.in | 1 +
gcc/config.in | 6 ++++++
gcc/config/gnu-user.h | 12 +++++++++++-
- gcc/configure | 32 ++++++++++++++++++++++++++++++--
- gcc/configure.ac | 22 +++++++++++++++++++++-
+ gcc/configure | 31 ++++++++++++++++++++++++++++++-
+ gcc/configure.ac | 21 +++++++++++++++++++++
gcc/doc/install.texi | 8 ++++++++
gcc/doc/tm.texi | 8 +++++++-
gcc/doc/tm.texi.in | 8 +++++++-
gcc/gcc.cc | 12 +++++++++++-
- 9 files changed, 102 insertions(+), 7 deletions(-)
+ 9 files changed, 102 insertions(+), 5 deletions(-)
diff --git a/Makefile.in b/Makefile.in
-index b564ddbf792..a95c7407d16 100644
+index 6ff2b3f9925..394b105b271 100644
--- a/Makefile.in
+++ b/Makefile.in
-@@ -232,6 +232,7 @@ HOST_EXPORTS = \
+@@ -235,6 +235,7 @@ HOST_EXPORTS = \
RANLIB_FOR_TARGET="$(RANLIB_FOR_TARGET)"; export RANLIB_FOR_TARGET; \
READELF_FOR_TARGET="$(READELF_FOR_TARGET)"; export READELF_FOR_TARGET; \
TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
@@ -34,7 +34,7 @@ index b564ddbf792..a95c7407d16 100644
GMPLIBS="$(HOST_GMPLIBS)"; export GMPLIBS; \
GMPINC="$(HOST_GMPINC)"; export GMPINC; \
diff --git a/gcc/config.in b/gcc/config.in
-index f0fbf123aa8..af84efc4f9e 100644
+index 0679fbbf4c6..ee81139b385 100644
--- a/gcc/config.in
+++ b/gcc/config.in
@@ -118,6 +118,12 @@
@@ -51,7 +51,7 @@ index f0fbf123aa8..af84efc4f9e 100644
format instead of DPD */
#ifndef USED_FOR_TARGET
diff --git a/gcc/config/gnu-user.h b/gcc/config/gnu-user.h
-index 8433e56c3e1..0347f10da8b 100644
+index b26b17f2f2a..3f64ea46180 100644
--- a/gcc/config/gnu-user.h
+++ b/gcc/config/gnu-user.h
@@ -109,8 +109,18 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
@@ -75,10 +75,10 @@ index 8433e56c3e1..0347f10da8b 100644
#undef LINK_GCC_C_SEQUENCE_SPEC
diff --git a/gcc/configure b/gcc/configure
-index 2f6b3265a6c..6dc65bf4ccb 100755
+index e59cbee1767..787c35d4e25 100755
--- a/gcc/configure
+++ b/gcc/configure
-@@ -981,6 +981,7 @@ with_changes_root_url
+@@ -984,6 +984,7 @@ with_changes_root_url
enable_languages
with_multilib_list
with_multilib_generator
@@ -86,7 +86,7 @@ index 2f6b3265a6c..6dc65bf4ccb 100755
with_zstd
with_zstd_include
with_zstd_lib
-@@ -1710,6 +1711,9 @@ Optional Features:
+@@ -1713,6 +1714,9 @@ Optional Features:
--disable-shared don't provide a shared libgcc
--disable-gcov don't provide libgcov and related host tools
--enable-languages=LIST specify which front-ends to build
@@ -96,7 +96,7 @@ index 2f6b3265a6c..6dc65bf4ccb 100755
--disable-rpath do not hardcode runtime library paths
--enable-sjlj-exceptions
arrange to use setjmp/longjmp exception handling
-@@ -8324,7 +8328,6 @@ else
+@@ -8329,7 +8333,6 @@ else
fi
@@ -104,7 +104,7 @@ index 2f6b3265a6c..6dc65bf4ccb 100755
# Check whether --with-multilib-generator was given.
if test "${with_multilib_generator+set}" = set; then :
withval=$with_multilib_generator; :
-@@ -8332,6 +8335,32 @@ else
+@@ -8337,6 +8340,32 @@ else
with_multilib_generator=default
fi
@@ -137,16 +137,11 @@ index 2f6b3265a6c..6dc65bf4ccb 100755
# -------------------------
# Checks for other programs
-@@ -34296,4 +34325,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
- $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
- fi
-
--
diff --git a/gcc/configure.ac b/gcc/configure.ac
-index e683d3a7a5f..07c81c78336 100644
+index 57268319de1..56bcaa87620 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
-@@ -1205,6 +1205,27 @@ AC_ARG_WITH(multilib-generator,
+@@ -1199,6 +1199,27 @@ AC_ARG_WITH(multilib-generator,
:,
with_multilib_generator=default)
@@ -174,16 +169,11 @@ index e683d3a7a5f..07c81c78336 100644
# -------------------------
# Checks for other programs
# -------------------------
-@@ -7839,4 +7860,3 @@ done
- ],
- [subdirs='$subdirs'])
- AC_OUTPUT
--
diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi
-index 48408d842db..c90be0ee750 100644
+index b30d3691fe6..ccc8e5dbb00 100644
--- a/gcc/doc/install.texi
+++ b/gcc/doc/install.texi
-@@ -2295,6 +2295,14 @@ files, but these changed header paths may conflict with some compilation
+@@ -2377,6 +2377,14 @@ files, but these changed header paths may conflict with some compilation
environments. Enabled by default, and may be disabled using
@option{--disable-canonical-system-headers}.
@@ -199,7 +189,7 @@ index 48408d842db..c90be0ee750 100644
Tell GCC that when the GNU C Library (glibc) is used on the target it
will be version @var{major}.@var{minor} or later. Normally this can
diff --git a/gcc/doc/tm.texi b/gcc/doc/tm.texi
-index c5006afc00d..56b62c69ae8 100644
+index a660e33739b..6183c407a2b 100644
--- a/gcc/doc/tm.texi
+++ b/gcc/doc/tm.texi
@@ -381,7 +381,13 @@ the argument @option{-lgcc} to tell the linker to do the search.
@@ -218,7 +208,7 @@ index c5006afc00d..56b62c69ae8 100644
@defmac POST_LINK_SPEC
diff --git a/gcc/doc/tm.texi.in b/gcc/doc/tm.texi.in
-index f869ddd5e5b..57c93f24ac3 100644
+index f7ab5d48a63..281540aba68 100644
--- a/gcc/doc/tm.texi.in
+++ b/gcc/doc/tm.texi.in
@@ -381,7 +381,13 @@ the argument @option{-lgcc} to tell the linker to do the search.
@@ -237,10 +227,10 @@ index f869ddd5e5b..57c93f24ac3 100644
@defmac POST_LINK_SPEC
diff --git a/gcc/gcc.cc b/gcc/gcc.cc
-index 735b2b1bba1..f10f3c91aa7 100644
+index 59390fd39d6..dae1dd4cf79 100644
--- a/gcc/gcc.cc
+++ b/gcc/gcc.cc
-@@ -987,13 +987,23 @@ proper position among the other output files. */
+@@ -974,13 +974,23 @@ proper position among the other output files. */
# define ASM_DEBUG_OPTION_SPEC ""
#endif
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index a8f6096042247..2c644c1e19a2d 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -3,14 +3,14 @@
# which use the version number.
pkgname=gcc
-version=12.2.0
-revision=4
+version=13.2.0
+revision=1
_minorver="${version%.*}"
_majorver="${_minorver%.*}"
-_gmp_version=6.2.1
-_mpfr_version=4.1.0
-_mpc_version=1.2.1
-_isl_version=0.24
+_gmp_version=6.3.0
+_mpfr_version=4.2.1
+_mpc_version=1.3.1
+_isl_version=0.26
create_wrksrc=yes
short_desc="GNU Compiler Collection"
maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -19,15 +19,15 @@ license="GFDL-1.2-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
# *-musl builders have issues fetching https://ftp.gnu.org/gnu/mpc/mpc-1.1.0.tar.gz
distfiles="
${GNU_SITE}/gcc/gcc-${version}/gcc-${version}.tar.xz
- https://gmplib.org/download/gmp/gmp-${_gmp_version}.tar.xz
+ ${GNU_SITE}/gmp/gmp-${_gmp_version}.tar.xz
${GNU_SITE}/mpfr/mpfr-${_mpfr_version}.tar.xz
${GNU_SITE}/mpc/mpc-${_mpc_version}.tar.gz
${SOURCEFORGE_SITE}/libisl/isl-${_isl_version}.tar.bz2"
-checksum="e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
- fd4829912cddd12f84181c3451cc752be224643e87fac497b69edddadc49b4f2
- 0c98a3f1732ff6ca4ea690552079da9c597872d30e96ec28414ee23c95558a7f
- 17503d2c395dfcf106b622dc142683c1199431d095367c6aacba6eec30340459
- fcf78dd9656c10eb8cf9fbd5f59a0b6b01386205fe1934b3b287a0a1898145c0"
+checksum="e275e76442a6067341a27f04c5c6b83d8613144004c0413528863dc6b5c743da
+ a3c2b80201b89e68616f4ad30bc66aee4927c3ce50e33929ca819d5c43538898
+ 277807353a6726978996945af13e52829e3abd7a9a5b7fb2793894e18f1fcbb2
+ ab642492f5cf882b74aa0cb730cd410a81edcdbec895183ce930e706c1c759b8
+ 5eac8664e9d67be6bd0bee5085d6840b8baf738c06814df47eaf4166d9776436"
nopie=yes
lib32disabled=yes
@@ -36,6 +36,7 @@ replaces="gcc-gcj<7.2.0 gcc-gcj-jdk-compat<7.2.0 libmpx>=0 libmpx-devel>=0
libssp>=0 libssp-devel>=0"
_have_gccgo=yes
+_have_libquadmath=no
# MIPS is untested and does not have go in crosstoolchains
# 32-bit PowerPC seems weirdly broken since the 10.x release
@@ -45,6 +46,10 @@ case "$XBPS_TARGET_MACHINE" in
mips*-musl|ppc*) _have_gccgo=no ;;
esac
+case "$XBPS_TARGET_MACHINE" in
+ i686*|x86_64*|ppc64le) _have_libquadmath=yes ;;
+esac
+
if [ "$CHROOT_READY" ]; then
hostmakedepends="tar texinfo perl flex"
else
@@ -85,6 +90,10 @@ fi
if [ "$CHROOT_READY" ]; then
subpackages+=" gcc-fortran libgfortran-devel libgfortran"
subpackages+=" gcc-objc gcc-objc++ libobjc-devel libobjc"
+
+ if [ "$_have_libquadmath" = "yes" ]; then
+ subpackages+=" libquadmath libquadmath-devel"
+ fi
fi
if [ "$_have_gccgo" = "yes" ]; then
@@ -136,12 +145,8 @@ case "$XBPS_TARGET_MACHINE" in
esac
case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*)
- subpackages+=" libquadmath libquadmath-devel"
subpackages+=" libvtv libvtv-devel"
;;
- ppc64le)
- subpackages+=" libquadmath libquadmath-devel"
- ;;
esac
case "$XBPS_TARGET_MACHINE" in
mips*) ;;
@@ -187,8 +192,12 @@ pre_configure() {
# Do not run fixincludes
sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
+ # Do not enable C++17, gcc compiles with -std=c++11
+ sed -i 's/HAVE_CXX17=1/HAVE_CXX17=0/' isl/configure
+
if [ "$XBPS_TARGET_LIBC" = musl ]; then
for p in ${FILESDIR}/*-musl.patch; do
+ msg_normal "patching: $p\n"
patch -p1 -i $p
done
fi
@@ -385,10 +394,9 @@ do_install() {
vman ${FILESDIR}/${f}.1
done
- case "$XBPS_TARGET_MACHINE" in
- i686*|x86_64*|ppc64le) ;;
- *) rm -f ${DESTDIR}/usr/share/info/libquadmath.info;;
- esac
+ if [ "$_have_libquadmath" != "yes"]; then
+ rm -f ${DESTDIR}/usr/share/info/libquadmath.info*
+ fi
}
gcc-ada_package() {
@@ -502,6 +510,11 @@ libada_package() {
libgfortran-devel_package() {
depends="libgfortran>=${_minorver}"
short_desc+=" - Fortran library - development files"
+
+ if [ "$_have_libquadmath" = "yes" ]; then
+ depends+=" libquadmath-devel"
+ fi
+
pkg_install() {
vmove usr/lib/libgfortran.spec
vmove usr/lib/libgfortran.a
@@ -675,7 +688,7 @@ libsanitizer-devel_package() {
pkg_install() {
vmove "usr/lib/lib*san*.so"
vmove "usr/lib/lib*san*.a"
- vmove usr/lib/libasan_preinit.o
+ vmove "usr/lib/lib*san_preinit.o"
vmove usr/lib/libsanitizer.spec
}
}
From 7c9d281c33658ad691fc0bc32c5327d4cbd57e66 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 26 Jan 2024 18:06:28 -0800
Subject: [PATCH 03/41] kernel-libc-headers: update to 6.1.
---
...-4-glibc-specific-inclusion-of-sysinfo.h-in-kernel.h.patch | 4 ++--
srcpkgs/kernel-libc-headers/template | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/kernel-libc-headers/patches/1-4-glibc-specific-inclusion-of-sysinfo.h-in-kernel.h.patch b/srcpkgs/kernel-libc-headers/patches/1-4-glibc-specific-inclusion-of-sysinfo.h-in-kernel.h.patch
index c93e732de0ee4..e3448369e1e92 100644
--- a/srcpkgs/kernel-libc-headers/patches/1-4-glibc-specific-inclusion-of-sysinfo.h-in-kernel.h.patch
+++ b/srcpkgs/kernel-libc-headers/patches/1-4-glibc-specific-inclusion-of-sysinfo.h-in-kernel.h.patch
@@ -7,6 +7,6 @@
+#ifdef __GLIBC__
#include <linux/sysinfo.h>
+#endif
+ #include <linux/const.h>
- /*
- * 'kernel.h' contains some often-used function prototypes etc
+ #endif /* _UAPI_LINUX_KERNEL_H */
diff --git a/srcpkgs/kernel-libc-headers/template b/srcpkgs/kernel-libc-headers/template
index 61d118a2cfdf1..aa9b0fc20812f 100644
--- a/srcpkgs/kernel-libc-headers/template
+++ b/srcpkgs/kernel-libc-headers/template
@@ -1,6 +1,6 @@
# Template file for 'kernel-libc-headers'
pkgname=kernel-libc-headers
-version=5.10.4
+version=6.1
revision=1
bootstrap=yes
short_desc="Linux API headers for userland development"
@@ -8,7 +8,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
license="GPL-2.0-only"
homepage="http://www.kernel.org"
distfiles="$KERNEL_SITE/kernel/v${version%%.*}.x/linux-${version}.tar.xz"
-checksum=904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec
+checksum=2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb
if [ "$CHROOT_READY" ]; then
hostmakedepends="perl"
From 4937336b7d87d6234b3d561c5e95d5a10e276745 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 22 Jan 2024 13:30:57 -0800
Subject: [PATCH 04/41] musl: remove compat basename declaration and add
RLIMIT_RTTIME define
This declaration was added to musl to avoid warnings for applications that
expect GNU basename() in string.h.
Pre-ansi style declarations were used to avoid causing errors due to
incompatibile declarations of basename().
In C23, just like in C++, function declarations with no arguments are treated
as having no arguments, instead of having unspecified arguments. As such,
this creates a conflicting declaration in C23.
---
srcpkgs/musl/patches/add-rlimit-rttime.patch | 24 +++++++++++
srcpkgs/musl/patches/c23-basename.patch | 44 ++++++++++++++++++++
srcpkgs/musl/template | 2 +-
3 files changed, 69 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/musl/patches/add-rlimit-rttime.patch
create mode 100644 srcpkgs/musl/patches/c23-basename.patch
diff --git a/srcpkgs/musl/patches/add-rlimit-rttime.patch b/srcpkgs/musl/patches/add-rlimit-rttime.patch
new file mode 100644
index 0000000000000..56afa6b66521a
--- /dev/null
+++ b/srcpkgs/musl/patches/add-rlimit-rttime.patch
@@ -0,0 +1,24 @@
+From 2507e7f5312e79620f6337935d0a6c9045ccba09 Mon Sep 17 00:00:00 2001
+From: Leah Neukirchen <leah@vuxu.org>
+Date: Sat, 11 Jan 2020 20:16:59 +0100
+Subject: [PATCH] define RLIMIT_RTTIME, bump RLIMIT_NLIMITS
+
+This macro exists since Linux 2.6.25 and is defined in glibc since 2011.
+---
+ include/sys/resource.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/include/sys/resource.h b/include/sys/resource.h
+index e0c86ae33..3068328d0 100644
+--- a/include/sys/resource.h
++++ b/include/sys/resource.h
+@@ -90,7 +90,8 @@ int prlimit(pid_t, int, const struct rlimit *, struct rlimit *);
+ #define RLIMIT_MSGQUEUE 12
+ #define RLIMIT_NICE 13
+ #define RLIMIT_RTPRIO 14
+-#define RLIMIT_NLIMITS 15
++#define RLIMIT_RTTIME 15
++#define RLIMIT_NLIMITS 16
+
+ #define RLIM_NLIMITS RLIMIT_NLIMITS
+
diff --git a/srcpkgs/musl/patches/c23-basename.patch b/srcpkgs/musl/patches/c23-basename.patch
new file mode 100644
index 0000000000000..8f95a27d0ef56
--- /dev/null
+++ b/srcpkgs/musl/patches/c23-basename.patch
@@ -0,0 +1,44 @@
+From 725e17ed6dff4d0cd22487bb64470881e86a92e7 Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Mon, 6 Nov 2023 08:26:19 -0500
+Subject: [PATCH] remove non-prototype declaration of basename from string.h
+
+commit 37bb3cce4598c19288628e675eaf1cda6e96958f suppressed the
+declaration for C++, where it is wrongly interpreted as declaring the
+function as taking no arguments. with C23 removing non-prototype
+declarations, that problem is now also relevant to C.
+
+the non-prototype declaration for basename originates with commit
+06aec8d7152dfb8360cb7ed9b3d7215ca0b0b500, where it was designed to
+avoid conflicts with programs which declare basename with the GNU
+signature taking const char *. that change was probably misguided, as
+it represents not only misaligned expectations with the caller, but
+also undefined behavior (calling a function that's been declared with
+the wrong type).
+
+we could opt to fix the declaration, but since glibc, with the
+gratuitously incompatible GNU-basename function, seems to be the only
+implementation that declares it in string.h, it seems better to just
+remove the declaration. this provides some warning if applications are
+being built expecting the GNU behavior but not getting it. if we
+declared it here, it would only produce a warning if the caller also
+declares it themselves (rare) or if the caller attempts to pass a
+const-qualified pointer.
+---
+ include/string.h | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/include/string.h b/include/string.h
+index db73d2a9..83e2b946 100644
+--- a/include/string.h
++++ b/include/string.h
+@@ -95,9 +95,6 @@ char *strchrnul(const char *, int);
+ char *strcasestr(const char *, const char *);
+ void *memrchr(const void *, int, size_t);
+ void *mempcpy(void *, const void *, size_t);
+-#ifndef __cplusplus
+-char *basename();
+-#endif
+ #endif
+
+ #ifdef __cplusplus
diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template
index 9838f9ad9e613..8c3be7d76e8a1 100644
--- a/srcpkgs/musl/template
+++ b/srcpkgs/musl/template
@@ -2,7 +2,7 @@
pkgname=musl
reverts="1.2.0_1"
version=1.1.24
-revision=19
+revision=20
archs="*-musl"
bootstrap=yes
build_style=gnu-configure
From 6562a2d5fce74b9fb03f2b73c74cedbcc377689c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 7 Aug 2023 15:43:14 -0700
Subject: [PATCH 05/41] libtool: rebuild for gcc 13
---
srcpkgs/libtool/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libtool/template b/srcpkgs/libtool/template
index 4eea61b17c49b..b112680fe864a 100644
--- a/srcpkgs/libtool/template
+++ b/srcpkgs/libtool/template
@@ -1,7 +1,7 @@
# Template file for 'libtool'
pkgname=libtool
version=2.4.7
-revision=4
+revision=5
build_style=gnu-configure
hostmakedepends="texinfo perl automake help2man xz gnulib tar"
depends="tar sed grep"
From abf33e4e6300224470e6ab41ed2747f1f41536a3 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 7 Aug 2023 15:44:09 -0700
Subject: [PATCH 06/41] mk-configure: rebuild for gcc 13
---
srcpkgs/mk-configure/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mk-configure/template b/srcpkgs/mk-configure/template
index fdcac6ca74b8c..a267afce83e46 100644
--- a/srcpkgs/mk-configure/template
+++ b/srcpkgs/mk-configure/template
@@ -1,7 +1,7 @@
# Template file for 'mk-configure'
pkgname=mk-configure
version=0.38.2
-revision=1
+revision=2
build_style=gnu-makefile
make_cmd=bmake
make_install_args="MANDIR=/usr/share/man"
From ab78da85ed14de4f064ca6498ae4b4636d5e04df Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 7 Aug 2023 17:31:30 -0700
Subject: [PATCH 07/41] libgccjit: update to 13.2.0.
---
srcpkgs/libgccjit/template | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/libgccjit/template b/srcpkgs/libgccjit/template
index fde1affd54b7c..e130b53461496 100644
--- a/srcpkgs/libgccjit/template
+++ b/srcpkgs/libgccjit/template
@@ -3,11 +3,11 @@
# which use the version number.
pkgname=libgccjit
-version=12.2.0
+version=13.2.0
revision=1
-_gmp_version=6.2.1
-_mpfr_version=4.1.0
-_mpc_version=1.2.1
+_gmp_version=6.3.0
+_mpfr_version=4.2.0
+_mpc_version=1.3.1
_isl_version=0.24
create_wrksrc=yes
short_desc="Just-In-Time Compilation library for GCC"
@@ -21,10 +21,10 @@ distfiles="
${GNU_SITE}/mpfr/mpfr-${_mpfr_version}.tar.xz
${GNU_SITE}/mpc/mpc-${_mpc_version}.tar.gz
${SOURCEFORGE_SITE}/libisl/isl-${_isl_version}.tar.bz2"
-checksum="e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
- fd4829912cddd12f84181c3451cc752be224643e87fac497b69edddadc49b4f2
- 0c98a3f1732ff6ca4ea690552079da9c597872d30e96ec28414ee23c95558a7f
- 17503d2c395dfcf106b622dc142683c1199431d095367c6aacba6eec30340459
+checksum="e275e76442a6067341a27f04c5c6b83d8613144004c0413528863dc6b5c743da
+ a3c2b80201b89e68616f4ad30bc66aee4927c3ce50e33929ca819d5c43538898
+ 06a378df13501248c1b2db5aa977a2c8126ae849a9d9b7be2546fb4a9c26d993
+ ab642492f5cf882b74aa0cb730cd410a81edcdbec895183ce930e706c1c759b8
fcf78dd9656c10eb8cf9fbd5f59a0b6b01386205fe1934b3b287a0a1898145c0"
nopie=yes
lib32disabled=yes
From 4036b2dad68c5f0e69e99603c058cc75e3438165 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Mon, 7 Aug 2023 17:41:42 -0700
Subject: [PATCH 08/41] gcc-multilib: update to 13.2.0.
---
srcpkgs/gcc-multilib/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gcc-multilib/template b/srcpkgs/gcc-multilib/template
index 4ae0dadb7c6d9..6af5541e1db5c 100644
--- a/srcpkgs/gcc-multilib/template
+++ b/srcpkgs/gcc-multilib/template
@@ -3,18 +3,18 @@ archs="x86_64"
_triplet="x86_64-unknown-linux-gnu"
pkgname=gcc-multilib
-version=12.2.0
-revision=2
+version=13.2.0
+revision=1
_majorver="${version%.*}"
short_desc="GNU Compiler Collection (multilib files)"
maintainer="Orphaned <orphan@voidlinux.org>"
homepage="http://gcc.gnu.org"
license="GFDL-1.2-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
distfiles="${GNU_SITE}/gcc/gcc-${version}/gcc-${version}.tar.xz"
-checksum=e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
+checksum=e275e76442a6067341a27f04c5c6b83d8613144004c0413528863dc6b5c743da
hostmakedepends="perl flex tar zip unzip"
-makedepends="zlib-devel libmpc-devel isl15-devel libfl-devel
+makedepends="zlib-devel libmpc-devel isl-devel libfl-devel
glibc-32bit glibc-devel-32bit"
depends="
From d72fe856c21bded4f3527ac24d9a770b6c0cb4d7 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 24 Jan 2024 13:06:14 -0800
Subject: [PATCH 09/41] build-style/void-cross.sh: include libquadmath
---
common/build-style/void-cross.sh | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh
index 9193b7cf64bad..c6e542c670678 100644
--- a/common/build-style/void-cross.sh
+++ b/common/build-style/void-cross.sh
@@ -404,13 +404,8 @@ _void_cross_build_gcc() {
# note on --disable-libquadmath:
# on some platforms the library is actually necessary for the
- # fortran frontend to build, but still disable it because it
- # should not be in the resulting packages; it conflicts with
- # the libquadmath you can install into the cross root
- #
- # platforms where this is a problem should explicitly force
- # libquadmath to be on via cross_gcc_configure_args, the
- # do_install in this build-style automatically removes it
+ # fortran frontend to build, platforms where this is a problem
+ # should explicitly force libquadmath to be on via cross_gcc_configure_args
#
../gcc-${ver}/configure \
--prefix=/usr \
@@ -646,10 +641,6 @@ do_install() {
ln -sf libgnat-${gcc_major}.so ${DESTDIR}/${sysroot}/usr/lib/libgnat.so
rm -vf ${DESTDIR}/${adalib}/libgna{rl,t}.so
- # If libquadmath was forced (needed for gfortran on some platforms)
- # then remove it because it conflicts with libquadmath package
- rm -rf ${DESTDIR}/${sysroot}/usr/lib/libquadmath.*
-
# Remove libdep linker plugin because it conflicts with system binutils
rm -f ${DESTDIR}/usr/lib/bfd-plugins/libdep*
From 523a34e2fad9b3c79a699d50fc6392a6fc4fbb25 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 24 Jan 2024 13:07:24 -0800
Subject: [PATCH 10/41] cross-vpkg-dummy: update to 0.40.
---
srcpkgs/cross-vpkg-dummy/template | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/cross-vpkg-dummy/template b/srcpkgs/cross-vpkg-dummy/template
index feaccd4dc265d..2946be3f2bcec 100644
--- a/srcpkgs/cross-vpkg-dummy/template
+++ b/srcpkgs/cross-vpkg-dummy/template
@@ -1,7 +1,7 @@
# Template file for 'cross-vpkg-dummy'
pkgname=cross-vpkg-dummy
-version=0.39
-revision=6
+version=0.40
+revision=1
build_style=meta
depends="base-files>=0.126"
short_desc="Dummy meta-pkg for cross building packages with xbps-src"
@@ -21,8 +21,12 @@ provides="
libstdc++-devel-9999_1
libgfortran-9999_1
libgfortran-devel-9999_1
+ libquadmath-9999_1
+ libquadmath-devel-9999_1
libgo-9999_1
libgo-devel-9999_1
+ libgomp-9999_1
+ libgomp-devel-9999_1
libobjc-9999_1
libobjc-devel-9999_1
libssp-12.2.0_2
@@ -46,8 +50,12 @@ conflicts="
libstdc++-devel>=0
libgfortran>=0
libgfortran-devel>=0
+ libquadmath>=0
+ libquadmath-devel>=0
libgo>=0
libgo-devel>=0
+ libgomp>=0
+ libgomp-devel>=0
libobjc>=0
libobjc-devel>=0
libssp>=0
@@ -61,8 +69,8 @@ conflicts="
shlib_provides="
libatomic.so.1
libgcc_s.so.1
- libgnat-12.so
- libgnarl-12.so
+ libgnat-13.so
+ libgnarl-13.so
libstdc++.so.6
libgfortran.so.5"
repository=bootstrap
From 4f3d72968a777727c3957ffc064ddcdd1176e1e8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 26 Jan 2024 18:19:06 -0800
Subject: [PATCH 11/41] cross-aarch64-linux-gnu: update to gcc 13.2.0
---
srcpkgs/cross-aarch64-linux-gnu/template | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/cross-aarch64-linux-gnu/template b/srcpkgs/cross-aarch64-linux-gnu/template
index 91dadf4b01179..c4d7dbaf4ba19 100644
--- a/srcpkgs/cross-aarch64-linux-gnu/template
+++ b/srcpkgs/cross-aarch64-linux-gnu/template
@@ -1,11 +1,11 @@
# Template file for 'cross-aarch64-linux-gnu'
-_binutils_version=2.39
-_gcc_version=12.2.0
+_binutils_version=2.41
+_gcc_version=13.2.0
_glibc_version=2.38
-_linux_version=5.10.4
+_linux_version=6.1
pkgname=cross-aarch64-linux-gnu
-version=0.35
-revision=7
+version=0.36
+revision=1
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config"
@@ -19,11 +19,11 @@ homepage="https://www.voidlinux.org/"
distfiles="${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz"
distfiles+=" ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz"
distfiles+=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz"
-distfiles+=" ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
-checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
- e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
+distfiles+=" ${KERNEL_SITE}/kernel/v${_linux_version%%.*}.x/linux-${_linux_version}.tar.xz"
+checksum="ae9a5789e23459e59606e6714723f2d3ffc31c03174191ef0d015bdf06007450
+ e275e76442a6067341a27f04c5c6b83d8613144004c0413528863dc6b5c743da
fb82998998b2b29965467bc1b69d152e9c307d2cf301c9eafb4555b770ef3fd2
- 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
+ 2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb"
nocross=yes
cross_glibc_cflags="-O2 -march=armv8-a"
From 66ad0c9d233755f4b328cf053287682872660af2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 26 Jan 2024 18:19:07 -0800
Subject: [PATCH 12/41] cross-aarch64-linux-musl: update to gcc 13.2.0
---
srcpkgs/cross-aarch64-linux-musl/template | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template
index 831ba21e38600..b337574743388 100644
--- a/srcpkgs/cross-aarch64-linux-musl/template
+++ b/srcpkgs/cross-aarch64-linux-musl/template
@@ -1,12 +1,12 @@
# Template file for 'cross-aarch64-linux-musl'
-_binutils_version=2.39
-_gcc_version=12.2.0
+_binutils_version=2.41
+_gcc_version=13.2.0
_musl_version=1.1.24
-_linux_version=5.10.4
+_linux_version=6.1
_libucontext_version=1.0
pkgname=cross-aarch64-linux-musl
-version=0.35
-revision=5
+version=0.36
+revision=1
build_style=void-cross
configure_args="--with-arch=armv8-a"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config"
@@ -21,12 +21,12 @@ distfiles="
${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
https://musl.libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz
+ ${KERNEL_SITE}/kernel/v${_linux_version%%.*}.x/linux-${_linux_version}.tar.xz
https://github.com/kaniini/libucontext/archive/libucontext-${_libucontext_version}.tar.gz"
-checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
- e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
+checksum="ae9a5789e23459e59606e6714723f2d3ffc31c03174191ef0d015bdf06007450
+ e275e76442a6067341a27f04c5c6b83d8613144004c0413528863dc6b5c743da
1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
- 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec
+ 2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb
23714e99a87f6dea82e8a073c526325161dd65462459820b16a6162be91955bb"
nocross=yes
From 7f87fadb5b3f4101ee5d3cea566bdf8bfcb8ffe2 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 26 Jan 2024 18:19:07 -0800
Subject: [PATCH 13/41] cross-arm-linux-gnueabi: update to gcc 13.2.0
---
srcpkgs/cross-arm-linux-gnueabi/template | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/cross-arm-linux-gnueabi/template b/srcpkgs/cross-arm-linux-gnueabi/template
index a9b157cb8375b..efde1017cb864 100644
--- a/srcpkgs/cross-arm-linux-gnueabi/template
+++ b/srcpkgs/cross-arm-linux-gnueabi/template
@@ -1,11 +1,11 @@
# Template file for 'cross-arm-linux-gnueabi'
-_binutils_version=2.39
-_gcc_version=12.2.0
+_binutils_version=2.41
+_gcc_version=13.2.0
_glibc_version=2.38
-_linux_version=5.10.4
+_linux_version=6.1
pkgname=cross-arm-linux-gnueabi
-version=0.35
-revision=7
+version=0.36
+revision=1
build_style=void-cross
configure_args="--with-arch=armv5te --with-float=soft
--enable-autolink-libatomic"
@@ -20,11 +20,11 @@ homepage="https://www.voidlinux.org/"
distfiles="${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz"
distfiles+=" ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz"
distfiles+=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz"
-distfiles+=" ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
-checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
- e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
+distfiles+=" ${KERNEL_SITE}/kernel/v${_linux_version%%.*}.x/linux-${_linux_version}.tar.xz"
+checksum="ae9a5789e23459e59606e6714723f2d3ffc31c03174191ef0d015bdf06007450
+ e275e76442a6067341a27f04c5c6b83d8613144004c0413528863dc6b5c743da
fb82998998b2b29965467bc1b69d152e9c307d2cf301c9eafb4555b770ef3fd2
- 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
+ 2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb"
nocross=yes
cross_binutils_configure_args="--without-fp"
From e9b8dd092a08962668ed327b533334a4a2cd2672 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 26 Jan 2024 18:19:07 -0800
Subject: [PATCH 14/41] cross-arm-linux-gnueabihf: update to gcc 13.2.0
---
srcpkgs/cross-arm-linux-gnueabihf/template | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/cross-arm-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf/template
index 637675a151af2..dd562ceb44986 100644
--- a/srcpkgs/cross-arm-linux-gnueabihf/template
+++ b/srcpkgs/cross-arm-linux-gnueabihf/template
@@ -1,11 +1,11 @@
# Template file for 'cross-arm-linux-gnueabihf'
-_binutils_version=2.39
-_gcc_version=12.2.0
+_binutils_version=2.41
+_gcc_version=13.2.0
_glibc_version=2.38
-_linux_version=5.10.4
+_linux_version=6.1
pkgname=cross-arm-linux-gnueabihf
-version=0.35
-revision=7
+version=0.36
+revision=1
build_style=void-cross
configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard
--enable-autolink-libatomic"
@@ -20,11 +20,11 @@ homepage="https://www.voidlinux.org/"
distfiles="${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz"
distfiles+=" ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz"
distfiles+=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz"
-distfiles+=" ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
-checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
- e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
+distfiles+=" ${KERNEL_SITE}/kernel/v${_linux_version%%.*}.x/linux-${_linux_version}.tar.xz"
+checksum="ae9a5789e23459e59606e6714723f2d3ffc31c03174191ef0d015bdf06007450
+ e275e76442a6067341a27f04c5c6b83d8613144004c0413528863dc6b5c743da
fb82998998b2b29965467bc1b69d152e9c307d2cf301c9eafb4555b770ef3fd2
- 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
+ 2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb"
nocross=yes
cross_glibc_cflags="-Os -march=armv6 -mfpu=vfp -mfloat-abi=hard"
From 88d6656681f8db7d419d9ed1d09e242abe5e6bf9 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 26 Jan 2024 18:19:07 -0800
Subject: [PATCH 15/41] cross-arm-linux-musleabi: update to gcc 13.2.0
---
srcpkgs/cross-arm-linux-musleabi/template | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template
index 35e03b44b4f9a..b947fca9b89cb 100644
--- a/srcpkgs/cross-arm-linux-musleabi/template
+++ b/srcpkgs/cross-arm-linux-musleabi/template
@@ -1,12 +1,12 @@
# Template file for 'cross-arm-linux-musleabi'
-_binutils_version=2.39
-_gcc_version=12.2.0
+_binutils_version=2.41
+_gcc_version=13.2.0
_musl_version=1.1.24
-_linux_version=5.10.4
+_linux_version=6.1
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabi
-version=0.35
-revision=5
+version=0.36
+revision=1
build_style=void-cross
configure_args="--with-arch=armv5te --with-float=soft
--enable-autolink-libatomic"
@@ -22,12 +22,12 @@ distfiles="
${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
https://musl.libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz
+ ${KERNEL_SITE}/kernel/v${_linux_version%%.*}.x/linux-${_linux_version}.tar.xz
https://github.com/kaniini/libucontext/archive/libucontext-${_libucontext_version}.tar.gz"
-checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
- e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
+checksum="ae9a5789e23459e59606e6714723f2d3ffc31c03174191ef0d015bdf06007450
+ e275e76442a6067341a27f04c5c6b83d8613144004c0413528863dc6b5c743da
1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
- 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec
+ 2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb
23714e99a87f6dea82e8a073c526325161dd65462459820b16a6162be91955bb"
nocross=yes
From ca2a2491227368a981e1365ccfc43bb228b4faa8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 26 Jan 2024 18:19:07 -0800
Subject: [PATCH 16/41] cross-arm-linux-musleabihf: update to gcc 13.2.0
---
srcpkgs/cross-arm-linux-musleabihf/template | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template
index af1683f13df36..078eaf0695122 100644
--- a/srcpkgs/cross-arm-linux-musleabihf/template
+++ b/srcpkgs/cross-arm-linux-musleabihf/template
@@ -1,12 +1,12 @@
# Template file for 'cross-arm-linux-musleabihf'
-_binutils_version=2.39
-_gcc_version=12.2.0
+_binutils_version=2.41
+_gcc_version=13.2.0
_musl_version=1.1.24
-_linux_version=5.10.4
+_linux_version=6.1
_libucontext_version=1.0
pkgname=cross-arm-linux-musleabihf
-version=0.35
-revision=5
+version=0.36
+revision=1
build_style=void-cross
configure_args="--with-arch=armv6 --with-fpu=vfp --with-float=hard
--enable-autolink-libatomic"
@@ -22,12 +22,12 @@ distfiles="
${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
https://musl.libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz
+ ${KERNEL_SITE}/kernel/v${_linux_version%%.*}.x/linux-${_linux_version}.tar.xz
https://github.com/kaniini/libucontext/archive/libucontext-${_libucontext_version}.tar.gz"
-checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
- e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
+checksum="ae9a5789e23459e59606e6714723f2d3ffc31c03174191ef0d015bdf06007450
+ e275e76442a6067341a27f04c5c6b83d8613144004c0413528863dc6b5c743da
1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
- 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec
+ 2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb
23714e99a87f6dea82e8a073c526325161dd65462459820b16a6162be91955bb"
nocross=yes
From db7815ba7d7815ca7530530e820f9486dbe49318 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 26 Jan 2024 18:19:07 -0800
Subject: [PATCH 17/41] cross-armv7l-linux-gnueabihf: update to gcc 13.2.0
---
srcpkgs/cross-armv7l-linux-gnueabihf/template | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/template b/srcpkgs/cross-armv7l-linux-gnueabihf/template
index 18d502a6a41c8..60c678f3f5aa7 100644
--- a/srcpkgs/cross-armv7l-linux-gnueabihf/template
+++ b/srcpkgs/cross-armv7l-linux-gnueabihf/template
@@ -1,11 +1,11 @@
# Template file for 'cross-armv7l-linux-gnueabihf'
-_binutils_version=2.39
-_gcc_version=12.2.0
+_binutils_version=2.41
+_gcc_version=13.2.0
_glibc_version=2.38
-_linux_version=5.10.4
+_linux_version=6.1
pkgname=cross-armv7l-linux-gnueabihf
-version=0.35
-revision=7
+version=0.36
+revision=1
build_style=void-cross
configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config"
@@ -19,11 +19,11 @@ homepage="https://www.voidlinux.org/"
distfiles="${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz"
distfiles+=" ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz"
distfiles+=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz"
-distfiles+=" ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
-checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
- e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
+distfiles+=" ${KERNEL_SITE}/kernel/v${_linux_version%%.*}.x/linux-${_linux_version}.tar.xz"
+checksum="ae9a5789e23459e59606e6714723f2d3ffc31c03174191ef0d015bdf06007450
+ e275e76442a6067341a27f04c5c6b83d8613144004c0413528863dc6b5c743da
fb82998998b2b29965467bc1b69d152e9c307d2cf301c9eafb4555b770ef3fd2
- 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
+ 2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb"
nocross=yes
cross_glibc_cflags="-O2 -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard"
From 11dd19fc53c7323445a7ba3f2e8f0fd59b10680c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 26 Jan 2024 18:19:07 -0800
Subject: [PATCH 18/41] cross-armv7l-linux-musleabihf: update to gcc 13.2.0
---
srcpkgs/cross-armv7l-linux-musleabihf/template | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template
index 275f62b27be25..8fafdcae1b8dc 100644
--- a/srcpkgs/cross-armv7l-linux-musleabihf/template
+++ b/srcpkgs/cross-armv7l-linux-musleabihf/template
@@ -1,12 +1,12 @@
# Template file for 'cross-armv7l-linux-musleabihf'
-_binutils_version=2.39
-_gcc_version=12.2.0
+_binutils_version=2.41
+_gcc_version=13.2.0
_musl_version=1.1.24
-_linux_version=5.10.4
+_linux_version=6.1
_libucontext_version=1.0
pkgname=cross-armv7l-linux-musleabihf
-version=0.35
-revision=5
+version=0.36
+revision=1
build_style=void-cross
configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config"
@@ -21,12 +21,12 @@ distfiles="
${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
https://musl.libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz
+ ${KERNEL_SITE}/kernel/v${_linux_version%%.*}.x/linux-${_linux_version}.tar.xz
https://github.com/kaniini/libucontext/archive/libucontext-${_libucontext_version}.tar.gz"
-checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
- e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
+checksum="ae9a5789e23459e59606e6714723f2d3ffc31c03174191ef0d015bdf06007450
+ e275e76442a6067341a27f04c5c6b83d8613144004c0413528863dc6b5c743da
1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
- 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec
+ 2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb
23714e99a87f6dea82e8a073c526325161dd65462459820b16a6162be91955bb"
nocross=yes
From 72df7fa337762a429d9ad99ad314322c4f40f646 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 26 Jan 2024 18:19:07 -0800
Subject: [PATCH 19/41] cross-i686-linux-musl: update to gcc 13.2.0
---
srcpkgs/cross-i686-linux-musl/template | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template
index 28cfb7873e040..6894694553894 100644
--- a/srcpkgs/cross-i686-linux-musl/template
+++ b/srcpkgs/cross-i686-linux-musl/template
@@ -1,12 +1,12 @@
# Template file for 'cross-i686-linux-musl'
-_binutils_version=2.39
-_gcc_version=12.2.0
+_binutils_version=2.41
+_gcc_version=13.2.0
_musl_version=1.1.24
-_linux_version=5.10.4
+_linux_version=6.1
_libucontext_version=1.0
pkgname=cross-i686-linux-musl
-version=0.35
-revision=5
+version=0.36
+revision=1
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config"
makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel
@@ -20,12 +20,12 @@ distfiles="
${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
https://musl.libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz
+ ${KERNEL_SITE}/kernel/v${_linux_version%%.*}.x/linux-${_linux_version}.tar.xz
https://github.com/kaniini/libucontext/archive/libucontext-${_libucontext_version}.tar.gz"
-checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
- e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
+checksum="ae9a5789e23459e59606e6714723f2d3ffc31c03174191ef0d015bdf06007450
+ e275e76442a6067341a27f04c5c6b83d8613144004c0413528863dc6b5c743da
1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
- 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec
+ 2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb
23714e99a87f6dea82e8a073c526325161dd65462459820b16a6162be91955bb"
nocross=yes
From e1177b785868057c6eaf6c12a2ba14e67b220691 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 26 Jan 2024 18:19:07 -0800
Subject: [PATCH 20/41] cross-i686-pc-linux-gnu: update to gcc 13.2.0
---
srcpkgs/cross-i686-pc-linux-gnu/template | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template
index c695fb2f37a20..7a82c328d4a93 100644
--- a/srcpkgs/cross-i686-pc-linux-gnu/template
+++ b/srcpkgs/cross-i686-pc-linux-gnu/template
@@ -1,11 +1,11 @@
# Template file for 'cross-i686-pc-linux-gnu'
-_binutils_version=2.39
-_gcc_version=12.2.0
+_binutils_version=2.41
+_gcc_version=13.2.0
_glibc_version=2.38
-_linux_version=5.10.4
+_linux_version=6.1
pkgname=cross-i686-pc-linux-gnu
-version=0.35
-revision=7
+version=0.36
+revision=1
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config"
makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel
@@ -18,11 +18,11 @@ homepage="https://www.voidlinux.org/"
distfiles="${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz"
distfiles+=" ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz"
distfiles+=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz"
-distfiles+=" ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
-checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
- e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
+distfiles+=" ${KERNEL_SITE}/kernel/v${_linux_version%%.*}.x/linux-${_linux_version}.tar.xz"
+checksum="ae9a5789e23459e59606e6714723f2d3ffc31c03174191ef0d015bdf06007450
+ e275e76442a6067341a27f04c5c6b83d8613144004c0413528863dc6b5c743da
fb82998998b2b29965467bc1b69d152e9c307d2cf301c9eafb4555b770ef3fd2
- 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
+ 2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb"
nocross=yes
# explicitly enable for final gcc, as gfortran does not build without on x86
From 1feb8741f0ab1a4865960cb1fa74b177bb26d8fb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 26 Jan 2024 18:19:07 -0800
Subject: [PATCH 21/41] cross-mips-linux-musl: update to gcc 13.2.0
---
srcpkgs/cross-mips-linux-musl/template | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template
index 2c796a7c09cd7..09cc75f67e076 100644
--- a/srcpkgs/cross-mips-linux-musl/template
+++ b/srcpkgs/cross-mips-linux-musl/template
@@ -1,11 +1,11 @@
# Template file for 'cross-mips-linux-musl'
-_binutils_version=2.39
-_gcc_version=12.2.0
+_binutils_version=2.41
+_gcc_version=13.2.0
_musl_version=1.1.24
-_linux_version=5.10.4
+_linux_version=6.1
pkgname=cross-mips-linux-musl
-version=0.35
-revision=5
+version=0.36
+revision=1
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv --enable-autolink-libatomic"
@@ -21,11 +21,11 @@ distfiles="
${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
https://musl.libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
-checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
- e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
+ ${KERNEL_SITE}/kernel/v${_linux_version%%.*}.x/linux-${_linux_version}.tar.xz"
+checksum="ae9a5789e23459e59606e6714723f2d3ffc31c03174191ef0d015bdf06007450
+ e275e76442a6067341a27f04c5c6b83d8613144004c0413528863dc6b5c743da
1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
- 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
+ 2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb"
nocross=yes
cross_gcc_skip_go=yes
From ab52be3ce6dccbec6a2e4a6004e7b1e09c6b18d6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 26 Jan 2024 18:19:07 -0800
Subject: [PATCH 22/41] cross-mips-linux-muslhf: update to gcc 13.2.0
---
srcpkgs/cross-mips-linux-muslhf/template | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/cross-mips-linux-muslhf/template b/srcpkgs/cross-mips-linux-muslhf/template
index 7333d3b5d70cc..8ab1a6778777c 100644
--- a/srcpkgs/cross-mips-linux-muslhf/template
+++ b/srcpkgs/cross-mips-linux-muslhf/template
@@ -1,11 +1,11 @@
# Template file for 'cross-mips-linux-muslhf'
-_binutils_version=2.39
-_gcc_version=12.2.0
+_binutils_version=2.41
+_gcc_version=13.2.0
_musl_version=1.1.24
-_linux_version=5.10.4
+_linux_version=6.1
pkgname=cross-mips-linux-muslhf
-version=0.35
-revision=5
+version=0.36
+revision=1
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv --enable-autolink-libatomic"
@@ -21,11 +21,11 @@ distfiles="
${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
https://musl.libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
-checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
- e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
+ ${KERNEL_SITE}/kernel/v${_linux_version%%.*}.x/linux-${_linux_version}.tar.xz"
+checksum="ae9a5789e23459e59606e6714723f2d3ffc31c03174191ef0d015bdf06007450
+ e275e76442a6067341a27f04c5c6b83d8613144004c0413528863dc6b5c743da
1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
- 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
+ 2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb"
nocross=yes
cross_gcc_skip_go=yes
From 0fc25d156b1e0c94dc175bed7d2bd2043e18e5ea Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 26 Jan 2024 18:19:08 -0800
Subject: [PATCH 23/41] cross-mipsel-linux-musl: update to gcc 13.2.0
---
srcpkgs/cross-mipsel-linux-musl/template | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template
index 992c6bc42e955..c3df0e2fe8f05 100644
--- a/srcpkgs/cross-mipsel-linux-musl/template
+++ b/srcpkgs/cross-mipsel-linux-musl/template
@@ -1,11 +1,11 @@
# Template file for 'cross-mipsel-linux-musl'
-_binutils_version=2.39
-_gcc_version=12.2.0
+_binutils_version=2.41
+_gcc_version=13.2.0
_musl_version=1.1.24
-_linux_version=5.10.4
+_linux_version=6.1
pkgname=cross-mipsel-linux-musl
-version=0.35
-revision=5
+version=0.36
+revision=1
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=soft
--with-linker-hash-style=sysv --enable-autolink-libatomic"
@@ -21,11 +21,11 @@ distfiles="
${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
https://musl.libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
-checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
- e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
+ ${KERNEL_SITE}/kernel/v${_linux_version%%.*}.x/linux-${_linux_version}.tar.xz"
+checksum="ae9a5789e23459e59606e6714723f2d3ffc31c03174191ef0d015bdf06007450
+ e275e76442a6067341a27f04c5c6b83d8613144004c0413528863dc6b5c743da
1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
- 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
+ 2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb"
nocross=yes
cross_gcc_skip_go=yes
From 0642c2a45f678d6bc6e8a405db69cbb0fe811cb6 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 26 Jan 2024 18:19:08 -0800
Subject: [PATCH 24/41] cross-mipsel-linux-muslhf: update to gcc 13.2.0
---
srcpkgs/cross-mipsel-linux-muslhf/template | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/cross-mipsel-linux-muslhf/template b/srcpkgs/cross-mipsel-linux-muslhf/template
index cde29e2129eef..07568484c0d66 100644
--- a/srcpkgs/cross-mipsel-linux-muslhf/template
+++ b/srcpkgs/cross-mipsel-linux-muslhf/template
@@ -1,11 +1,11 @@
# Template file for 'cross-mipsel-linux-muslhf'
-_binutils_version=2.39
-_gcc_version=12.2.0
+_binutils_version=2.41
+_gcc_version=13.2.0
_musl_version=1.1.24
-_linux_version=5.10.4
+_linux_version=6.1
pkgname=cross-mipsel-linux-muslhf
-version=0.35
-revision=5
+version=0.36
+revision=1
build_style=void-cross
configure_args="--with-arch=mips32r2 --with-float=hard
--with-linker-hash-style=sysv --enable-autolink-libatomic"
@@ -21,11 +21,11 @@ distfiles="
${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
https://musl.libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
-checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
- e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
+ ${KERNEL_SITE}/kernel/v${_linux_version%%.*}.x/linux-${_linux_version}.tar.xz"
+checksum="ae9a5789e23459e59606e6714723f2d3ffc31c03174191ef0d015bdf06007450
+ e275e76442a6067341a27f04c5c6b83d8613144004c0413528863dc6b5c743da
1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
- 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
+ 2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb"
nocross=yes
cross_gcc_skip_go=yes
From 010bdbce4dee999b3024e84e924d68e8297715dc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 26 Jan 2024 18:19:08 -0800
Subject: [PATCH 25/41] cross-powerpc-linux-gnu: update to gcc 13.2.0
---
srcpkgs/cross-powerpc-linux-gnu/template | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/cross-powerpc-linux-gnu/template b/srcpkgs/cross-powerpc-linux-gnu/template
index 337d1c652ab91..3a14a62bcec29 100644
--- a/srcpkgs/cross-powerpc-linux-gnu/template
+++ b/srcpkgs/cross-powerpc-linux-gnu/template
@@ -1,11 +1,11 @@
# Template file for 'cross-powerpc-linux-gnu'
-_binutils_version=2.39
-_gcc_version=12.2.0
+_binutils_version=2.41
+_gcc_version=13.2.0
_glibc_version=2.38
-_linux_version=5.10.4
+_linux_version=6.1
pkgname=cross-powerpc-linux-gnu
-version=0.35
-revision=7
+version=0.36
+revision=1
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--enable-autolink-libatomic"
@@ -20,11 +20,11 @@ homepage="https://www.voidlinux.org/"
distfiles="${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz"
distfiles+=" ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz"
distfiles+=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz"
-distfiles+=" ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
-checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
- e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
+distfiles+=" ${KERNEL_SITE}/kernel/v${_linux_version%%.*}.x/linux-${_linux_version}.tar.xz"
+checksum="ae9a5789e23459e59606e6714723f2d3ffc31c03174191ef0d015bdf06007450
+ e275e76442a6067341a27f04c5c6b83d8613144004c0413528863dc6b5c743da
fb82998998b2b29965467bc1b69d152e9c307d2cf301c9eafb4555b770ef3fd2
- 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
+ 2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb"
nocross=yes
cross_gcc_skip_go=yes
From b4b7751fac46367b24868d924fe824f8c110c874 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 26 Jan 2024 18:19:08 -0800
Subject: [PATCH 26/41] cross-powerpc-linux-musl: update to gcc 13.2.0
---
srcpkgs/cross-powerpc-linux-musl/template | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template
index a73d324f40cc3..fc56dde6bd238 100644
--- a/srcpkgs/cross-powerpc-linux-musl/template
+++ b/srcpkgs/cross-powerpc-linux-musl/template
@@ -1,11 +1,11 @@
# Template file for 'cross-powerpc-linux-musl'
-_binutils_version=2.39
-_gcc_version=12.2.0
+_binutils_version=2.41
+_gcc_version=13.2.0
_musl_version=1.1.24
-_linux_version=5.10.4
+_linux_version=6.1
pkgname=cross-powerpc-linux-musl
-version=0.35
-revision=5
+version=0.36
+revision=1
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --enable-autolink-libatomic"
@@ -21,11 +21,11 @@ distfiles="
${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
https://musl.libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
-checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
- e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
+ ${KERNEL_SITE}/kernel/v${_linux_version%%.*}.x/linux-${_linux_version}.tar.xz"
+checksum="ae9a5789e23459e59606e6714723f2d3ffc31c03174191ef0d015bdf06007450
+ e275e76442a6067341a27f04c5c6b83d8613144004c0413528863dc6b5c743da
1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
- 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
+ 2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb"
nocross=yes
cross_gcc_skip_go=yes
From a4164722fb73c66625ee8b9f79865a679dbc709c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 26 Jan 2024 18:19:08 -0800
Subject: [PATCH 27/41] cross-powerpc64-linux-gnu: update to gcc 13.2.0
---
srcpkgs/cross-powerpc64-linux-gnu/template | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/cross-powerpc64-linux-gnu/template b/srcpkgs/cross-powerpc64-linux-gnu/template
index f4af015668699..f664f1dbc764a 100644
--- a/srcpkgs/cross-powerpc64-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64-linux-gnu/template
@@ -1,11 +1,11 @@
# Template file for 'cross-powerpc64-linux-gnu'
-_binutils_version=2.39
-_gcc_version=12.2.0
+_binutils_version=2.41
+_gcc_version=13.2.0
_glibc_version=2.38
-_linux_version=5.10.4
+_linux_version=6.1
pkgname=cross-powerpc64-linux-gnu
-version=0.35
-revision=7
+version=0.36
+revision=1
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
--enable-targets=powerpc-linux --enable-autolink-libatomic"
@@ -20,11 +20,11 @@ homepage="https://www.voidlinux.org/"
distfiles="${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz"
distfiles+=" ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz"
distfiles+=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz"
-distfiles+=" ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
-checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
- e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
+distfiles+=" ${KERNEL_SITE}/kernel/v${_linux_version%%.*}.x/linux-${_linux_version}.tar.xz"
+checksum="ae9a5789e23459e59606e6714723f2d3ffc31c03174191ef0d015bdf06007450
+ e275e76442a6067341a27f04c5c6b83d8613144004c0413528863dc6b5c743da
fb82998998b2b29965467bc1b69d152e9c307d2cf301c9eafb4555b770ef3fd2
- 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
+ 2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb"
nocross=yes
cross_binutils_configure_args="--enable-secureplt"
From 05d4882da39cf339023754eaee91a3784eb510d8 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 26 Jan 2024 18:19:08 -0800
Subject: [PATCH 28/41] cross-powerpc64-linux-musl: update to gcc 13.2.0
---
srcpkgs/cross-powerpc64-linux-musl/template | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template
index 5224e63219882..b3903e8110aa9 100644
--- a/srcpkgs/cross-powerpc64-linux-musl/template
+++ b/srcpkgs/cross-powerpc64-linux-musl/template
@@ -1,12 +1,12 @@
# Template file for 'cross-powerpc64-linux-musl'
-_binutils_version=2.39
-_gcc_version=12.2.0
+_binutils_version=2.41
+_gcc_version=13.2.0
_musl_version=1.1.24
-_linux_version=5.10.4
+_linux_version=6.1
_libucontext_version=1.0
pkgname=cross-powerpc64-linux-musl
-version=0.35
-revision=5
+version=0.36
+revision=1
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpc-linux
@@ -23,12 +23,12 @@ distfiles="
${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
https://musl.libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz
+ ${KERNEL_SITE}/kernel/v${_linux_version%%.*}.x/linux-${_linux_version}.tar.xz
https://github.com/kaniini/libucontext/archive/libucontext-${_libucontext_version}.tar.gz"
-checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
- e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
+checksum="ae9a5789e23459e59606e6714723f2d3ffc31c03174191ef0d015bdf06007450
+ e275e76442a6067341a27f04c5c6b83d8613144004c0413528863dc6b5c743da
1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
- 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec
+ 2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb
23714e99a87f6dea82e8a073c526325161dd65462459820b16a6162be91955bb"
nocross=yes
From 8cff06b5db9a8792cb6c098aac4b51aec8c2228f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 26 Jan 2024 18:19:08 -0800
Subject: [PATCH 29/41] cross-powerpc64le-linux-gnu: update to gcc 13.2.0
---
srcpkgs/cross-powerpc64le-linux-gnu/template | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-gnu/template b/srcpkgs/cross-powerpc64le-linux-gnu/template
index 6181e0e4d236d..e0ca6e9ce2d01 100644
--- a/srcpkgs/cross-powerpc64le-linux-gnu/template
+++ b/srcpkgs/cross-powerpc64le-linux-gnu/template
@@ -1,11 +1,11 @@
# Template file for 'cross-powerpc64le-linux-gnu'
-_binutils_version=2.39
-_gcc_version=12.2.0
+_binutils_version=2.41
+_gcc_version=13.2.0
_glibc_version=2.38
-_linux_version=5.10.4
+_linux_version=6.1
pkgname=cross-powerpc64le-linux-gnu
-version=0.35
-revision=7
+version=0.36
+revision=1
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify --with-abi=elfv2
--enable-targets=powerpcle-linux --enable-autolink-libatomic"
@@ -20,11 +20,11 @@ homepage="https://www.voidlinux.org/"
distfiles="${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz"
distfiles+=" ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz"
distfiles+=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz"
-distfiles+=" ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
-checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
- e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
+distfiles+=" ${KERNEL_SITE}/kernel/v${_linux_version%%.*}.x/linux-${_linux_version}.tar.xz"
+checksum="ae9a5789e23459e59606e6714723f2d3ffc31c03174191ef0d015bdf06007450
+ e275e76442a6067341a27f04c5c6b83d8613144004c0413528863dc6b5c743da
fb82998998b2b29965467bc1b69d152e9c307d2cf301c9eafb4555b770ef3fd2
- 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
+ 2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb"
nocross=yes
cross_binutils_configure_args="--enable-secureplt"
From 24fbff09e8cb7627bb9af6ba4af8cec0d59371fc Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 26 Jan 2024 18:19:08 -0800
Subject: [PATCH 30/41] cross-powerpc64le-linux-musl: update to gcc 13.2.0
---
srcpkgs/cross-powerpc64le-linux-musl/template | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template
index f7edddfb10a29..d76fbe3d250ed 100644
--- a/srcpkgs/cross-powerpc64le-linux-musl/template
+++ b/srcpkgs/cross-powerpc64le-linux-musl/template
@@ -1,12 +1,12 @@
# Template file for 'cross-powerpc64le-linux-musl'
-_binutils_version=2.39
-_gcc_version=12.2.0
+_binutils_version=2.41
+_gcc_version=13.2.0
_musl_version=1.1.24
-_linux_version=5.10.4
+_linux_version=6.1
_libucontext_version=1.0
pkgname=cross-powerpc64le-linux-musl
-version=0.35
-revision=5
+version=0.36
+revision=1
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --with-abi=elfv2 --enable-targets=powerpcle-linux
@@ -23,12 +23,12 @@ distfiles="
${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
https://musl.libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz
+ ${KERNEL_SITE}/kernel/v${_linux_version%%.*}.x/linux-${_linux_version}.tar.xz
https://github.com/kaniini/libucontext/archive/libucontext-${_libucontext_version}.tar.gz"
-checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
- e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
+checksum="ae9a5789e23459e59606e6714723f2d3ffc31c03174191ef0d015bdf06007450
+ e275e76442a6067341a27f04c5c6b83d8613144004c0413528863dc6b5c743da
1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
- 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec
+ 2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb
23714e99a87f6dea82e8a073c526325161dd65462459820b16a6162be91955bb"
nocross=yes
From caa1a96678149d877a448dceab90dac244e9a629 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 26 Jan 2024 18:19:08 -0800
Subject: [PATCH 31/41] cross-powerpcle-linux-gnu: update to gcc 13.2.0
---
srcpkgs/cross-powerpcle-linux-gnu/template | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/cross-powerpcle-linux-gnu/template b/srcpkgs/cross-powerpcle-linux-gnu/template
index 720cf97873314..f18370a304875 100644
--- a/srcpkgs/cross-powerpcle-linux-gnu/template
+++ b/srcpkgs/cross-powerpcle-linux-gnu/template
@@ -1,11 +1,11 @@
# Template file for 'cross-powerpcle-linux-gnu'
-_binutils_version=2.39
-_gcc_version=12.2.0
+_binutils_version=2.41
+_gcc_version=13.2.0
_glibc_version=2.38
-_linux_version=5.10.4
+_linux_version=6.1
pkgname=cross-powerpcle-linux-gnu
-version=0.35
-revision=7
+version=0.36
+revision=1
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--enable-autolink-libatomic"
@@ -21,11 +21,11 @@ distfiles="
${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz
- ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
-checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
- e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
+ ${KERNEL_SITE}/kernel/v${_linux_version%%.*}.x/linux-${_linux_version}.tar.xz"
+checksum="ae9a5789e23459e59606e6714723f2d3ffc31c03174191ef0d015bdf06007450
+ e275e76442a6067341a27f04c5c6b83d8613144004c0413528863dc6b5c743da
fb82998998b2b29965467bc1b69d152e9c307d2cf301c9eafb4555b770ef3fd2
- 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
+ 2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb"
nocross=yes
cross_gcc_skip_go=yes
From 5f93753c512ca6d2650233e245d0e7832350be3f Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 26 Jan 2024 18:19:08 -0800
Subject: [PATCH 32/41] cross-powerpcle-linux-musl: update to gcc 13.2.0
---
srcpkgs/cross-powerpcle-linux-musl/template | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/cross-powerpcle-linux-musl/template b/srcpkgs/cross-powerpcle-linux-musl/template
index c764f44f739a7..5f03d1d7f576e 100644
--- a/srcpkgs/cross-powerpcle-linux-musl/template
+++ b/srcpkgs/cross-powerpcle-linux-musl/template
@@ -1,11 +1,11 @@
# Template file for 'cross-powerpcle-linux-musl'
-_binutils_version=2.39
-_gcc_version=12.2.0
+_binutils_version=2.41
+_gcc_version=13.2.0
_musl_version=1.1.24
-_linux_version=5.10.4
+_linux_version=6.1
pkgname=cross-powerpcle-linux-musl
-version=0.35
-revision=5
+version=0.36
+revision=1
build_style=void-cross
configure_args="--enable-secureplt --disable-vtable-verify
--disable-decimal-float --enable-autolink-libatomic"
@@ -21,11 +21,11 @@ distfiles="
${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
https://musl.libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
-checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
- e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
+ ${KERNEL_SITE}/kernel/v${_linux_version%%.*}.x/linux-${_linux_version}.tar.xz"
+checksum="ae9a5789e23459e59606e6714723f2d3ffc31c03174191ef0d015bdf06007450
+ e275e76442a6067341a27f04c5c6b83d8613144004c0413528863dc6b5c743da
1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
- 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
+ 2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb"
nocross=yes
cross_gcc_skip_go=yes
From c345e8204e8ede359d19e6d0fc2b362935f44fe4 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 26 Jan 2024 18:19:08 -0800
Subject: [PATCH 33/41] cross-riscv64-linux-gnu: update to gcc 13.2.0
---
srcpkgs/cross-riscv64-linux-gnu/template | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/cross-riscv64-linux-gnu/template b/srcpkgs/cross-riscv64-linux-gnu/template
index bd1a010d98269..690b5d6184239 100644
--- a/srcpkgs/cross-riscv64-linux-gnu/template
+++ b/srcpkgs/cross-riscv64-linux-gnu/template
@@ -1,11 +1,11 @@
# Template file for 'cross-riscv64-linux-gnu'
-_binutils_version=2.39
-_gcc_version=12.2.0
+_binutils_version=2.41
+_gcc_version=13.2.0
_glibc_version=2.38
-_linux_version=5.10.4
+_linux_version=6.1
pkgname=cross-riscv64-linux-gnu
-version=0.35
-revision=5
+version=0.36
+revision=1
build_style=void-cross
configure_args="--with-arch=rv64gc --with-abi=lp64d --enable-autolink-libatomic --disable-multilib"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config"
@@ -19,11 +19,11 @@ homepage="https://www.voidlinux.org/"
distfiles="${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz"
distfiles+=" ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz"
distfiles+=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz"
-distfiles+=" ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
-checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
- e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
+distfiles+=" ${KERNEL_SITE}/kernel/v${_linux_version%%.*}.x/linux-${_linux_version}.tar.xz"
+checksum="ae9a5789e23459e59606e6714723f2d3ffc31c03174191ef0d015bdf06007450
+ e275e76442a6067341a27f04c5c6b83d8613144004c0413528863dc6b5c743da
fb82998998b2b29965467bc1b69d152e9c307d2cf301c9eafb4555b770ef3fd2
- 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
+ 2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb"
nocross=yes
cross_glibc_cflags="-O2"
From 43a96d8cfc7eab12e0211e64cb770dffdbf55027 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 26 Jan 2024 18:19:09 -0800
Subject: [PATCH 34/41] cross-riscv64-linux-musl: update to gcc 13.2.0
---
srcpkgs/cross-riscv64-linux-musl/template | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/cross-riscv64-linux-musl/template b/srcpkgs/cross-riscv64-linux-musl/template
index d20751fd9fdb6..e20d2d8951465 100644
--- a/srcpkgs/cross-riscv64-linux-musl/template
+++ b/srcpkgs/cross-riscv64-linux-musl/template
@@ -1,12 +1,12 @@
# Template file for 'cross-riscv64-linux-musl'
-_binutils_version=2.39
-_gcc_version=12.2.0
+_binutils_version=2.41
+_gcc_version=13.2.0
_musl_version=1.1.24
-_linux_version=5.10.4
+_linux_version=6.1
_libucontext_version=1.0
pkgname=cross-riscv64-linux-musl
-version=0.35
-revision=2
+version=0.36
+revision=1
build_style=void-cross
configure_args="--with-arch=rv64gc --with-abi=lp64d --enable-autolink-libatomic --disable-multilib"
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config"
@@ -21,12 +21,12 @@ distfiles="
${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
https://musl.libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz
+ ${KERNEL_SITE}/kernel/v${_linux_version%%.*}.x/linux-${_linux_version}.tar.xz
https://github.com/kaniini/libucontext/archive/libucontext-${_libucontext_version}.tar.gz"
-checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
- e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
+checksum="ae9a5789e23459e59606e6714723f2d3ffc31c03174191ef0d015bdf06007450
+ e275e76442a6067341a27f04c5c6b83d8613144004c0413528863dc6b5c743da
1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
- 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec
+ 2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb
23714e99a87f6dea82e8a073c526325161dd65462459820b16a6162be91955bb"
nocross=yes
From 11ce449420d359a0b4f995dad64e4ede3c8382d0 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 26 Jan 2024 18:19:09 -0800
Subject: [PATCH 35/41] cross-x86_64-linux-gnu: update to gcc 13.2.0
---
srcpkgs/cross-x86_64-linux-gnu/template | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/cross-x86_64-linux-gnu/template b/srcpkgs/cross-x86_64-linux-gnu/template
index b7c2bb3f04fd7..4fb35cb6f736c 100644
--- a/srcpkgs/cross-x86_64-linux-gnu/template
+++ b/srcpkgs/cross-x86_64-linux-gnu/template
@@ -1,11 +1,11 @@
# Template file for 'cross-x86_64-linux-gnu'
-_binutils_version=2.39
-_gcc_version=12.2.0
+_binutils_version=2.41
+_gcc_version=13.2.0
_glibc_version=2.38
-_linux_version=5.10.4
+_linux_version=6.1
pkgname=cross-x86_64-linux-gnu
-version=0.35
-revision=7
+version=0.36
+revision=1
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config"
makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel
@@ -18,11 +18,11 @@ homepage="https://www.voidlinux.org/"
distfiles="${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz"
distfiles+=" ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz"
distfiles+=" ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz"
-distfiles+=" ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz"
-checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
- e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
+distfiles+=" ${KERNEL_SITE}/kernel/v${_linux_version%%.*}.x/linux-${_linux_version}.tar.xz"
+checksum="ae9a5789e23459e59606e6714723f2d3ffc31c03174191ef0d015bdf06007450
+ e275e76442a6067341a27f04c5c6b83d8613144004c0413528863dc6b5c743da
fb82998998b2b29965467bc1b69d152e9c307d2cf301c9eafb4555b770ef3fd2
- 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec"
+ 2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb"
nocross=yes
# explicitly enable for final gcc, gfortran does not build without on x86
From 120617d7e597a08a4fb8eac387b0d005b2231deb Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 26 Jan 2024 18:19:09 -0800
Subject: [PATCH 36/41] cross-x86_64-linux-musl: update to gcc 13.2.0
---
srcpkgs/cross-x86_64-linux-musl/template | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template
index 84f4620417e9b..19fc88f6e0880 100644
--- a/srcpkgs/cross-x86_64-linux-musl/template
+++ b/srcpkgs/cross-x86_64-linux-musl/template
@@ -1,12 +1,12 @@
# Template file for 'cross-x86_64-linux-musl'
-_binutils_version=2.39
-_gcc_version=12.2.0
+_binutils_version=2.41
+_gcc_version=13.2.0
_musl_version=1.1.24
-_linux_version=5.10.4
+_linux_version=6.1
_libucontext_version=1.0
pkgname=cross-x86_64-linux-musl
-version=0.35
-revision=5
+version=0.36
+revision=1
build_style=void-cross
hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3 pkg-config"
makedepends="isl-devel libmpc-devel gmp-devel mpfr-devel
@@ -20,12 +20,12 @@ distfiles="
${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz
${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz
https://musl.libc.org/releases/musl-${_musl_version}.tar.gz
- ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz
+ ${KERNEL_SITE}/kernel/v${_linux_version%%.*}.x/linux-${_linux_version}.tar.xz
https://github.com/kaniini/libucontext/archive/libucontext-${_libucontext_version}.tar.gz"
-checksum="645c25f563b8adc0a81dbd6a41cffbf4d37083a382e02d5d3df4f65c09516d00
- e549cf9cf3594a00e27b6589d4322d70e0720cdd213f39beb4181e06926230ff
+checksum="ae9a5789e23459e59606e6714723f2d3ffc31c03174191ef0d015bdf06007450
+ e275e76442a6067341a27f04c5c6b83d8613144004c0413528863dc6b5c743da
1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
- 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec
+ 2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb
23714e99a87f6dea82e8a073c526325161dd65462459820b16a6162be91955bb"
nocross=yes
From 60d206b281bdd59aba4963066c78b6108337d383 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 17 Jan 2024 15:21:25 -0800
Subject: [PATCH 37/41] linux6.6: update kernel config for gcc 13
---
srcpkgs/linux6.6/files/arm64-dotconfig | 1 +
srcpkgs/linux6.6/files/i386-dotconfig | 1 +
srcpkgs/linux6.6/files/x86_64-dotconfig | 1 +
3 files changed, 3 insertions(+)
diff --git a/srcpkgs/linux6.6/files/arm64-dotconfig b/srcpkgs/linux6.6/files/arm64-dotconfig
index 688a0dba94a1d..93b8ad6d2d835 100644
--- a/srcpkgs/linux6.6/files/arm64-dotconfig
+++ b/srcpkgs/linux6.6/files/arm64-dotconfig
@@ -12816,6 +12816,7 @@ CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
# CONFIG_DEBUG_INFO_REDUCED is not set
CONFIG_DEBUG_INFO_COMPRESSED_NONE=y
# CONFIG_DEBUG_INFO_COMPRESSED_ZLIB is not set
+# CONFIG_DEBUG_INFO_COMPRESSED_ZSTD is not set
# CONFIG_DEBUG_INFO_SPLIT is not set
CONFIG_DEBUG_INFO_BTF=y
CONFIG_PAHOLE_HAS_SPLIT_BTF=y
diff --git a/srcpkgs/linux6.6/files/i386-dotconfig b/srcpkgs/linux6.6/files/i386-dotconfig
index f42b6646a248b..f79bca8495140 100644
--- a/srcpkgs/linux6.6/files/i386-dotconfig
+++ b/srcpkgs/linux6.6/files/i386-dotconfig
@@ -10567,6 +10567,7 @@ CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
# CONFIG_DEBUG_INFO_REDUCED is not set
CONFIG_DEBUG_INFO_COMPRESSED_NONE=y
# CONFIG_DEBUG_INFO_COMPRESSED_ZLIB is not set
+# CONFIG_DEBUG_INFO_COMPRESSED_ZSTD is not set
# CONFIG_DEBUG_INFO_SPLIT is not set
CONFIG_DEBUG_INFO_BTF=y
CONFIG_PAHOLE_HAS_SPLIT_BTF=y
diff --git a/srcpkgs/linux6.6/files/x86_64-dotconfig b/srcpkgs/linux6.6/files/x86_64-dotconfig
index 02fe6de8db0de..f59f673ea0028 100644
--- a/srcpkgs/linux6.6/files/x86_64-dotconfig
+++ b/srcpkgs/linux6.6/files/x86_64-dotconfig
@@ -10973,6 +10973,7 @@ CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
# CONFIG_DEBUG_INFO_REDUCED is not set
CONFIG_DEBUG_INFO_COMPRESSED_NONE=y
# CONFIG_DEBUG_INFO_COMPRESSED_ZLIB is not set
+# CONFIG_DEBUG_INFO_COMPRESSED_ZSTD is not set
# CONFIG_DEBUG_INFO_SPLIT is not set
CONFIG_DEBUG_INFO_BTF=y
CONFIG_PAHOLE_HAS_SPLIT_BTF=y
From a8582ae059c64dc4d1330e6f280fb96116888bba Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Wed, 17 Jan 2024 15:21:45 -0800
Subject: [PATCH 38/41] linux6.7: update kernel config for gcc 13
---
srcpkgs/linux6.7/files/arm64-dotconfig | 1 +
srcpkgs/linux6.7/files/i386-dotconfig | 1 +
srcpkgs/linux6.7/files/x86_64-dotconfig | 1 +
3 files changed, 3 insertions(+)
diff --git a/srcpkgs/linux6.7/files/arm64-dotconfig b/srcpkgs/linux6.7/files/arm64-dotconfig
index 9b3a5816b2aa2..13b7f0b88b801 100644
--- a/srcpkgs/linux6.7/files/arm64-dotconfig
+++ b/srcpkgs/linux6.7/files/arm64-dotconfig
@@ -12909,6 +12909,7 @@ CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
# CONFIG_DEBUG_INFO_REDUCED is not set
CONFIG_DEBUG_INFO_COMPRESSED_NONE=y
# CONFIG_DEBUG_INFO_COMPRESSED_ZLIB is not set
+# CONFIG_DEBUG_INFO_COMPRESSED_ZSTD is not set
# CONFIG_DEBUG_INFO_SPLIT is not set
CONFIG_DEBUG_INFO_BTF=y
CONFIG_PAHOLE_HAS_SPLIT_BTF=y
diff --git a/srcpkgs/linux6.7/files/i386-dotconfig b/srcpkgs/linux6.7/files/i386-dotconfig
index 08f008ba09097..0e5f1f2868fea 100644
--- a/srcpkgs/linux6.7/files/i386-dotconfig
+++ b/srcpkgs/linux6.7/files/i386-dotconfig
@@ -10646,6 +10646,7 @@ CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
# CONFIG_DEBUG_INFO_REDUCED is not set
CONFIG_DEBUG_INFO_COMPRESSED_NONE=y
# CONFIG_DEBUG_INFO_COMPRESSED_ZLIB is not set
+# CONFIG_DEBUG_INFO_COMPRESSED_ZSTD is not set
# CONFIG_DEBUG_INFO_SPLIT is not set
CONFIG_DEBUG_INFO_BTF=y
CONFIG_PAHOLE_HAS_SPLIT_BTF=y
diff --git a/srcpkgs/linux6.7/files/x86_64-dotconfig b/srcpkgs/linux6.7/files/x86_64-dotconfig
index 9ec1f7922f4f9..da4f1fd47c6ee 100644
--- a/srcpkgs/linux6.7/files/x86_64-dotconfig
+++ b/srcpkgs/linux6.7/files/x86_64-dotconfig
@@ -11057,6 +11057,7 @@ CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y
# CONFIG_DEBUG_INFO_REDUCED is not set
CONFIG_DEBUG_INFO_COMPRESSED_NONE=y
# CONFIG_DEBUG_INFO_COMPRESSED_ZLIB is not set
+# CONFIG_DEBUG_INFO_COMPRESSED_ZSTD is not set
# CONFIG_DEBUG_INFO_SPLIT is not set
CONFIG_DEBUG_INFO_BTF=y
CONFIG_PAHOLE_HAS_SPLIT_BTF=y
From 11b13f46829fc809520fd1861c194257233a962c Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Sat, 27 Jan 2024 01:25:29 -0800
Subject: [PATCH 39/41] elogind: fix build on musl without basename
compatibility decl
musl provided a compatibility basename declaration so applications
expecting GNU basename could still compile even though musl doesn't provide
GNU basename and only POSIX basename.
Prevent build failure when this is removed.
---
srcpkgs/elogind/patches/musl-basename.patch | 42 +++++++++++++++++++++
srcpkgs/elogind/template | 2 +-
2 files changed, 43 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/elogind/patches/musl-basename.patch
diff --git a/srcpkgs/elogind/patches/musl-basename.patch b/srcpkgs/elogind/patches/musl-basename.patch
new file mode 100644
index 0000000000000..ff04009ffc4ef
--- /dev/null
+++ b/srcpkgs/elogind/patches/musl-basename.patch
@@ -0,0 +1,42 @@
+Add missing include for POSIX basename, since systemd-logind expects basename in string.h
+
+diff -rup src/basic/musl_missing.h.orig src/basic/musl_missing.h
+--- a/src/basic/musl_missing.h
++++ b/src/basic/musl_missing.h
+@@ -56,6 +54,10 @@ void elogind_set_program_name(const char
+ } ) )
+ #endif
+
++/* Poor man's basename */
++#define basename(path) \
++ (strrchr(path, '/') ? strrchr(path, '/')+1 : path)
++
+ /* getnameinfo(3) glibc extensions are undefined in musl libc */
+ #define NI_IDN 0
+ #define NI_IDN_USE_STD3_ASCII_RULES 0
+From c8d96ff2b87b8dfb8d521d4c2e6fb57992dbf659 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Wed, 21 Dec 2022 16:13:23 +0100
+Subject: [PATCH] tests: we don't actually use basename() anymore
+
+---
+ src/shared/tests.c | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/src/shared/tests.c b/src/shared/tests.c
+index 5a05daa643..9d8bbeea79 100644
+--- a/src/shared/tests.c
++++ b/src/shared/tests.c
+@@ -7,12 +7,6 @@
+ #include <sys/mount.h>
+ #include <sys/wait.h>
+
+-/* When we include libgen.h because we need dirname() we immediately
+- * undefine basename() since libgen.h defines it as a macro to the POSIX
+- * version which is really broken. We prefer GNU basename(). */
+-#include <libgen.h>
+-#undef basename
+-
+ #include "sd-bus.h"
+
+ #include "alloc-util.h"
diff --git a/srcpkgs/elogind/template b/srcpkgs/elogind/template
index 97d129f1f3239..ff5315b288f11 100644
--- a/srcpkgs/elogind/template
+++ b/srcpkgs/elogind/template
@@ -1,7 +1,7 @@
# Template file for 'elogind'
pkgname=elogind
version=252.9
-revision=1
+revision=2
build_style=meson
configure_args="-Dcgroup-controller=elogind -Ddefault-hierarchy=legacy
-Ddefault-kill-user-processes=false -Dhalt-path=/usr/bin/halt
From 9a9d6b0e0792e3d8d7c8f25fc80fa2204f1fc543 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 26 Jan 2024 01:22:09 -0800
Subject: [PATCH 40/41] iwd: fix basename on musl
musl provides a compatibility basename declaration so applications
expecting GNU basename could still compile even though musl doesn't provide
GNU basename and only POSIX basename.
---
srcpkgs/iwd/patches/musl.patch | 13 +++++++++++++
srcpkgs/iwd/template | 2 +-
2 files changed, 14 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/iwd/patches/musl.patch
diff --git a/srcpkgs/iwd/patches/musl.patch b/srcpkgs/iwd/patches/musl.patch
new file mode 100644
index 0000000000000..37b6d749b3c8f
--- /dev/null
+++ b/srcpkgs/iwd/patches/musl.patch
@@ -0,0 +1,13 @@
+Include libgen.h for POSIX basename as musl doesn provide GNU basename in string.h.
+
+diff -rup src/wiphy.c.orig src/wiphy.c
+--- a/src/wiphy.c
++++ b/src/wiphy.c
+@@ -33,6 +33,7 @@
+ #include <unistd.h>
+ #include <string.h>
+ #include <limits.h>
++#include <libgen.h>
+
+ #include <ell/ell.h>
+
diff --git a/srcpkgs/iwd/template b/srcpkgs/iwd/template
index f70503d2a8277..8ababe905f770 100644
--- a/srcpkgs/iwd/template
+++ b/srcpkgs/iwd/template
@@ -1,7 +1,7 @@
# Template file for 'iwd'
pkgname=iwd
version=2.13
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-systemd-service --enable-pie
--enable-dbus-policy --enable-wired"
From ad6341c2c9256c349233429bb80878c60151b015 Mon Sep 17 00:00:00 2001
From: oreo639 <oreo6391@gmail.com>
Date: Fri, 26 Jan 2024 03:12:05 -0800
Subject: [PATCH 41/41] connman: fix basename on musl
musl provides a compatibility basename declaration so applications
expecting GNU basename could still compile even though musl doesn't provide
GNU basename and only POSIX basename.
---
srcpkgs/connman/patches/musl.patch | 16 ++++++++++++++++
srcpkgs/connman/template | 2 +-
2 files changed, 17 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/connman/patches/musl.patch
diff --git a/srcpkgs/connman/patches/musl.patch b/srcpkgs/connman/patches/musl.patch
new file mode 100644
index 0000000000000..4e38a44250b53
--- /dev/null
+++ b/srcpkgs/connman/patches/musl.patch
@@ -0,0 +1,16 @@
+Add GNU basename macro for code that expects GNU basename
+
+diff -rup src/log.c.orig src/log.c
+--- a/src/log.c
++++ b/src/log.c
+@@ -34,6 +34,10 @@
+
+ #include "connman.h"
+
++#if !defined(__GLIBC__)
++#define basename(src) (strrchr(src,'/') ? strrchr(src,'/')+1 : src)
++#endif
++
+ static const char *program_exec;
+ static const char *program_path;
+
diff --git a/srcpkgs/connman/template b/srcpkgs/connman/template
index e908284366c43..c4969eca59277 100644
--- a/srcpkgs/connman/template
+++ b/srcpkgs/connman/template
@@ -1,7 +1,7 @@
# Template file for 'connman'
pkgname=connman
version=1.42
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--enable-polkit --enable-client --enable-pie --enable-ethernet
--enable-wifi --enable-bluetooth --enable-loopback --enable-nmcompat
next prev parent reply other threads:[~2024-01-27 22:34 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-09 0:09 [PR PATCH] " oreo639
2023-08-26 21:48 ` leahneukirchen
2023-09-10 22:36 ` [PR REVIEW] " tornaria
2023-09-10 22:39 ` tornaria
2023-09-11 0:51 ` [PR REVIEW] " oreo639
2023-09-11 12:57 ` leahneukirchen
2023-09-11 15:51 ` oreo639
2023-12-07 17:53 ` metaleap
2023-12-07 18:54 ` oreo639
2023-12-07 18:54 ` oreo639
2023-12-07 18:54 ` oreo639
2023-12-07 18:55 ` oreo639
2023-12-07 18:55 ` oreo639
2023-12-26 21:54 ` oreo639
2023-12-26 22:10 ` [PR PATCH] [Updated] " oreo639
2023-12-27 4:15 ` oreo639
2023-12-27 4:16 ` oreo639
2023-12-27 4:17 ` oreo639
2023-12-27 8:51 ` [PR REVIEW] " averyterrel
2023-12-27 9:05 ` [PR PATCH] [Updated] " oreo639
2023-12-27 9:05 ` [PR REVIEW] " oreo639
2023-12-27 10:56 ` oreo639
2023-12-28 2:51 ` simvux
2023-12-28 3:21 ` oreo639
2023-12-28 3:21 ` oreo639
2023-12-28 3:21 ` oreo639
2023-12-28 3:22 ` oreo639
2023-12-28 3:23 ` oreo639
2023-12-28 3:30 ` [PR PATCH] [Updated] " oreo639
2023-12-28 3:32 ` oreo639
2023-12-29 1:27 ` [PR PATCH] [Updated] " oreo639
2024-01-10 16:12 ` dataCobra
2024-01-11 0:45 ` 22h49
2024-01-16 14:39 ` [PR PATCH] [Updated] " oreo639
2024-01-16 14:40 ` oreo639
2024-01-17 18:21 ` Calandracas606
2024-01-17 18:48 ` Calandracas606
2024-01-17 23:07 ` oreo639
2024-01-17 23:31 ` oreo639
2024-01-18 7:43 ` [PR PATCH] [Updated] " oreo639
2024-01-19 1:46 ` oreo639
2024-01-19 1:47 ` oreo639
2024-01-19 1:47 ` oreo639
2024-01-22 4:44 ` [PR PATCH] [Updated] " oreo639
2024-01-22 5:44 ` oreo639
2024-01-22 5:56 ` oreo639
2024-01-22 21:41 ` oreo639
2024-01-22 21:46 ` oreo639
2024-01-22 21:55 ` oreo639
2024-01-22 21:56 ` oreo639
2024-01-24 21:09 ` oreo639
2024-01-25 14:00 ` leahneukirchen
2024-01-27 2:30 ` [PR PATCH] [Updated] " oreo639
2024-01-27 9:27 ` oreo639
2024-01-27 22:34 ` oreo639 [this message]
2024-01-28 1:40 ` oreo639
2024-01-28 5:27 ` oreo639
2024-01-28 23:43 ` [PR PATCH] [Closed]: " oreo639
2024-01-28 23:43 ` oreo639
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240127223407.8DE3D22BF6@inbox.vuxu.org \
--to=oreo639@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).