From 95662a09845c25d7d643e748fd4f2db9d88c2c7a Mon Sep 17 00:00:00 2001 From: John Date: Sun, 9 Aug 2020 22:36:02 +0200 Subject: [PATCH 01/27] gcc: update to 10.2.0. --- common/shlibs | 8 +- srcpkgs/gcc/files/gccgo-musl.patch | 40 +++++----- srcpkgs/gcc/patches/0010-ldbl128-config.patch | 76 ------------------- srcpkgs/gcc/patches/invalid_tls_model.patch | 26 ------- srcpkgs/gcc/patches/musl-ada.patch | 22 +++--- srcpkgs/gcc/template | 18 +++-- 6 files changed, 46 insertions(+), 144 deletions(-) delete mode 100644 srcpkgs/gcc/patches/0010-ldbl128-config.patch delete mode 100644 srcpkgs/gcc/patches/invalid_tls_model.patch diff --git a/common/shlibs b/common/shlibs index 9a576f18d0f..4be788c2e80 100644 --- a/common/shlibs +++ b/common/shlibs @@ -57,7 +57,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.14 libgo-9.1.0_1 +libgo.so.16 libgo-10.2.0_1 libmpx.so.2 libmpx-6.2.1_1 libmpxwrappers.so.2 libmpx-6.2.1_1 libperl.so.5.32 perl-5.32.0_1 @@ -872,8 +872,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-9.so libada-9.1.0_1 -libgnat-9.so libada-9.1.0_1 +libgnarl-10.so libada-10.2.0_1 +libgnat-10.so libada-10.2.0_1 libmozjs185.so.1.0 js-1.8.5_1 libwebp.so.7 libwebp-0.6.0_1 libwebpmux.so.3 libwebp-0.6.0_1 @@ -1746,7 +1746,7 @@ libextractor_common.so.1 libextractor-1.1_1 libpano13.so.3 libpano13-2.9.19_1 libubsan.so.1 libsanitizer-8.2.0_1 libtsan.so.0 libsanitizer-6.3.0_1 -libasan.so.5 libsanitizer-8.2.0_1 +libasan.so.6 libsanitizer-10.2.0_1 liblsan.so.0 libsanitizer-6.3.0_1 libvtv.so.0 libvtv-6.3.0_1 libatomic.so.1 libatomic-4.9.0_1 diff --git a/srcpkgs/gcc/files/gccgo-musl.patch b/srcpkgs/gcc/files/gccgo-musl.patch index cc3ed7d17ae..9b3f3af9b7f 100644 --- a/srcpkgs/gcc/files/gccgo-musl.patch +++ b/srcpkgs/gcc/files/gccgo-musl.patch @@ -162,30 +162,30 @@ URL: https://code.foxkit.us/adelie/packages/tree/master/system/gcc fi if test "${GOOS}" = "aix"; then ---- libgo/runtime/go-signal.c -+++ libgo/runtime/go-signal.c -@@ -222,7 +222,11 @@ getSiginfo(siginfo_t *info, void *context __attribute__((unused))) - #endif - #ifdef __PPC__ - #ifdef __linux__ +--- libgo/runtime/go-signal.c 2020-07-23 08:35:19.004402840 +0200 ++++ - 2020-08-09 21:35:54.352886232 +0200 +@@ -224,7 +224,11 @@ + #elif defined(__alpha__) && defined(__linux__) + ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.sc_pc; + #elif defined(__PPC__) && defined(__linux__) - ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.regs->nip; -+ #ifdef __PPC64__ -+ ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.gp_regs[32]; -+ #else -+ ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.gregs[32]; -+ #endif - #endif - #ifdef _AIX ++ #ifdef __PPC64__ ++ ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.gp_regs[32]; ++ #else ++ ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.gregs[32]; ++ #endif + #elif defined(__PPC__) && defined(_AIX) ret.sigpc = ((ucontext_t*)(context))->uc_mcontext.jmp_context.iar; -@@ -343,7 +343,7 @@ dumpregs(siginfo_t *info __attribute__((unused)), void *context __attribute__((u - #endif - #endif - --#if defined(__PPC__) && defined(__LITTLE_ENDIAN__) -+#if defined(__PPC__) && defined(__LITTLE_ENDIAN__) && defined(__GLIBC__) - #ifdef __linux__ + #elif defined(__aarch64__) && defined(__linux__) +@@ -333,7 +337,7 @@ + runtime_printf("sp %X\n", m->sc_regs[30]); + runtime_printf("pc %X\n", m->sc_pc); + } +-#elif defined(__PPC__) && defined(__LITTLE_ENDIAN__) && defined(__linux__) ++#elif defined(__PPC__) && defined(__LITTLE_ENDIAN__) && defined(__linux__) && defined(__GLIBC__) { mcontext_t *m = &((ucontext_t*)(context))->uc_mcontext; + int i; --- libgo/sysinfo.c +++ libgo/sysinfo.c @@ -73,9 +73,6 @@ diff --git a/srcpkgs/gcc/patches/0010-ldbl128-config.patch b/srcpkgs/gcc/patches/0010-ldbl128-config.patch deleted file mode 100644 index 35869dd5d0f..00000000000 --- a/srcpkgs/gcc/patches/0010-ldbl128-config.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 47467f3ab0fb2f2fcede81060fe8bb339d0909eb Mon Sep 17 00:00:00 2001 -From: Szabolcs Nagy -Date: Wed, 28 Feb 2018 00:54:05 +0000 -Subject: [PATCH 10/12] ldbl128 config - ---- - gcc/configure | 13 +++++++++++++ - gcc/configure.ac | 16 ++++++++++++++-- - 2 files changed, 27 insertions(+), 2 deletions(-) - -diff --git gcc/configure gcc/configure -index 6121e163259..07ff8597d48 100755 ---- gcc/configure -+++ gcc/configure -@@ -29309,6 +29309,15 @@ if test "${with_long_double_128+set}" = set; then : - withval=$with_long_double_128; gcc_cv_target_ldbl128="$with_long_double_128" - else - -+ case "$target" in -+ s390*-*-linux-musl*) -+ gcc_cv_target_ldbl128=yes -+ ;; -+ powerpc*-*-linux-musl*) -+ gcc_cv_target_ldbl128=no -+ ;; -+ *) -+ - if test $glibc_version_major -gt 2 \ - || ( test $glibc_version_major -eq 2 && test $glibc_version_minor -ge 4 ); then : - gcc_cv_target_ldbl128=yes -@@ -29320,6 +29329,10 @@ else - && gcc_cv_target_ldbl128=yes - - fi -+ -+ ;; -+ esac -+ - fi - - ;; -diff --git gcc/configure.ac gcc/configure.ac -index b066cc609e1..6c15ed898c0 100644 ---- gcc/configure.ac -+++ gcc/configure.ac -@@ -5971,13 +5971,25 @@ case "$target" in - AC_ARG_WITH(long-double-128, - [AS_HELP_STRING([--with-long-double-128], - [use 128-bit long double by default])], -- gcc_cv_target_ldbl128="$with_long_double_128", -+ gcc_cv_target_ldbl128="$with_long_double_128", [ -+ case "$target" in -+ s390*-*-linux-musl*) -+ gcc_cv_target_ldbl128=yes -+ ;; -+ powerpc*-*-linux-musl*) -+ gcc_cv_target_ldbl128=no -+ ;; -+ *)] - [GCC_GLIBC_VERSION_GTE_IFELSE([2], [4], [gcc_cv_target_ldbl128=yes], [ - [gcc_cv_target_ldbl128=no - grep '^[ ]*#[ ]*define[ ][ ]*__LONG_DOUBLE_MATH_OPTIONAL' \ - $target_header_dir/bits/wordsize.h > /dev/null 2>&1 \ - && gcc_cv_target_ldbl128=yes -- ]])]) -+ ]])] -+ [ -+ ;; -+ esac -+ ]) - ;; - esac - if test x$gcc_cv_target_ldbl128 = xyes; then --- -2.17.1 - diff --git a/srcpkgs/gcc/patches/invalid_tls_model.patch b/srcpkgs/gcc/patches/invalid_tls_model.patch deleted file mode 100644 index 598cde5cb3a..00000000000 --- a/srcpkgs/gcc/patches/invalid_tls_model.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- libgomp/configure.tgt 2018-11-08 18:13:04.000000000 +0100 -+++ libgomp/configure.tgt 2019-06-29 20:06:31.972950350 +0200 -@@ -10,23 +10,6 @@ - # XCFLAGS Add extra compile flags to use. - # XLDFLAGS Add extra link flags to use. - --# Optimize TLS usage by avoiding the overhead of dynamic allocation. --if test $gcc_cv_have_tls = yes ; then -- case "${target}" in -- -- *-*-k*bsd*-gnu*) -- ;; -- -- *-*-linux* | *-*-gnu*) -- XCFLAGS="${XCFLAGS} -ftls-model=initial-exec -DUSING_INITIAL_EXEC_TLS" -- ;; -- -- *-*-rtems*) -- XCFLAGS="${XCFLAGS} -ftls-model=local-exec" -- ;; -- esac --fi -- - # Since we require POSIX threads, assume a POSIX system by default. - config_path="posix" - diff --git a/srcpkgs/gcc/patches/musl-ada.patch b/srcpkgs/gcc/patches/musl-ada.patch index 5e91b0476a3..61823684da5 100644 --- a/srcpkgs/gcc/patches/musl-ada.patch +++ b/srcpkgs/gcc/patches/musl-ada.patch @@ -124,27 +124,27 @@ index 0d12f7e..a063b47 100644 #endif #if defined (_WIN32) ---- gcc/ada/Makefile.rtl 2019-05-14 21:18:45.217455681 +0200 -+++ gcc/ada/Makefile.rtl 2019-05-14 21:21:30.686464218 +0200 -@@ -1521,7 +1521,7 @@ +--- gcc/ada/Makefile.rtl 2020-07-23 08:35:17.052381336 +0200 ++++ - 2020-08-09 19:38:24.230351406 +0200 +@@ -1533,7 +1533,7 @@ + s-intman.adb Date: Sun, 9 Aug 2020 22:36:42 +0200 Subject: [PATCH 02/27] cross-aarch64-linux-gnu: update gcc to 10.2.0 --- srcpkgs/cross-aarch64-linux-gnu/template | 27 ++++++++++++++++-------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/srcpkgs/cross-aarch64-linux-gnu/template b/srcpkgs/cross-aarch64-linux-gnu/template index f4f2fb518a0..bd7de5148f7 100644 --- a/srcpkgs/cross-aarch64-linux-gnu/template +++ b/srcpkgs/cross-aarch64-linux-gnu/template @@ -1,8 +1,8 @@ # Template build file for 'cross-aarch64-linux-gnu' # -_binutils_version=2.32 -_gcc_version=9.3.0 -_glibc_version=2.30 +_binutils_version=2.34 +_gcc_version=10.2.0 +_glibc_version=2.32 _linux_version=4.19 _triplet=aarch64-linux-gnu @@ -10,8 +10,8 @@ _archflags="-march=armv8-a" _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} -version=0.33 -revision=3 +version=0.34 +revision=1 short_desc="GNU Cross toolchain for the ${_triplet} LE target (binutils/gcc/glibc)" maintainer="Leah Neukirchen " homepage="https://www.voidlinux.org/" @@ -21,16 +21,16 @@ distfiles=" ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz" -checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04 - 71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1 - e2c4114e569afbe7edbc29131a43be833850ab9a459d81beb2588016d2bbb8af +checksum="f00b0e8803dc9bab1e2165bd568528135be734df3fabf8d0161828cd56028952 + b8dd4368bb9c7f0b98188317ee0254dd8cc99d1e3a18d0ff146c855fe16c1d8c + 1627ea54f5a1a8467032563393e0901077626dc66f37f10ee6363bb722222836 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1" lib32disabled=yes nocross=yes nopie=yes create_wrksrc=yes -hostmakedepends="tar gcc-objc gcc-go flex perl python3" +hostmakedepends="tar gcc-objc gcc-go flex perl python3 texinfo" makedepends="isl15-devel libmpc-devel zlib-devel" depends="${pkgname}-libc-${version}_${revision}" nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a @@ -280,6 +280,9 @@ _gcc_build() { } do_build() { + # Do not run fixincludes + sed -i 's@./fixinc.sh@-c true@' gcc/Makefile.in + unset LDFLAGS export CFLAGS="-Os" CXXFLAGS="-Os" @@ -345,6 +348,12 @@ do_install() { ln -svf libgnat-${_majorver}.so libgnat.so rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so + # Remove "fixed" header + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91085 + if [ -e ${DESTDIR}/usr/lib/gcc/${_triplet}/${version}/include-fixed/bits/statx.h ]; then + rm -rf ${DESTDIR}/usr/lib/gcc/${_triplet}/${version}/include-fixed/bits/statx.h + fi + # We need to build libatomic in target gcc as gccgo needs it to # build... but it's not needed at runtime, so remove it from the # destdir so it doesn't conflict with the libatomic package From 6d439fe76ac7d8aa0ee51b0933311cc07d45a6bc Mon Sep 17 00:00:00 2001 From: John Date: Sun, 9 Aug 2020 22:40:41 +0200 Subject: [PATCH 03/27] cross-armv7l-linux-gnueabihf: update gcc to 10.2.0 --- srcpkgs/cross-arm-linux-gnueabihf/template | 12 +++++------ srcpkgs/cross-armv7l-linux-gnueabihf/template | 21 +++++++++++++------ 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/srcpkgs/cross-arm-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf/template index 7a92cfa248f..7394cad023e 100644 --- a/srcpkgs/cross-arm-linux-gnueabihf/template +++ b/srcpkgs/cross-arm-linux-gnueabihf/template @@ -1,7 +1,7 @@ # Template build file for 'cross-arm-linux-gnueabihf' # -_binutils_version=2.32 -_gcc_version=9.3.0 +_binutils_version=2.34 +_gcc_version=10.2.0 _glibc_version=2.30 _linux_version=4.19 @@ -11,8 +11,8 @@ _archflags="-march=armv6 -mfpu=vfp -mfloat-abi=hard" _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} -version=0.33 -revision=2 +version=0.34 +revision=1 short_desc="GNU Cross toolchain for the ${_triplet} LE target (binutils/gcc/glibc)" maintainer="Orphaned " homepage="https://www.voidlinux.org/" @@ -22,8 +22,8 @@ distfiles=" ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz" -checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04 - 71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1 +checksum="f00b0e8803dc9bab1e2165bd568528135be734df3fabf8d0161828cd56028952 + b8dd4368bb9c7f0b98188317ee0254dd8cc99d1e3a18d0ff146c855fe16c1d8c e2c4114e569afbe7edbc29131a43be833850ab9a459d81beb2588016d2bbb8af 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1" diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/template b/srcpkgs/cross-armv7l-linux-gnueabihf/template index 66c34d29325..d29ff9bf81e 100644 --- a/srcpkgs/cross-armv7l-linux-gnueabihf/template +++ b/srcpkgs/cross-armv7l-linux-gnueabihf/template @@ -1,8 +1,8 @@ # Template build file for 'cross-armv7l-linux-gnueabihf' # -_binutils_version=2.32 -_gcc_version=9.3.0 -_glibc_version=2.30 +_binutils_version=2.34 +_gcc_version=10.2.0 +_glibc_version=2.32 _linux_version=4.19 _triplet=armv7l-linux-gnueabihf @@ -22,9 +22,9 @@ distfiles=" ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz http://ftp.gnu.org/gnu/glibc/glibc-${_glibc_version}.tar.xz ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz" -checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04 - 71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1 - e2c4114e569afbe7edbc29131a43be833850ab9a459d81beb2588016d2bbb8af +checksum="f00b0e8803dc9bab1e2165bd568528135be734df3fabf8d0161828cd56028952 + b8dd4368bb9c7f0b98188317ee0254dd8cc99d1e3a18d0ff146c855fe16c1d8c + 1627ea54f5a1a8467032563393e0901077626dc66f37f10ee6363bb722222836 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1" lib32disabled=yes @@ -281,6 +281,9 @@ _gcc_build() { } do_build() { + # Do not run fixincludes + sed -i 's@./fixinc.sh@-c true@' gcc/Makefile.in + for f in include lib bin; do if [ ! -d ${_sysroot}/usr/${f} ]; then mkdir -p ${_sysroot}/usr/${f} @@ -342,6 +345,12 @@ do_install() { ln -svf libgnat-${_majorver}.so libgnat.so rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so + # Remove "fixed" header + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91085 + if [ -e ${DESTDIR}/usr/lib/gcc/${_triplet}/${version}/include-fixed/bits/statx.h ]; then + rm -rf ${DESTDIR}/usr/lib/gcc/${_triplet}/${version}/include-fixed/bits/statx.h + fi + # We need to build libatomic in target gcc as gccgo needs it to # build... but it's not needed at runtime, so remove it from the # destdir so it doesn't conflict with the libatomic package From cc3f0ec7181ccafac5a51ca7f3713f045cdaafd7 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 9 Aug 2020 22:40:50 +0200 Subject: [PATCH 04/27] cross-armv7l-linux-gnueabi: update gcc to 10.2.0 --- srcpkgs/cross-arm-linux-gnueabi/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/cross-arm-linux-gnueabi/template b/srcpkgs/cross-arm-linux-gnueabi/template index 427a22b19c5..2c4a616ecbf 100644 --- a/srcpkgs/cross-arm-linux-gnueabi/template +++ b/srcpkgs/cross-arm-linux-gnueabi/template @@ -1,7 +1,7 @@ # Template build file for 'cross-arm-linux-gnueabi' # -_binutils_version=2.32 -_gcc_version=9.3.0 +_binutils_version=2.34 +_gcc_version=10.2.0 _glibc_version=2.30 _linux_version=4.19 @@ -11,8 +11,8 @@ _archflags="-march=armv5te -msoft-float -mfloat-abi=soft" _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} -version=0.33 -revision=2 +version=0.34 +revision=1 short_desc="GNU Cross toolchain for the ${_triplet} LE target (binutils/gcc/glibc)" maintainer="Orphaned " homepage="https://www.voidlinux.org/" @@ -22,8 +22,8 @@ distfiles=" ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz" -checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04 - 71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1 +checksum="f00b0e8803dc9bab1e2165bd568528135be734df3fabf8d0161828cd56028952 + b8dd4368bb9c7f0b98188317ee0254dd8cc99d1e3a18d0ff146c855fe16c1d8c e2c4114e569afbe7edbc29131a43be833850ab9a459d81beb2588016d2bbb8af 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1" From 7999c8c8c86fd1cbc1f9b2943ffb906fab43bb97 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 9 Aug 2020 22:41:29 +0200 Subject: [PATCH 05/27] cross-aarch64-linux-musl: update gcc to 10.2.0 --- .../files/invalid_tls_model.patch | 1 - srcpkgs/cross-aarch64-linux-musl/template | 26 ++++++++++--------- 2 files changed, 14 insertions(+), 13 deletions(-) delete mode 120000 srcpkgs/cross-aarch64-linux-musl/files/invalid_tls_model.patch diff --git a/srcpkgs/cross-aarch64-linux-musl/files/invalid_tls_model.patch b/srcpkgs/cross-aarch64-linux-musl/files/invalid_tls_model.patch deleted file mode 120000 index 8f276dc0538..00000000000 --- a/srcpkgs/cross-aarch64-linux-musl/files/invalid_tls_model.patch +++ /dev/null @@ -1 +0,0 @@ -../../gcc/patches/invalid_tls_model.patch \ No newline at end of file diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template index 48d3c201d06..8419723d45c 100644 --- a/srcpkgs/cross-aarch64-linux-musl/template +++ b/srcpkgs/cross-aarch64-linux-musl/template @@ -1,18 +1,18 @@ # Template build file for 'cross-aarch64-linux-musl' # -_binutils_version=2.32 -_gcc_version=9.3.0 +_binutils_version=2.34 +_gcc_version=10.2.0 _musl_version=1.1.24 _linux_version=4.19 -_libucontext_version=0.9.0 +_libucontext_version=0.11 _triplet=aarch64-linux-musl _archflags="-march=armv8-a" _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} -version=0.33 -revision=4 +version=0.34 +revision=1 short_desc="Cross toolchain for ARM64 LE target (musl)" maintainer="Orphaned " homepage="https://www.voidlinux.org/" @@ -22,12 +22,12 @@ distfiles=" ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz - https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz" -checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04 - 71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1 + https://github.com/kaniini/libucontext/archive/libucontext-${_libucontext_version}.tar.gz" +checksum="f00b0e8803dc9bab1e2165bd568528135be734df3fabf8d0161828cd56028952 + b8dd4368bb9c7f0b98188317ee0254dd8cc99d1e3a18d0ff146c855fe16c1d8c 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1 - 0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68" + ec122a4bca8f75922082c4f4d81b09ff3e950906d7f5504e0bce367ec9a6fceb" lib32disabled=yes nocross=yes @@ -35,7 +35,7 @@ nopie=yes nodebug=yes create_wrksrc=yes -hostmakedepends="tar gcc-objc gcc-go flex perl python3" +hostmakedepends="tar gcc-objc gcc-go flex perl python3 texinfo" makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel" nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a libgmem.a" @@ -95,7 +95,6 @@ _gcc_bootstrap() { _apply_patch -p0 ${FILESDIR}/musl-ada.patch _apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch _apply_patch -p1 ${FILESDIR}/libssp-musl.patch - _apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch _apply_patch -p0 ${FILESDIR}/gccgo-musl.patch msg_normal "Building cross gcc bootstrap\n" @@ -175,7 +174,7 @@ _musl_build() { _libucontext_build() { [ -f ${wrksrc}/.libucontext_build_done ] && return 0 - cd ${wrksrc}/libucontext-${_libucontext_version} + cd ${wrksrc}/libucontext-libucontext-${_libucontext_version} msg_normal "Building cross libucontext\n" # it's ok if we're static only here @@ -226,6 +225,9 @@ _gcc_build() { } do_build() { + # Do not run fixincludes + sed -i 's@./fixinc.sh@-c true@' gcc/Makefile.in + # Ensure we use sane environment unset CC CXX CPP LD AS AR RANLIB OBJDUMP READELF NM unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS From 24603bce0c0c023697e8813a7a29e08502b836c2 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 9 Aug 2020 22:41:47 +0200 Subject: [PATCH 06/27] cross-armv7l-linux-gnueabihf: update gcc to 10.2.0 --- srcpkgs/cross-armv7l-linux-gnueabihf/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/template b/srcpkgs/cross-armv7l-linux-gnueabihf/template index d29ff9bf81e..4dada4e603b 100644 --- a/srcpkgs/cross-armv7l-linux-gnueabihf/template +++ b/srcpkgs/cross-armv7l-linux-gnueabihf/template @@ -11,8 +11,8 @@ _archflags="-march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard" _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} -version=0.33 -revision=2 +version=0.34 +revision=1 short_desc="GNU Cross toolchain for the ${_triplet} LE target (binutils/gcc/glibc)" maintainer="Orphaned " homepage="https://www.voidlinux.org/" @@ -24,7 +24,7 @@ distfiles=" ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz" checksum="f00b0e8803dc9bab1e2165bd568528135be734df3fabf8d0161828cd56028952 b8dd4368bb9c7f0b98188317ee0254dd8cc99d1e3a18d0ff146c855fe16c1d8c - 1627ea54f5a1a8467032563393e0901077626dc66f37f10ee6363bb722222836 + e2c4114e569afbe7edbc29131a43be833850ab9a459d81beb2588016d2bbb8af 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1" lib32disabled=yes @@ -33,7 +33,7 @@ nopie=yes nodebug=yes create_wrksrc=yes -hostmakedepends="tar gcc-objc gcc-go flex perl python3" +hostmakedepends="tar gcc-objc gcc-go flex perl python3 texinfo" makedepends="isl15-devel libmpc-devel zlib-devel" depends="${pkgname}-libc-${version}_${revision}" nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a From 108f736b841016471b143fed480313ba182798f5 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 10 Aug 2020 20:43:28 +0200 Subject: [PATCH 07/27] cross-armv7l-linux-musleabihf: update to gcc 10.2.0 --- .../files/invalid_tls_model.patch | 1 - .../cross-armv7l-linux-musleabihf/template | 26 ++++++++++--------- 2 files changed, 14 insertions(+), 13 deletions(-) delete mode 120000 srcpkgs/cross-armv7l-linux-musleabihf/files/invalid_tls_model.patch diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/files/invalid_tls_model.patch b/srcpkgs/cross-armv7l-linux-musleabihf/files/invalid_tls_model.patch deleted file mode 120000 index 8f276dc0538..00000000000 --- a/srcpkgs/cross-armv7l-linux-musleabihf/files/invalid_tls_model.patch +++ /dev/null @@ -1 +0,0 @@ -../../gcc/patches/invalid_tls_model.patch \ No newline at end of file diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template index b29d69de9b2..1794bdeebd7 100644 --- a/srcpkgs/cross-armv7l-linux-musleabihf/template +++ b/srcpkgs/cross-armv7l-linux-musleabihf/template @@ -1,10 +1,10 @@ # Template build file for 'cross-armv7l-linux-musleabihf' # -_binutils_version=2.32 -_gcc_version=9.3.0 +_binutils_version=2.34 +_gcc_version=10.2.0 _musl_version=1.1.24 _linux_version=4.19 -_libucontext_version=0.9.0 +_libucontext_version=0.11 _triplet=armv7l-linux-musleabihf _fpuflags="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard" @@ -12,8 +12,8 @@ _archflags="-march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard" _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} -version=0.33 -revision=3 +version=0.34 +revision=1 short_desc="Cross toolchain for ARMv7 LE Hard Float target (musl)" maintainer="Orphaned " homepage="https://www.voidlinux.org/" @@ -23,12 +23,12 @@ distfiles=" ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz - https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz" -checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04 - 71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1 + https://github.com/kaniini/libucontext/archive/libucontext-${_libucontext_version}.tar.gz" +checksum="f00b0e8803dc9bab1e2165bd568528135be734df3fabf8d0161828cd56028952 + b8dd4368bb9c7f0b98188317ee0254dd8cc99d1e3a18d0ff146c855fe16c1d8c 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1 - 0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68" + ec122a4bca8f75922082c4f4d81b09ff3e950906d7f5504e0bce367ec9a6fceb" lib32disabled=yes nocross=yes @@ -36,7 +36,7 @@ nopie=yes nodebug=yes create_wrksrc=yes -hostmakedepends="tar gcc-objc gcc-go flex perl python3" +hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3" makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel" nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a libgmem.a" @@ -94,7 +94,6 @@ _gcc_bootstrap() { _apply_patch -p0 ${FILESDIR}/musl-ada.patch _apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch _apply_patch -p1 ${FILESDIR}/libssp-musl.patch - _apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch _apply_patch -p0 ${FILESDIR}/gccgo-musl.patch msg_normal "Building cross gcc bootstrap\n" @@ -174,7 +173,7 @@ _musl_build() { _libucontext_build() { [ -f ${wrksrc}/.libucontext_build_done ] && return 0 - cd ${wrksrc}/libucontext-${_libucontext_version} + cd ${wrksrc}/libucontext-libucontext-${_libucontext_version} msg_normal "Building cross libucontext\n" # it's ok if we're static only here @@ -227,6 +226,9 @@ _gcc_build() { } do_build() { + # Do not run fixincludes + sed -i 's@./fixinc.sh@-c true@' gcc/Makefile.in + # Ensure we use sane environment unset CC CXX CPP LD AS AR RANLIB OBJDUMP READELF NM unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS From 8d69fdb214965992198ed9e95dd1c64a1bef2144 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 10 Aug 2020 20:44:46 +0200 Subject: [PATCH 08/27] cross-arm-linux-musleabi: update to gcc 10.2.0 --- .../files/invalid_tls_model.patch | 1 - srcpkgs/cross-arm-linux-musleabi/template | 26 ++++++++++--------- 2 files changed, 14 insertions(+), 13 deletions(-) delete mode 120000 srcpkgs/cross-arm-linux-musleabi/files/invalid_tls_model.patch diff --git a/srcpkgs/cross-arm-linux-musleabi/files/invalid_tls_model.patch b/srcpkgs/cross-arm-linux-musleabi/files/invalid_tls_model.patch deleted file mode 120000 index 8f276dc0538..00000000000 --- a/srcpkgs/cross-arm-linux-musleabi/files/invalid_tls_model.patch +++ /dev/null @@ -1 +0,0 @@ -../../gcc/patches/invalid_tls_model.patch \ No newline at end of file diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template index fb7d294df48..554658003e1 100644 --- a/srcpkgs/cross-arm-linux-musleabi/template +++ b/srcpkgs/cross-arm-linux-musleabi/template @@ -1,10 +1,10 @@ # Template build file for 'cross-arm-linux-musleabi' # -_binutils_version=2.32 -_gcc_version=9.3.0 +_binutils_version=2.34 +_gcc_version=10.2.0 _musl_version=1.1.24 _linux_version=4.19 -_libucontext_version=0.9.0 +_libucontext_version=0.11 _triplet=arm-linux-musleabi _fpuflags="--with-arch=armv5te --without-fp --with-float=soft" @@ -12,8 +12,8 @@ _archflags="-march=armv5te -msoft-float -mfloat-abi=soft" _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} -version=0.33 -revision=3 +version=0.34 +revision=1 short_desc="Cross toolchain for ARMv5 TE target (musl)" maintainer="Orphaned " homepage="https://www.voidlinux.org/" @@ -23,12 +23,12 @@ distfiles=" ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz - https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz" -checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04 - 71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1 + https://github.com/kaniini/libucontext/archive/libucontext-${_libucontext_version}.tar.gz" +checksum="f00b0e8803dc9bab1e2165bd568528135be734df3fabf8d0161828cd56028952 + b8dd4368bb9c7f0b98188317ee0254dd8cc99d1e3a18d0ff146c855fe16c1d8c 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1 - 0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68" + ec122a4bca8f75922082c4f4d81b09ff3e950906d7f5504e0bce367ec9a6fceb" lib32disabled=yes nocross=yes @@ -36,7 +36,7 @@ nopie=yes nodebug=yes create_wrksrc=yes -hostmakedepends="tar gcc-objc gcc-go flex perl python3" +hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3" makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel" nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a libgmem.a" @@ -94,7 +94,6 @@ _gcc_bootstrap() { _apply_patch -p0 ${FILESDIR}/musl-ada.patch _apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch _apply_patch -p1 ${FILESDIR}/libssp-musl.patch - _apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch _apply_patch -p0 ${FILESDIR}/gccgo-musl.patch msg_normal "Building cross gcc bootstrap\n" @@ -173,7 +172,7 @@ _musl_build() { _libucontext_build() { [ -f ${wrksrc}/.libucontext_build_done ] && return 0 - cd ${wrksrc}/libucontext-${_libucontext_version} + cd ${wrksrc}/libucontext-libucontext-${_libucontext_version} msg_normal "Building cross libucontext\n" # it's ok if we're static only here @@ -226,6 +225,9 @@ _gcc_build() { } do_build() { + # Do not run fixincludes + sed -i 's@./fixinc.sh@-c true@' gcc/Makefile.in + # Ensure we use sane environment unset CC CXX CPP LD AS AR RANLIB OBJDUMP READELF NM unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS From 7e6a8e6de1a9094a000236f53fcdadae2462cc35 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 10 Aug 2020 20:47:27 +0200 Subject: [PATCH 09/27] cross-arm-linux-musleabihf: update to gcc 10.2.0 --- .../files/invalid_tls_model.patch | 1 - srcpkgs/cross-arm-linux-musleabihf/template | 26 ++++++++++--------- 2 files changed, 14 insertions(+), 13 deletions(-) delete mode 120000 srcpkgs/cross-arm-linux-musleabihf/files/invalid_tls_model.patch diff --git a/srcpkgs/cross-arm-linux-musleabihf/files/invalid_tls_model.patch b/srcpkgs/cross-arm-linux-musleabihf/files/invalid_tls_model.patch deleted file mode 120000 index 8f276dc0538..00000000000 --- a/srcpkgs/cross-arm-linux-musleabihf/files/invalid_tls_model.patch +++ /dev/null @@ -1 +0,0 @@ -../../gcc/patches/invalid_tls_model.patch \ No newline at end of file diff --git a/srcpkgs/cross-arm-linux-musleabihf/template b/srcpkgs/cross-arm-linux-musleabihf/template index 77fb27fe5db..ef59b92e0c2 100644 --- a/srcpkgs/cross-arm-linux-musleabihf/template +++ b/srcpkgs/cross-arm-linux-musleabihf/template @@ -1,10 +1,10 @@ # Template build file for 'cross-arm-linux-musleabihf' # -_binutils_version=2.32 -_gcc_version=9.3.0 +_binutils_version=2.34 +_gcc_version=10.2.0 _musl_version=1.1.24 _linux_version=4.19 -_libucontext_version=0.9.0 +_libucontext_version=0.11 _triplet=arm-linux-musleabihf _fpuflags="--with-arch=armv6 --with-fpu=vfp --with-float=hard" @@ -12,8 +12,8 @@ _archflags="-march=armv6 -mfpu=vfp -mfloat-abi=hard" _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} -version=0.33 -revision=3 +version=0.34 +revision=1 short_desc="Cross toolchain for ARMv6 LE Hard Float target (musl)" maintainer="Orphaned " homepage="https://www.voidlinux.org/" @@ -23,12 +23,12 @@ distfiles=" ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz - https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz" -checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04 - 71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1 + https://github.com/kaniini/libucontext/archive/libucontext-${_libucontext_version}.tar.gz" +checksum="f00b0e8803dc9bab1e2165bd568528135be734df3fabf8d0161828cd56028952 + b8dd4368bb9c7f0b98188317ee0254dd8cc99d1e3a18d0ff146c855fe16c1d8c 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1 - 0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68" + ec122a4bca8f75922082c4f4d81b09ff3e950906d7f5504e0bce367ec9a6fceb" lib32disabled=yes nocross=yes @@ -36,7 +36,7 @@ nopie=yes nodebug=yes create_wrksrc=yes -hostmakedepends="tar gcc-objc gcc-go flex perl python3" +hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3" makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel" nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a libgmem.a" @@ -94,7 +94,6 @@ _gcc_bootstrap() { _apply_patch -p0 ${FILESDIR}/musl-ada.patch _apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch _apply_patch -p1 ${FILESDIR}/libssp-musl.patch - _apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch _apply_patch -p0 ${FILESDIR}/gccgo-musl.patch msg_normal "Building cross gcc bootstrap\n" @@ -173,7 +172,7 @@ _musl_build() { _libucontext_build() { [ -f ${wrksrc}/.libucontext_build_done ] && return 0 - cd ${wrksrc}/libucontext-${_libucontext_version} + cd ${wrksrc}/libucontext-libucontext-${_libucontext_version} msg_normal "Building cross libucontext\n" # it's ok if we're static only here @@ -225,6 +224,9 @@ _gcc_build() { } do_build() { + # Do not run fixincludes + sed -i 's@./fixinc.sh@-c true@' gcc/Makefile.in + # Ensure we use sane environment unset CC CXX CPP LD AS AR RANLIB OBJDUMP READELF NM unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS From 104ee7ac47cb45b829d26f0cc5749374365ea33e Mon Sep 17 00:00:00 2001 From: John Date: Mon, 10 Aug 2020 20:48:01 +0200 Subject: [PATCH 10/27] cross-i686-linux-musl: update to gcc 10.2.0 --- .../files/invalid_tls_model.patch | 1 - srcpkgs/cross-i686-linux-musl/template | 26 ++++++++++--------- 2 files changed, 14 insertions(+), 13 deletions(-) delete mode 120000 srcpkgs/cross-i686-linux-musl/files/invalid_tls_model.patch diff --git a/srcpkgs/cross-i686-linux-musl/files/invalid_tls_model.patch b/srcpkgs/cross-i686-linux-musl/files/invalid_tls_model.patch deleted file mode 120000 index 8f276dc0538..00000000000 --- a/srcpkgs/cross-i686-linux-musl/files/invalid_tls_model.patch +++ /dev/null @@ -1 +0,0 @@ -../../gcc/patches/invalid_tls_model.patch \ No newline at end of file diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template index af40ec66455..84dbe5faec1 100644 --- a/srcpkgs/cross-i686-linux-musl/template +++ b/srcpkgs/cross-i686-linux-musl/template @@ -1,18 +1,18 @@ # Template build file for 'cross-i686-linux-musl' # -_binutils_version=2.32 -_gcc_version=9.3.0 +_binutils_version=2.34 +_gcc_version=10.2.0 _musl_version=1.1.24 _linux_version=4.19 -_libucontext_version=0.9.0 +_libucontext_version=0.11 _triplet=i686-linux-musl _sysroot="/usr/${_triplet}" _archflags="-march=i686" pkgname=cross-${_triplet} -version=0.33 -revision=3 +version=0.34 +revision=1 short_desc="Cross toolchain for i686 target (musl)" maintainer="Jürgen Buchmüller " homepage="https://www.voidlinux.org/" @@ -22,19 +22,19 @@ distfiles=" ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz - https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz" -checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04 - 71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1 + https://github.com/kaniini/libucontext/archive/libucontext-${_libucontext_version}.tar.gz" +checksum="f00b0e8803dc9bab1e2165bd568528135be734df3fabf8d0161828cd56028952 + b8dd4368bb9c7f0b98188317ee0254dd8cc99d1e3a18d0ff146c855fe16c1d8c 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1 - 0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68" + ec122a4bca8f75922082c4f4d81b09ff3e950906d7f5504e0bce367ec9a6fceb" lib32disabled=yes nocross=yes nopie=yes nodebug=yes create_wrksrc=yes -hostmakedepends="tar gcc-objc gcc-go flex perl python3" +hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3" makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel" nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a libgmem.a" @@ -92,7 +92,6 @@ _gcc_bootstrap() { _apply_patch -p0 ${FILESDIR}/musl-ada.patch _apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch _apply_patch -p1 ${FILESDIR}/libssp-musl.patch - _apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch _apply_patch -p0 ${FILESDIR}/gccgo-musl.patch msg_normal "Building cross gcc bootstrap\n" @@ -170,7 +169,7 @@ _musl_build() { _libucontext_build() { [ -f ${wrksrc}/.libucontext_build_done ] && return 0 - cd ${wrksrc}/libucontext-${_libucontext_version} + cd ${wrksrc}/libucontext-libucontext-${_libucontext_version} msg_normal "Building cross libucontext\n" vsed -i arch/x86/startcontext.S -e \ @@ -224,6 +223,9 @@ _gcc_build() { } do_build() { + # Do not run fixincludes + sed -i 's@./fixinc.sh@-c true@' gcc/Makefile.in + # Ensure we use sane environment unset CC CXX CPP LD AS AR RANLIB OBJDUMP READELF NM unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS From 1a1627e782506ecf0995ce53868c276bd78673ed Mon Sep 17 00:00:00 2001 From: John Date: Mon, 10 Aug 2020 20:48:10 +0200 Subject: [PATCH 11/27] cross-mips-linux-musl: update to gcc 10.2.0 --- .../files/invalid_tls_model.patch | 1 - srcpkgs/cross-mips-linux-musl/template | 18 ++++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) delete mode 120000 srcpkgs/cross-mips-linux-musl/files/invalid_tls_model.patch diff --git a/srcpkgs/cross-mips-linux-musl/files/invalid_tls_model.patch b/srcpkgs/cross-mips-linux-musl/files/invalid_tls_model.patch deleted file mode 120000 index 8f276dc0538..00000000000 --- a/srcpkgs/cross-mips-linux-musl/files/invalid_tls_model.patch +++ /dev/null @@ -1 +0,0 @@ -../../gcc/patches/invalid_tls_model.patch \ No newline at end of file diff --git a/srcpkgs/cross-mips-linux-musl/template b/srcpkgs/cross-mips-linux-musl/template index bc8b15ac541..e33031bc770 100644 --- a/srcpkgs/cross-mips-linux-musl/template +++ b/srcpkgs/cross-mips-linux-musl/template @@ -1,7 +1,7 @@ # Template build file for 'cross-mips-linux-musl' # -_binutils_version=2.32 -_gcc_version=9.3.0 +_binutils_version=2.34 +_gcc_version=10.2.0 _musl_version=1.1.24 _linux_version=4.19 @@ -11,8 +11,8 @@ _archflags="-march=mips32r2 -msoft-float" _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} -version=0.33 -revision=3 +version=0.34 +revision=1 short_desc="Cross toolchain for MIPS32r2 BE softfloat target (musl)" maintainer="Orphaned " homepage="https://www.voidlinux.org/" @@ -22,8 +22,8 @@ distfiles=" ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz" -checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04 - 71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1 +checksum="f00b0e8803dc9bab1e2165bd568528135be734df3fabf8d0161828cd56028952 + b8dd4368bb9c7f0b98188317ee0254dd8cc99d1e3a18d0ff146c855fe16c1d8c 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1" @@ -33,7 +33,7 @@ nopie=yes nodebug=yes create_wrksrc=yes -hostmakedepends="tar gcc-objc flex perl python3" +hostmakedepends="texinfo tar gcc-objc flex perl python3" makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel" nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a libgmem.a" @@ -87,7 +87,6 @@ _gcc_bootstrap() { _apply_patch -p0 ${FILESDIR}/musl-ada.patch _apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch _apply_patch -p1 ${FILESDIR}/libssp-musl.patch - _apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch msg_normal "Building cross gcc bootstrap\n" @@ -201,6 +200,9 @@ _gcc_build() { } do_build() { + # Do not run fixincludes + sed -i 's@./fixinc.sh@-c true@' gcc/Makefile.in + # Ensure we use sane environment unset CC CXX CPP LD AS AR RANLIB OBJDUMP READELF NM unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS From 346f37ec7af763b96b7531aad5a5de9ba1b3f988 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 10 Aug 2020 20:48:30 +0200 Subject: [PATCH 12/27] cross-mips-linux-muslhf: update to gcc 10.2.0 --- .../files/invalid_tls_model.patch | 1 - srcpkgs/cross-mips-linux-muslhf/template | 18 ++++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) delete mode 120000 srcpkgs/cross-mips-linux-muslhf/files/invalid_tls_model.patch diff --git a/srcpkgs/cross-mips-linux-muslhf/files/invalid_tls_model.patch b/srcpkgs/cross-mips-linux-muslhf/files/invalid_tls_model.patch deleted file mode 120000 index 8f276dc0538..00000000000 --- a/srcpkgs/cross-mips-linux-muslhf/files/invalid_tls_model.patch +++ /dev/null @@ -1 +0,0 @@ -../../gcc/patches/invalid_tls_model.patch \ No newline at end of file diff --git a/srcpkgs/cross-mips-linux-muslhf/template b/srcpkgs/cross-mips-linux-muslhf/template index 4f3bc67aa80..c8d0fee4981 100644 --- a/srcpkgs/cross-mips-linux-muslhf/template +++ b/srcpkgs/cross-mips-linux-muslhf/template @@ -1,7 +1,7 @@ # Template build file for 'cross-mips-linux-muslhf' # -_binutils_version=2.32 -_gcc_version=9.3.0 +_binutils_version=2.34 +_gcc_version=10.2.0 _musl_version=1.1.24 _linux_version=4.19 @@ -11,8 +11,8 @@ _archflags="-march=mips32r2 -mhard-float" _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} -version=0.33 -revision=3 +version=0.34 +revision=1 short_desc="Cross toolchain for MIPS32r2 BE hardfloat target (musl)" maintainer="hipperson0 " homepage="https://www.voidlinux.org/" @@ -22,8 +22,8 @@ distfiles=" ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz https://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz" -checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04 - 71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1 +checksum="f00b0e8803dc9bab1e2165bd568528135be734df3fabf8d0161828cd56028952 + b8dd4368bb9c7f0b98188317ee0254dd8cc99d1e3a18d0ff146c855fe16c1d8c 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1" @@ -33,7 +33,7 @@ nopie=yes nodebug=yes create_wrksrc=yes -hostmakedepends="tar gcc-objc flex perl python3" +hostmakedepends="texinfo tar gcc-objc flex perl python3" makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel" nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a libgmem.a" @@ -87,7 +87,6 @@ _gcc_bootstrap() { _apply_patch -p0 ${FILESDIR}/musl-ada.patch _apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch _apply_patch -p1 ${FILESDIR}/libssp-musl.patch - _apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch msg_normal "Building cross gcc bootstrap\n" @@ -201,6 +200,9 @@ _gcc_build() { } do_build() { + # Do not run fixincludes + sed -i 's@./fixinc.sh@-c true@' gcc/Makefile.in + # Ensure we use sane environment unset CC CXX CPP LD AS AR RANLIB OBJDUMP READELF NM unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS From e2945fdb25026e9c052b42ff1de0fe59eef3f3a4 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 10 Aug 2020 20:48:54 +0200 Subject: [PATCH 13/27] cross-mipsel-linux-musl: update to gcc 10.2.0 --- .../files/invalid_tls_model.patch | 1 - srcpkgs/cross-mipsel-linux-musl/template | 18 ++++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) delete mode 120000 srcpkgs/cross-mipsel-linux-musl/files/invalid_tls_model.patch diff --git a/srcpkgs/cross-mipsel-linux-musl/files/invalid_tls_model.patch b/srcpkgs/cross-mipsel-linux-musl/files/invalid_tls_model.patch deleted file mode 120000 index 8f276dc0538..00000000000 --- a/srcpkgs/cross-mipsel-linux-musl/files/invalid_tls_model.patch +++ /dev/null @@ -1 +0,0 @@ -../../gcc/patches/invalid_tls_model.patch \ No newline at end of file diff --git a/srcpkgs/cross-mipsel-linux-musl/template b/srcpkgs/cross-mipsel-linux-musl/template index 48a0027d4eb..e5fe7239064 100644 --- a/srcpkgs/cross-mipsel-linux-musl/template +++ b/srcpkgs/cross-mipsel-linux-musl/template @@ -1,7 +1,7 @@ # Template build file for 'cross-mipsel-linux-musl' # -_binutils_version=2.32 -_gcc_version=9.3.0 +_binutils_version=2.34 +_gcc_version=10.2.0 _musl_version=1.1.24 _linux_version=4.19 @@ -11,8 +11,8 @@ _archflags="-march=mips32r2 -msoft-float" _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} -version=0.33 -revision=3 +version=0.34 +revision=1 short_desc="Cross toolchain for MIPS32r2 LE softfloat target (musl)" maintainer="Orphaned " homepage="https://www.voidlinux.org/" @@ -22,8 +22,8 @@ distfiles=" ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz" -checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04 - 71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1 +checksum="f00b0e8803dc9bab1e2165bd568528135be734df3fabf8d0161828cd56028952 + b8dd4368bb9c7f0b98188317ee0254dd8cc99d1e3a18d0ff146c855fe16c1d8c 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1" @@ -33,7 +33,7 @@ nopie=yes nodebug=yes create_wrksrc=yes -hostmakedepends="tar gcc-objc flex perl python3" +hostmakedepends="texinfo tar gcc-objc flex perl python3" makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel" nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a libgmem.a" @@ -87,7 +87,6 @@ _gcc_bootstrap() { _apply_patch -p0 ${FILESDIR}/musl-ada.patch _apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch _apply_patch -p1 ${FILESDIR}/libssp-musl.patch - _apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch msg_normal "Building cross gcc bootstrap\n" @@ -201,6 +200,9 @@ _gcc_build() { } do_build() { + # Do not run fixincludes + sed -i 's@./fixinc.sh@-c true@' gcc/Makefile.in + # Ensure we use sane environment unset CC CXX CPP LD AS AR RANLIB OBJDUMP READELF NM unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS From 91c2bb5a28ed13535191b15a0a0df621464cb9e6 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 10 Aug 2020 20:49:49 +0200 Subject: [PATCH 14/27] cross-mipsel-linux-muslhf: update to gcc 10.2.0 --- .../files/invalid_tls_model.patch | 1 - srcpkgs/cross-mipsel-linux-muslhf/template | 18 ++++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) delete mode 120000 srcpkgs/cross-mipsel-linux-muslhf/files/invalid_tls_model.patch diff --git a/srcpkgs/cross-mipsel-linux-muslhf/files/invalid_tls_model.patch b/srcpkgs/cross-mipsel-linux-muslhf/files/invalid_tls_model.patch deleted file mode 120000 index 8f276dc0538..00000000000 --- a/srcpkgs/cross-mipsel-linux-muslhf/files/invalid_tls_model.patch +++ /dev/null @@ -1 +0,0 @@ -../../gcc/patches/invalid_tls_model.patch \ No newline at end of file diff --git a/srcpkgs/cross-mipsel-linux-muslhf/template b/srcpkgs/cross-mipsel-linux-muslhf/template index e639bf043d7..bae95697ca1 100644 --- a/srcpkgs/cross-mipsel-linux-muslhf/template +++ b/srcpkgs/cross-mipsel-linux-muslhf/template @@ -1,7 +1,7 @@ # Template build file for 'cross-mipsel-linux-muslhf' # -_binutils_version=2.32 -_gcc_version=9.3.0 +_binutils_version=2.34 +_gcc_version=10.2.0 _musl_version=1.1.24 _linux_version=4.19 @@ -11,8 +11,8 @@ _archflags="-march=mips32r2 -mhard-float" _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} -version=0.33 -revision=3 +version=0.34 +revision=1 short_desc="Cross toolchain for MIPS32r2 LE hardfloat target (musl)" maintainer="Orphaned " homepage="https://www.voidlinux.org/" @@ -22,8 +22,8 @@ distfiles=" ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz" -checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04 - 71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1 +checksum="f00b0e8803dc9bab1e2165bd568528135be734df3fabf8d0161828cd56028952 + b8dd4368bb9c7f0b98188317ee0254dd8cc99d1e3a18d0ff146c855fe16c1d8c 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1" @@ -33,7 +33,7 @@ nopie=yes nodebug=yes create_wrksrc=yes -hostmakedepends="tar gcc-objc flex perl python3" +hostmakedepends="texinfo tar gcc-objc flex perl python3" makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel" nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a libgmem.a" @@ -87,7 +87,6 @@ _gcc_bootstrap() { _apply_patch -p0 ${FILESDIR}/musl-ada.patch _apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch _apply_patch -p1 ${FILESDIR}/libssp-musl.patch - _apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch msg_normal "Building cross gcc bootstrap\n" @@ -201,6 +200,9 @@ _gcc_build() { } do_build() { + # Do not run fixincludes + sed -i 's@./fixinc.sh@-c true@' gcc/Makefile.in + # Ensure we use sane environment unset CC CXX CPP LD AS AR RANLIB OBJDUMP READELF NM unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS From 28ccf14c3519f365535755af94e86cb115c332de Mon Sep 17 00:00:00 2001 From: John Date: Mon, 10 Aug 2020 20:50:07 +0200 Subject: [PATCH 15/27] cross-powerpc-linux-musl: update to gcc 10.2.0 --- .../files/0010-ldbl128-config.patch | 1 - .../files/invalid_tls_model.patch | 1 - srcpkgs/cross-powerpc-linux-musl/template | 27 ++++++++++--------- 3 files changed, 14 insertions(+), 15 deletions(-) delete mode 120000 srcpkgs/cross-powerpc-linux-musl/files/0010-ldbl128-config.patch delete mode 120000 srcpkgs/cross-powerpc-linux-musl/files/invalid_tls_model.patch diff --git a/srcpkgs/cross-powerpc-linux-musl/files/0010-ldbl128-config.patch b/srcpkgs/cross-powerpc-linux-musl/files/0010-ldbl128-config.patch deleted file mode 120000 index 02d68e45a47..00000000000 --- a/srcpkgs/cross-powerpc-linux-musl/files/0010-ldbl128-config.patch +++ /dev/null @@ -1 +0,0 @@ -../../gcc/patches/0010-ldbl128-config.patch \ No newline at end of file diff --git a/srcpkgs/cross-powerpc-linux-musl/files/invalid_tls_model.patch b/srcpkgs/cross-powerpc-linux-musl/files/invalid_tls_model.patch deleted file mode 120000 index 8f276dc0538..00000000000 --- a/srcpkgs/cross-powerpc-linux-musl/files/invalid_tls_model.patch +++ /dev/null @@ -1 +0,0 @@ -../../gcc/patches/invalid_tls_model.patch \ No newline at end of file diff --git a/srcpkgs/cross-powerpc-linux-musl/template b/srcpkgs/cross-powerpc-linux-musl/template index fc7ca0cb7bf..50bc722f559 100644 --- a/srcpkgs/cross-powerpc-linux-musl/template +++ b/srcpkgs/cross-powerpc-linux-musl/template @@ -1,9 +1,9 @@ # Template file for 'cross-powerpc-linux-musl' -_binutils_version=2.32 -_gcc_version=9.3.0 +_binutils_version=2.34 +_gcc_version=10.2.0 _musl_version=1.1.24 _linux_version=4.19 -_libucontext_version=0.9.0 +_libucontext_version=0.11 _triplet=powerpc-linux-musl _fpuflags= @@ -11,8 +11,8 @@ _archflags="-mcpu=powerpc -msecure-plt" _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} -version=0.33 -revision=2 +version=0.34 +revision=1 short_desc="Cross toolchain for PowerPC (musl)" maintainer="Thomas Batten " @@ -23,12 +23,12 @@ distfiles=" ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz - https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz" -checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04 - 71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1 + https://github.com/kaniini/libucontext/archive/libucontext-${_libucontext_version}.tar.gz" +checksum="f00b0e8803dc9bab1e2165bd568528135be734df3fabf8d0161828cd56028952 + b8dd4368bb9c7f0b98188317ee0254dd8cc99d1e3a18d0ff146c855fe16c1d8c 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1 - 0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68" + ec122a4bca8f75922082c4f4d81b09ff3e950906d7f5504e0bce367ec9a6fceb" lib32disabled=yes nocross=yes @@ -36,7 +36,7 @@ nopie=yes nodebug=yes create_wrksrc=yes -hostmakedepends="tar gcc-objc gcc-go flex perl python3" +hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3" makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel" nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a libgmem.a" @@ -91,11 +91,9 @@ _gcc_bootstrap() { cd ${wrksrc}/gcc-${_gcc_version} _apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch _apply_patch -p0 ${FILESDIR}/musl-ada.patch - _apply_patch -p0 ${FILESDIR}/0010-ldbl128-config.patch _apply_patch -p0 ${FILESDIR}/libgcc-ibm128-no-tag.patch _apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch _apply_patch -p1 ${FILESDIR}/libssp-musl.patch - _apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch _apply_patch -p0 ${FILESDIR}/gccgo-musl.patch msg_normal "Building cross gcc bootstrap\n" @@ -177,7 +175,7 @@ _musl_build() { _libucontext_build() { [ -f ${wrksrc}/.libucontext_build_done ] && return 0 - cd ${wrksrc}/libucontext-${_libucontext_version} + cd ${wrksrc}/libucontext-libucontext-${_libucontext_version} msg_normal "Building cross libucontext\n" # it's ok if we're static only here @@ -233,6 +231,9 @@ _gcc_build() { } do_build() { + # Do not run fixincludes + sed -i 's@./fixinc.sh@-c true@' gcc/Makefile.in + # Ensure we use sane environment unset CC CXX CPP LD AS AR RANLIB OBJDUMP READELF NM unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS From c82448c85d1609aa85542df9957dc686f22af092 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 10 Aug 2020 20:50:27 +0200 Subject: [PATCH 16/27] cross-powerpc64-linux-musl: update to gcc 10.2.0 --- .../files/invalid_tls_model.patch | 1 - srcpkgs/cross-powerpc64-linux-musl/template | 27 ++++++++++--------- 2 files changed, 14 insertions(+), 14 deletions(-) delete mode 120000 srcpkgs/cross-powerpc64-linux-musl/files/invalid_tls_model.patch diff --git a/srcpkgs/cross-powerpc64-linux-musl/files/invalid_tls_model.patch b/srcpkgs/cross-powerpc64-linux-musl/files/invalid_tls_model.patch deleted file mode 120000 index 8f276dc0538..00000000000 --- a/srcpkgs/cross-powerpc64-linux-musl/files/invalid_tls_model.patch +++ /dev/null @@ -1 +0,0 @@ -../../gcc/patches/invalid_tls_model.patch \ No newline at end of file diff --git a/srcpkgs/cross-powerpc64-linux-musl/template b/srcpkgs/cross-powerpc64-linux-musl/template index ed9adc5861e..a87faf3dd53 100644 --- a/srcpkgs/cross-powerpc64-linux-musl/template +++ b/srcpkgs/cross-powerpc64-linux-musl/template @@ -1,16 +1,16 @@ # Template file for 'cross-powerpc64-linux-musl' -_binutils_version=2.32 -_gcc_version=9.3.0 +_binutils_version=2.34 +_gcc_version=10.2.0 _musl_version=1.1.24 _linux_version=4.19 -_libucontext_version=0.9.0 +_libucontext_version=0.11 _triplet="powerpc64-linux-musl" _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} -version=0.33 -revision=2 +version=0.34 +revision=1 short_desc="Cross toolchain for powerpc64 with musl" maintainer="q66 " homepage="https://www.voidlinux.org/" @@ -20,19 +20,19 @@ distfiles=" ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz - https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz" -checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04 - 71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1 + https://github.com/kaniini/libucontext/archive/libucontext-${_libucontext_version}.tar.gz" +checksum="f00b0e8803dc9bab1e2165bd568528135be734df3fabf8d0161828cd56028952 + b8dd4368bb9c7f0b98188317ee0254dd8cc99d1e3a18d0ff146c855fe16c1d8c 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1 - 0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68" + ec122a4bca8f75922082c4f4d81b09ff3e950906d7f5504e0bce367ec9a6fceb" lib32disabled=yes nocross=yes nopie=yes nodebug=yes create_wrksrc=yes -hostmakedepends="tar gcc-objc gcc-go flex perl python3" +hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3" makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel" nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a libgmem.a" @@ -91,13 +91,11 @@ _gcc_bootstrap() { cd ${wrksrc}/gcc-${_gcc_version} _apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch - _apply_patch -p0 ${FILESDIR}/0010-ldbl128-config.patch _apply_patch -p0 ${FILESDIR}/libgcc-ibm128-no-tag.patch _apply_patch -p0 ${FILESDIR}/use-pure-64bit-configs.patch _apply_patch -p0 ${FILESDIR}/musl-ada.patch _apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch _apply_patch -p1 ${FILESDIR}/libssp-musl.patch - _apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch _apply_patch -p0 ${FILESDIR}/gccgo-musl.patch msg_normal "Building cross gcc bootstrap\n" @@ -180,7 +178,7 @@ _musl_build() { _libucontext_build() { [ -f ${wrksrc}/.libucontext_build_done ] && return 0 - cd ${wrksrc}/libucontext-${_libucontext_version} + cd ${wrksrc}/libucontext-libucontext-${_libucontext_version} msg_normal "Building cross libucontext\n" # it's ok if we're static only here @@ -234,6 +232,9 @@ _gcc_build() { } do_build() { + # Do not run fixincludes + sed -i 's@./fixinc.sh@-c true@' gcc/Makefile.in + # Ensure we use sane environment unset CC CXX CPP LD AS AR RANLIB OBJDUMP READELF NM unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS From 09320d0100d4097c87cded715534e1cd567eec76 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 10 Aug 2020 20:50:57 +0200 Subject: [PATCH 17/27] cross-x86_64-linux-musl: update to gcc 10.2.0 --- .../files/invalid_tls_model.patch | 1 - srcpkgs/cross-x86_64-linux-musl/template | 26 ++++++++++--------- 2 files changed, 14 insertions(+), 13 deletions(-) delete mode 120000 srcpkgs/cross-x86_64-linux-musl/files/invalid_tls_model.patch diff --git a/srcpkgs/cross-x86_64-linux-musl/files/invalid_tls_model.patch b/srcpkgs/cross-x86_64-linux-musl/files/invalid_tls_model.patch deleted file mode 120000 index 8f276dc0538..00000000000 --- a/srcpkgs/cross-x86_64-linux-musl/files/invalid_tls_model.patch +++ /dev/null @@ -1 +0,0 @@ -../../gcc/patches/invalid_tls_model.patch \ No newline at end of file diff --git a/srcpkgs/cross-x86_64-linux-musl/template b/srcpkgs/cross-x86_64-linux-musl/template index 96e6c7feb71..0ab97221b5b 100644 --- a/srcpkgs/cross-x86_64-linux-musl/template +++ b/srcpkgs/cross-x86_64-linux-musl/template @@ -1,17 +1,17 @@ # Template file for 'cross-x86_64-linux-musl' # -_binutils_version=2.32 -_gcc_version=9.3.0 +_binutils_version=2.34 +_gcc_version=10.2.0 _musl_version=1.1.24 _linux_version=4.19 -_libucontext_version=0.9.0 +_libucontext_version=0.11 _triplet=x86_64-linux-musl _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} -version=0.33 -revision=4 +version=0.34 +revision=1 short_desc="Cross toolchain for x86_64 with musl" maintainer="Orphaned " homepage="https://www.voidlinux.org/" @@ -21,19 +21,19 @@ distfiles=" ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz - https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz" -checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04 - 71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1 + https://github.com/kaniini/libucontext/archive/libucontext-${_libucontext_version}.tar.gz" +checksum="f00b0e8803dc9bab1e2165bd568528135be734df3fabf8d0161828cd56028952 + b8dd4368bb9c7f0b98188317ee0254dd8cc99d1e3a18d0ff146c855fe16c1d8c 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1 - 0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68" + ec122a4bca8f75922082c4f4d81b09ff3e950906d7f5504e0bce367ec9a6fceb" lib32disabled=yes nocross=yes nopie=yes nodebug=yes create_wrksrc=yes -hostmakedepends="tar gcc-objc gcc-go flex perl python3" +hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3" makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel" nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a libgmem.a" @@ -97,7 +97,6 @@ _gcc_bootstrap() { _apply_patch -p0 ${FILESDIR}/musl-ada.patch _apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch _apply_patch -p1 ${FILESDIR}/libssp-musl.patch - _apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch _apply_patch -p0 ${FILESDIR}/gccgo-musl.patch msg_normal "Building cross gcc bootstrap\n" @@ -177,7 +176,7 @@ _musl_build() { _libucontext_build() { [ -f ${wrksrc}/.libucontext_build_done ] && return 0 - cd ${wrksrc}/libucontext-${_libucontext_version} + cd ${wrksrc}/libucontext-libucontext-${_libucontext_version} msg_normal "Building cross libucontext\n" # it's ok if we're static only here @@ -229,6 +228,9 @@ _gcc_build() { } do_build() { + # Do not run fixincludes + sed -i 's@./fixinc.sh@-c true@' gcc/Makefile.in + # Ensure we use sane environment unset CC CXX CPP LD AS AR RANLIB OBJDUMP READELF NM unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS From 202d09c7291aca0d219731cca1e6ba033c646c3d Mon Sep 17 00:00:00 2001 From: John Date: Mon, 10 Aug 2020 20:51:10 +0200 Subject: [PATCH 18/27] cross-powerpc64le-linux-musl: update to gcc 10.2.0 --- .../files/0010-ldbl128-config.patch | 1 - .../files/invalid_tls_model.patch | 1 - srcpkgs/cross-powerpc64le-linux-musl/template | 27 ++++++++++--------- 3 files changed, 14 insertions(+), 15 deletions(-) delete mode 120000 srcpkgs/cross-powerpc64le-linux-musl/files/0010-ldbl128-config.patch delete mode 120000 srcpkgs/cross-powerpc64le-linux-musl/files/invalid_tls_model.patch diff --git a/srcpkgs/cross-powerpc64le-linux-musl/files/0010-ldbl128-config.patch b/srcpkgs/cross-powerpc64le-linux-musl/files/0010-ldbl128-config.patch deleted file mode 120000 index 02d68e45a47..00000000000 --- a/srcpkgs/cross-powerpc64le-linux-musl/files/0010-ldbl128-config.patch +++ /dev/null @@ -1 +0,0 @@ -../../gcc/patches/0010-ldbl128-config.patch \ No newline at end of file diff --git a/srcpkgs/cross-powerpc64le-linux-musl/files/invalid_tls_model.patch b/srcpkgs/cross-powerpc64le-linux-musl/files/invalid_tls_model.patch deleted file mode 120000 index 8f276dc0538..00000000000 --- a/srcpkgs/cross-powerpc64le-linux-musl/files/invalid_tls_model.patch +++ /dev/null @@ -1 +0,0 @@ -../../gcc/patches/invalid_tls_model.patch \ No newline at end of file diff --git a/srcpkgs/cross-powerpc64le-linux-musl/template b/srcpkgs/cross-powerpc64le-linux-musl/template index d2199de88a4..d5a4d5c6e23 100644 --- a/srcpkgs/cross-powerpc64le-linux-musl/template +++ b/srcpkgs/cross-powerpc64le-linux-musl/template @@ -1,16 +1,16 @@ # Template file for 'cross-powerpc64le-linux-musl' -_binutils_version=2.32 -_gcc_version=9.3.0 +_binutils_version=2.34 +_gcc_version=10.2.0 _musl_version=1.1.24 _linux_version=4.19 -_libucontext_version=0.9.0 +_libucontext_version=0.11 _triplet="powerpc64le-linux-musl" _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} -version=0.33 -revision=2 +version=0.34 +revision=1 short_desc="Cross toolchain for powerpc64le with musl" maintainer="q66 " homepage="https://www.voidlinux.org/" @@ -20,19 +20,19 @@ distfiles=" ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz http://www.musl-libc.org/releases/musl-${_musl_version}.tar.gz ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz - https://distfiles.adelielinux.org/source/libucontext/libucontext-${_libucontext_version}.tar.xz" -checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04 - 71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1 + https://github.com/kaniini/libucontext/archive/libucontext-${_libucontext_version}.tar.gz" +checksum="f00b0e8803dc9bab1e2165bd568528135be734df3fabf8d0161828cd56028952 + b8dd4368bb9c7f0b98188317ee0254dd8cc99d1e3a18d0ff146c855fe16c1d8c 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1 - 0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68" + ec122a4bca8f75922082c4f4d81b09ff3e950906d7f5504e0bce367ec9a6fceb" lib32disabled=yes nocross=yes nopie=yes nodebug=yes create_wrksrc=yes -hostmakedepends="tar gcc-objc gcc-go flex perl python3" +hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3" makedepends="zlib-devel gmp-devel mpfr-devel libmpc-devel isl15-devel" nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a libgmem.a" @@ -91,13 +91,11 @@ _gcc_bootstrap() { cd ${wrksrc}/gcc-${_gcc_version} _apply_patch -p0 ${FILESDIR}/fix-cxxflags-passing.patch - _apply_patch -p0 ${FILESDIR}/0010-ldbl128-config.patch _apply_patch -p0 ${FILESDIR}/libgcc-ibm128-no-tag.patch _apply_patch -p0 ${FILESDIR}/use-pure-64bit-configs.patch _apply_patch -p0 ${FILESDIR}/musl-ada.patch _apply_patch -p1 ${FILESDIR}/libgnarl-musl.patch _apply_patch -p1 ${FILESDIR}/libssp-musl.patch - _apply_patch -p0 ${FILESDIR}/invalid_tls_model.patch _apply_patch -p0 ${FILESDIR}/gccgo-musl.patch msg_normal "Building cross gcc bootstrap\n" @@ -180,7 +178,7 @@ _musl_build() { _libucontext_build() { [ -f ${wrksrc}/.libucontext_build_done ] && return 0 - cd ${wrksrc}/libucontext-${_libucontext_version} + cd ${wrksrc}/libucontext-libucontext-${_libucontext_version} msg_normal "Building cross libucontext\n" # it's ok if we're static only here @@ -234,6 +232,9 @@ _gcc_build() { } do_build() { + # Do not run fixincludes + sed -i 's@./fixinc.sh@-c true@' gcc/Makefile.in + # Ensure we use sane environment unset CC CXX CPP LD AS AR RANLIB OBJDUMP READELF NM unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS From e2ccf4e1adfcee81a805b00f7b9475faf4e45ffd Mon Sep 17 00:00:00 2001 From: John Date: Mon, 10 Aug 2020 20:51:18 +0200 Subject: [PATCH 19/27] cross-x86_64-linux-gnu: update to gcc 10.2.0 --- srcpkgs/cross-x86_64-linux-gnu/template | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/srcpkgs/cross-x86_64-linux-gnu/template b/srcpkgs/cross-x86_64-linux-gnu/template index 7d49328e8ee..600923e8482 100644 --- a/srcpkgs/cross-x86_64-linux-gnu/template +++ b/srcpkgs/cross-x86_64-linux-gnu/template @@ -1,14 +1,14 @@ # Template file for 'cross-x86_64-linux-gnu' -_binutils_version=2.32 -_gcc_version=9.3.0 -_glibc_version=2.30 +_binutils_version=2.34 +_gcc_version=10.2.0 +_glibc_version=2.32 _linux_version=4.19 _triplet="x86_64-linux-gnu" _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} -version=0.33 +version=0.34 revision=1 short_desc="GNU cross toolchain for the ${_triplet} targets (binutils/gcc/glibc)" maintainer="q66 " @@ -19,9 +19,9 @@ distfiles=" ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz" -checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04 - 71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1 - e2c4114e569afbe7edbc29131a43be833850ab9a459d81beb2588016d2bbb8af +checksum="f00b0e8803dc9bab1e2165bd568528135be734df3fabf8d0161828cd56028952 + b8dd4368bb9c7f0b98188317ee0254dd8cc99d1e3a18d0ff146c855fe16c1d8c + 1627ea54f5a1a8467032563393e0901077626dc66f37f10ee6363bb722222836 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1" lib32disabled=yes @@ -29,7 +29,7 @@ nocross=yes nopie=yes nodebug=yes create_wrksrc=yes -hostmakedepends="tar gcc-objc gcc-go flex perl python3" +hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3" makedepends="isl15-devel libmpc-devel zlib-devel" nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a libgmem.a" @@ -278,6 +278,9 @@ _gcc_build() { } do_build() { + # Do not run fixincludes + sed -i 's@./fixinc.sh@-c true@' gcc/Makefile.in + unset LDFLAGS export CFLAGS="-Os -fPIC" CXXFLAGS="-Os -fPIC" @@ -343,6 +346,12 @@ do_install() { ln -svf libgnat-${_majorver}.so libgnat.so rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so + # Remove "fixed" header + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91085 + if [ -e ${DESTDIR}/usr/lib/gcc/${_triplet}/${version}/include-fixed/bits/statx.h ]; then + rm -rf ${DESTDIR}/usr/lib/gcc/${_triplet}/${version}/include-fixed/bits/statx.h + fi + # We need to build libatomic in target gcc as gccgo needs it to # build... but it's not needed at runtime, so remove it from the # destdir so it doesn't conflict with the libatomic package From 739b45bbb1054f64aad769667478f1588a94e883 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 10 Aug 2020 20:51:53 +0200 Subject: [PATCH 20/27] cross-powerpc64le-linux-gnu: update to gcc 10.2.0 --- srcpkgs/cross-powerpc64le-linux-gnu/template | 25 +++++++++++++------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/srcpkgs/cross-powerpc64le-linux-gnu/template b/srcpkgs/cross-powerpc64le-linux-gnu/template index b7e17774db1..5a53ecdc1e3 100644 --- a/srcpkgs/cross-powerpc64le-linux-gnu/template +++ b/srcpkgs/cross-powerpc64le-linux-gnu/template @@ -1,14 +1,14 @@ # Template file for 'cross-powerpc64le-linux-gnu' -_binutils_version=2.32 -_gcc_version=9.3.0 -_glibc_version=2.30 +_binutils_version=2.34 +_gcc_version=10.2.0 +_glibc_version=2.32 _linux_version=4.19 _triplet="powerpc64le-linux-gnu" _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} -version=0.33 +version=0.34 revision=1 short_desc="GNU cross toolchain for the ${_triplet} targets (binutils/gcc/glibc)" maintainer="q66 " @@ -19,9 +19,9 @@ distfiles=" ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz" -checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04 - 71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1 - e2c4114e569afbe7edbc29131a43be833850ab9a459d81beb2588016d2bbb8af +checksum="f00b0e8803dc9bab1e2165bd568528135be734df3fabf8d0161828cd56028952 + b8dd4368bb9c7f0b98188317ee0254dd8cc99d1e3a18d0ff146c855fe16c1d8c + 1627ea54f5a1a8467032563393e0901077626dc66f37f10ee6363bb722222836 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1" lib32disabled=yes @@ -29,7 +29,7 @@ nocross=yes nopie=yes nodebug=yes create_wrksrc=yes -hostmakedepends="tar gcc-objc gcc-go flex perl python3" +hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3" makedepends="isl15-devel libmpc-devel zlib-devel" nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a libgmem.a" @@ -283,6 +283,9 @@ _gcc_build() { } do_build() { + # Do not run fixincludes + sed -i 's@./fixinc.sh@-c true@' gcc/Makefile.in + unset LDFLAGS export CFLAGS="-Os -fPIC" CXXFLAGS="-Os -fPIC" @@ -348,6 +351,12 @@ do_install() { ln -svf libgnat-${_majorver}.so libgnat.so rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so + # Remove "fixed" header + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91085 + if [ -e ${DESTDIR}/usr/lib/gcc/${_triplet}/${version}/include-fixed/bits/statx.h ]; then + rm -rf ${DESTDIR}/usr/lib/gcc/${_triplet}/${version}/include-fixed/bits/statx.h + fi + # We need to build libatomic in target gcc as gccgo needs it to # build... but it's not needed at runtime, so remove it from the # destdir so it doesn't conflict with the libatomic package From 71c2ce6b8a8854f3773c4cecb4f43f173a62bf9d Mon Sep 17 00:00:00 2001 From: John Date: Mon, 10 Aug 2020 20:52:12 +0200 Subject: [PATCH 21/27] cross-powerpc64-linux-gnu: update to gcc 10.2.0 --- srcpkgs/cross-powerpc64-linux-gnu/template | 25 +++++++++++++++------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/srcpkgs/cross-powerpc64-linux-gnu/template b/srcpkgs/cross-powerpc64-linux-gnu/template index 7f5394c880f..bf71dcb2bd8 100644 --- a/srcpkgs/cross-powerpc64-linux-gnu/template +++ b/srcpkgs/cross-powerpc64-linux-gnu/template @@ -1,14 +1,14 @@ # Template file for 'cross-powerpc64-linux-gnu' -_binutils_version=2.32 -_gcc_version=9.3.0 -_glibc_version=2.30 +_binutils_version=2.34 +_gcc_version=10.2.0 +_glibc_version=2.32 _linux_version=4.19 _triplet="powerpc64-linux-gnu" _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} -version=0.33 +version=0.34 revision=1 short_desc="GNU cross toolchain for the ${_triplet} targets (binutils/gcc/glibc)" maintainer="Jürgen Buchmüller " @@ -19,9 +19,9 @@ distfiles=" ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz" -checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04 - 71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1 - e2c4114e569afbe7edbc29131a43be833850ab9a459d81beb2588016d2bbb8af +checksum="f00b0e8803dc9bab1e2165bd568528135be734df3fabf8d0161828cd56028952 + b8dd4368bb9c7f0b98188317ee0254dd8cc99d1e3a18d0ff146c855fe16c1d8c + 1627ea54f5a1a8467032563393e0901077626dc66f37f10ee6363bb722222836 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1" lib32disabled=yes @@ -29,7 +29,7 @@ nocross=yes nopie=yes nodebug=yes create_wrksrc=yes -hostmakedepends="tar gcc-objc gcc-go flex perl python3" +hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3" makedepends="isl15-devel libmpc-devel zlib-devel" nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a libgmem.a" @@ -283,6 +283,9 @@ _gcc_build() { } do_build() { + # Do not run fixincludes + sed -i 's@./fixinc.sh@-c true@' gcc/Makefile.in + unset LDFLAGS export CFLAGS="-Os -fPIC" CXXFLAGS="-Os -fPIC" @@ -348,6 +351,12 @@ do_install() { ln -svf libgnat-${_majorver}.so libgnat.so rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so + # Remove "fixed" header + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91085 + if [ -e ${DESTDIR}/usr/lib/gcc/${_triplet}/${version}/include-fixed/bits/statx.h ]; then + rm -rf ${DESTDIR}/usr/lib/gcc/${_triplet}/${version}/include-fixed/bits/statx.h + fi + # We need to build libatomic in target gcc as gccgo needs it to # build... but it's not needed at runtime, so remove it from the # destdir so it doesn't conflict with the libatomic package From 64ce2b0746b98d4d70d9cf90a85f5a7a9bc280dd Mon Sep 17 00:00:00 2001 From: John Date: Mon, 10 Aug 2020 20:53:01 +0200 Subject: [PATCH 22/27] cross-arm-linux-gnueabihf: update to gcc 10.2.0 --- srcpkgs/cross-arm-linux-gnueabihf/template | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/srcpkgs/cross-arm-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf/template index 7394cad023e..67272881141 100644 --- a/srcpkgs/cross-arm-linux-gnueabihf/template +++ b/srcpkgs/cross-arm-linux-gnueabihf/template @@ -2,7 +2,7 @@ # _binutils_version=2.34 _gcc_version=10.2.0 -_glibc_version=2.30 +_glibc_version=2.32 _linux_version=4.19 _triplet=arm-linux-gnueabihf @@ -24,7 +24,7 @@ distfiles=" ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz" checksum="f00b0e8803dc9bab1e2165bd568528135be734df3fabf8d0161828cd56028952 b8dd4368bb9c7f0b98188317ee0254dd8cc99d1e3a18d0ff146c855fe16c1d8c - e2c4114e569afbe7edbc29131a43be833850ab9a459d81beb2588016d2bbb8af + 1627ea54f5a1a8467032563393e0901077626dc66f37f10ee6363bb722222836 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1" lib32disabled=yes @@ -33,7 +33,7 @@ nopie=yes nodebug=yes create_wrksrc=yes -hostmakedepends="tar gcc-objc gcc-go flex perl python3" +hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3" makedepends="isl15-devel libmpc-devel zlib-devel" depends="${pkgname}-libc-${version}_${revision}" nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a @@ -280,6 +280,9 @@ _gcc_build() { } do_build() { + # Do not run fixincludes + sed -i 's@./fixinc.sh@-c true@' gcc/Makefile.in + for f in include lib bin; do if [ ! -d ${_sysroot}/usr/${f} ]; then mkdir -p ${_sysroot}/usr/${f} @@ -341,6 +344,12 @@ do_install() { ln -svf libgnat-${_majorver}.so libgnat.so rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so + # Remove "fixed" header + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91085 + if [ -e ${DESTDIR}/usr/lib/gcc/${_triplet}/${version}/include-fixed/bits/statx.h ]; then + rm -rf ${DESTDIR}/usr/lib/gcc/${_triplet}/${version}/include-fixed/bits/statx.h + fi + # We need to build libatomic in target gcc as gccgo needs it to # build... but it's not needed at runtime, so remove it from the # destdir so it doesn't conflict with the libatomic package From 689824ddc4f0b0c62b02bfe7638fe8a76da73113 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 10 Aug 2020 20:53:05 +0200 Subject: [PATCH 23/27] cross-powerpc-linux-gnu: update to gcc 10.2.0 --- srcpkgs/cross-powerpc-linux-gnu/template | 27 ++++++++++++++++-------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/srcpkgs/cross-powerpc-linux-gnu/template b/srcpkgs/cross-powerpc-linux-gnu/template index 7c5231736d7..77aab1242c5 100644 --- a/srcpkgs/cross-powerpc-linux-gnu/template +++ b/srcpkgs/cross-powerpc-linux-gnu/template @@ -1,7 +1,7 @@ # Template file for 'cross-powerpc-linux-gnu' -_binutils_version=2.32 -_gcc_version=9.3.0 -_glibc_version=2.30 +_binutils_version=2.34 +_gcc_version=10.2.0 +_glibc_version=2.32 _linux_version=4.19 _triplet=powerpc-linux-gnu @@ -9,8 +9,8 @@ _archflags="-mcpu=powerpc -msecure-plt" _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} -version=0.33 -revision=3 +version=0.34 +revision=1 short_desc="GNU Cross toolchain for the ${_triplet} target (binutils/gcc/glibc)" maintainer="Thomas Batten " homepage="http://www.voidlinux.org" @@ -20,16 +20,16 @@ distfiles=" ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz" -checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04 - 71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1 - e2c4114e569afbe7edbc29131a43be833850ab9a459d81beb2588016d2bbb8af +checksum="f00b0e8803dc9bab1e2165bd568528135be734df3fabf8d0161828cd56028952 + b8dd4368bb9c7f0b98188317ee0254dd8cc99d1e3a18d0ff146c855fe16c1d8c + 1627ea54f5a1a8467032563393e0901077626dc66f37f10ee6363bb722222836 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1" lib32disabled=yes nocross=yes nopie=yes create_wrksrc=yes -hostmakedepends="tar gcc-objc gcc-go flex perl python3" +hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3" makedepends="isl15-devel libmpc-devel zlib-devel" depends="${pkgname}-libc-${version}_${revision}" nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a @@ -277,6 +277,9 @@ _gcc_build() { } do_build() { + # Do not run fixincludes + sed -i 's@./fixinc.sh@-c true@' gcc/Makefile.in + unset LDFLAGS export CFLAGS="-Os" CXXFLAGS="-Os" @@ -342,6 +345,12 @@ do_install() { ln -svf libgnat-${_majorver}.so libgnat.so rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so + # Remove "fixed" header + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91085 + if [ -e ${DESTDIR}/usr/lib/gcc/${_triplet}/${version}/include-fixed/bits/statx.h ]; then + rm -rf ${DESTDIR}/usr/lib/gcc/${_triplet}/${version}/include-fixed/bits/statx.h + fi + # We need to build libatomic in target gcc as gccgo needs it to # build... but it's not needed at runtime, so remove it from the # destdir so it doesn't conflict with the libatomic package From 564df8bdba017516e0b16eee2fa57926f256713a Mon Sep 17 00:00:00 2001 From: John Date: Mon, 10 Aug 2020 20:53:25 +0200 Subject: [PATCH 24/27] cross-arm-linux-gnueabi: update to gcc 10.2.0 --- srcpkgs/cross-arm-linux-gnueabi/template | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/srcpkgs/cross-arm-linux-gnueabi/template b/srcpkgs/cross-arm-linux-gnueabi/template index 2c4a616ecbf..8099c47d4f9 100644 --- a/srcpkgs/cross-arm-linux-gnueabi/template +++ b/srcpkgs/cross-arm-linux-gnueabi/template @@ -2,7 +2,7 @@ # _binutils_version=2.34 _gcc_version=10.2.0 -_glibc_version=2.30 +_glibc_version=2.32 _linux_version=4.19 _triplet=arm-linux-gnueabi @@ -24,7 +24,7 @@ distfiles=" ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz" checksum="f00b0e8803dc9bab1e2165bd568528135be734df3fabf8d0161828cd56028952 b8dd4368bb9c7f0b98188317ee0254dd8cc99d1e3a18d0ff146c855fe16c1d8c - e2c4114e569afbe7edbc29131a43be833850ab9a459d81beb2588016d2bbb8af + 1627ea54f5a1a8467032563393e0901077626dc66f37f10ee6363bb722222836 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1" lib32disabled=yes @@ -33,7 +33,7 @@ nopie=yes nodebug=yes create_wrksrc=yes -hostmakedepends="tar gcc-objc gcc-go flex perl python3" +hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3" makedepends="isl15-devel libmpc-devel zlib-devel" depends="${pkgname}-libc-${version}_${revision}" nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a @@ -280,6 +280,9 @@ _gcc_build() { } do_build() { + # Do not run fixincludes + sed -i 's@./fixinc.sh@-c true@' gcc/Makefile.in + for f in include lib bin; do if [ ! -d ${_sysroot}/usr/${f} ]; then mkdir -p ${_sysroot}/usr/${f} @@ -341,6 +344,12 @@ do_install() { ln -svf libgnat-${_majorver}.so libgnat.so rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so + # Remove "fixed" header + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91085 + if [ -e ${DESTDIR}/usr/lib/gcc/${_triplet}/${version}/include-fixed/bits/statx.h ]; then + rm -rf ${DESTDIR}/usr/lib/gcc/${_triplet}/${version}/include-fixed/bits/statx.h + fi + # We need to build libatomic in target gcc as gccgo needs it to # build... but it's not needed at runtime, so remove it from the # destdir so it doesn't conflict with the libatomic package From be98eec044dd3a7b9601cb7ceed5e68b099c7801 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 10 Aug 2020 20:53:34 +0200 Subject: [PATCH 25/27] cross-i686-pc-linux-gnu: update to gcc 10.2.0 [ci skip] --- srcpkgs/cross-i686-pc-linux-gnu/template | 27 ++++++++++++++++-------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template index 3e5c3f5881a..ce8db84dfda 100644 --- a/srcpkgs/cross-i686-pc-linux-gnu/template +++ b/srcpkgs/cross-i686-pc-linux-gnu/template @@ -1,8 +1,8 @@ # Template build file for 'cross-i686-pc-linux-gnu' # -_binutils_version=2.32 -_gcc_version=9.3.0 -_glibc_version=2.30 +_binutils_version=2.34 +_gcc_version=10.2.0 +_glibc_version=2.32 _linux_version=4.19 _triplet=i686-pc-linux-gnu @@ -10,8 +10,8 @@ _archflags="-march=i686 -mtune=generic" _sysroot="/usr/${_triplet}" pkgname=cross-${_triplet} -version=0.33 -revision=4 +version=0.34 +revision=1 short_desc="GNU Cross toolchain for the ${_triplet} target (binutils/gcc/glibc)" maintainer="Jürgen Buchmüller " homepage="https://www.voidlinux.org/" @@ -21,9 +21,9 @@ distfiles=" ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz ${GNU_SITE}/glibc/glibc-${_glibc_version}.tar.xz ${KERNEL_SITE}/kernel/v4.x/linux-${_linux_version}.tar.xz" -checksum="0ab6c55dd86a92ed561972ba15b9b70a8b9f75557f896446c82e8b36e473ee04 - 71e197867611f6054aa1119b13a0c0abac12834765fe2d81f35ac57f84f742d1 - e2c4114e569afbe7edbc29131a43be833850ab9a459d81beb2588016d2bbb8af +checksum="f00b0e8803dc9bab1e2165bd568528135be734df3fabf8d0161828cd56028952 + b8dd4368bb9c7f0b98188317ee0254dd8cc99d1e3a18d0ff146c855fe16c1d8c + 1627ea54f5a1a8467032563393e0901077626dc66f37f10ee6363bb722222836 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1" nocross=yes @@ -31,7 +31,7 @@ nopie=yes nodebug=yes lib32disabled=yes create_wrksrc=yes -hostmakedepends="tar gcc-objc gcc-go flex perl python3" +hostmakedepends="texinfo tar gcc-objc gcc-go flex perl python3" makedepends="isl15-devel libmpc-devel zlib-devel" depends="${pkgname}-libc-${version}_${revision}" nostrip_files="libcaf_single.a libgcc.a libgcov.a libgcc_eh.a @@ -277,6 +277,9 @@ _gcc_build() { } do_build() { + # Do not run fixincludes + sed -i 's@./fixinc.sh@-c true@' gcc/Makefile.in + # Ensure we use sane environment unset CC CXX CPP LD AS AR RANLIB OBJDUMP READELF NM unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS @@ -341,6 +344,12 @@ do_install() { ln -svf libgnat-${_majorver}.so libgnat.so rm -vf ${DESTDIR}/${_adalib}/libgna{rl,t}.so + # Remove "fixed" header + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91085 + if [ -e ${DESTDIR}/usr/lib/gcc/${_triplet}/${version}/include-fixed/bits/statx.h ]; then + rm -rf ${DESTDIR}/usr/lib/gcc/${_triplet}/${version}/include-fixed/bits/statx.h + fi + # We need to build libatomic in target gcc as gccgo needs it to # build... but it's not needed at runtime, so remove it from the # destdir so it doesn't conflict with the libatomic package From 4a901ce4add8b5baae9c84d126563064fe629b0a Mon Sep 17 00:00:00 2001 From: John Date: Sun, 8 Nov 2020 14:40:00 +0100 Subject: [PATCH 26/27] ghdl: rebuild against libada-10.2.0 [ci skip] --- srcpkgs/ghdl/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ghdl/template b/srcpkgs/ghdl/template index b89aaf92453..9e4baf3b68a 100644 --- a/srcpkgs/ghdl/template +++ b/srcpkgs/ghdl/template @@ -2,7 +2,7 @@ pkgname=ghdl reverts="20181129_1" version=0.37 -revision=1 +revision=2 archs="i686* x86_64*" build_style=configure configure_args="--prefix=/usr" From b1a32d0d59cae6f97d07b40f80f48ada782203ed Mon Sep 17 00:00:00 2001 From: John Date: Thu, 12 Nov 2020 21:29:37 +0100 Subject: [PATCH 27/27] glibc: update to 2.32. --- srcpkgs/glibc/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template index 4ea327aa1fa..18e53439164 100644 --- a/srcpkgs/glibc/template +++ b/srcpkgs/glibc/template @@ -1,6 +1,6 @@ # Template file for 'glibc' pkgname=glibc -version=2.30 +version=2.32 revision=1 bootstrap=yes short_desc="GNU C library" @@ -8,7 +8,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later, LGPL-2.1-or-later, BSD-3-Clause" homepage="http://www.gnu.org/software/libc" distfiles="${GNU_SITE}/glibc/glibc-${version}.tar.xz" -checksum=e2c4114e569afbe7edbc29131a43be833850ab9a459d81beb2588016d2bbb8af +checksum=1627ea54f5a1a8467032563393e0901077626dc66f37f10ee6363bb722222836 patch_args="-Np1" # Do not strip these files, objcopy errors out. nostrip_files="