From b7c979f691215130c15c4d0fedb04943268f2663 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Mon, 18 Jan 2021 16:03:55 -0300 Subject: [PATCH 01/15] thunderbird: update to 78.6.1, adopt. --- srcpkgs/thunderbird/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template index 5ccbe65c264..90726eef564 100644 --- a/srcpkgs/thunderbird/template +++ b/srcpkgs/thunderbird/template @@ -3,15 +3,15 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n". # pkgname=thunderbird -version=78.6.0 +version=78.6.1 revision=1 build_helper="rust" short_desc="Standalone Mail/News reader" -maintainer="Enno Boland " +maintainer="Érico Nogueira " license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://www.thunderbird.net/" distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz" -checksum=1dd6f9a4d88b4c3d0ec47bba60a891243ef95e105a9045b2d32e2b126779844b +checksum=870b544d26f5e52c187499d134e49eded2943a4a029269ae86aba6a69c53dcc6 lib32disabled=yes From 947ba4fd50f0cf15d8594ab4a3b894cac928c144 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Mon, 18 Jan 2021 16:04:21 -0300 Subject: [PATCH 02/15] thunderbird-i18n: update to 78.6.1. --- srcpkgs/thunderbird-i18n/template | 112 +++++++++++++++--------------- 1 file changed, 56 insertions(+), 56 deletions(-) diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template index 79cd560228e..3385c87d31d 100644 --- a/srcpkgs/thunderbird-i18n/template +++ b/srcpkgs/thunderbird-i18n/template @@ -1,6 +1,6 @@ # Template file for 'thunderbird-i18n' pkgname=thunderbird-i18n -version=78.6.0 +version=78.6.1 revision=1 build_style=meta short_desc="Thunderbird language packs" @@ -96,58 +96,58 @@ _pkgtmpl() { } } -checksum="77c0da17d85872a3ceae3d5849655a0dd3d783b365d405d4c2f9b3a243b3e5aa - e92122dfd91a99e7c32b90c5055f7f0c1a5268e0c001da5fc142a9d63261f0de - 62d1d6d4f34292549b6ada66ede177b1a26efaeaa2e4d9e0f5ea7aeb6a555c1a - 7846462412da03936930afb548657bea5c0e73eb464affd54459332888b6c744 - 27534af1a57041a076261443347f183d80d757da14157ddba11ff393f248ed8b - c1541a2035e9ae4549c337686c9d8e9e995a32bc6173794d834bd83f404845dc - 3791e46378d40f75016ff5d35e66a8cef8aaed45f87368ac07bcec7fa916472f - 617f1c23b7210bf4ceccb22a3824a15074e2d9770ca66a26f6448d26beb72e81 - e90862ea3b5a6653e9eea25613915392c438ae5ae42d860440d85ffa1d850e3d - 59bbfca02bb2ac6853c845653dc2de5ba123b33b468595a356f419c1fc8b6527 - ec3e37a0a4c4dde29ba4c538d1efc1e135ef950ce95aa928c617b9da2a3de783 - 27c42d0537c3e51c7b2289fd25ef201bcd62281b5d844b68c03474be2a1e54e6 - b299d69c68a79e3709c1487ae87f8ebf5765ef38f483d148238c7c7bd54a047a - 408fe2cc100ea42751baa138b98d62ed78b5bb69f44039f61eea8262d5e9cd2e - 913446300c7b3e837309fb137e7f68f62da3c23939287feeb94a5d35425140ca - 5ed478e15a65d6ff15683b64f2769e3f7ced421c424d59ea7dba644cb5b84759 - 2b7d9416fa15300c18b13a34ab709b307ded3705d0ccffc70423ecf9762dbff8 - 31628ff53e3e87cbce122908b537df030f3ec936def0eb0e50c9791e6103b042 - d7233c9efe07e54ec29911a8b27b8bce2b09f59e027687218c300374abc80aea - 6ed4dc7f605de1516f9ae175b2b12bcd9d0fce64a8f00acb9a675ac1258af6a9 - 16a31b73042ffaf8373a977cdb2a2c563a6b49d13bc504569865a305e3fae380 - 5328efe43bdf651f3ff72696f96e8ea2aa000a95233b6a406f612c6a076ac38c - 802db39bd53707555bbd5202c2668c7be92598b75cd7364e6169218c9f1f001e - 9f9a547d87133a468757baa38a600ad24a8479231766529c2612d6f7a63836a2 - 82cf87688f7594e9d882969efd5a5963f3fa3f8b91e026b271fe630b3fda777a - 55c8f68d1702befe1782c7373893fac4d9e15fb77fcd9ee4d8345707969dcf97 - 3cdcf203980d08dd18f0b6a566dc2585140625807f839102f15f0b685312aef6 - 52ed8740582330ac3e2660f86b07676aa72533180d5a0df411569cda7e0d0ee2 - 2e2eaf97e024d908b4cbd837bd8d14e50fc30bc877958f458568f3d5ef03debf - 44830607a1818da44721d6dfb7c60395c5557c4e84fcbf7936106f6d64c0b2df - 1727d70e0a3a8c8c8c6dc049243cd7ffb6710226b0ab7e4e4d776e241c13eaf9 - 10cb0bdbc88f5718f7a7877d4ec2c5e7fc71e4dd13e0522ec10082f9846fb65c - 77740587416416ca7401573e4ba820ad2a3adb32374cb83b8a56e48aa4411b28 - 7b63447a8ee28e635e7cb060a1df868c6a8c0d11448c30712fae971ba02e132e - a4aa893d47d6edb2e9f8ad6423abe17e39be8dded5f359ed933723b944c6a85b - 327cdc48a35fdcae7daa3dac86005d15798fd8ad4ffd47a497923dcbdf9cf386 - 32a0a2dc3075db4645836dab1d6353d9466328c0e63e183290f345a04e285f87 - e07cc90bcb41097ba19d886d2d1e38ef3b3ae2f6d36cf0133e018e40535357d6 - 669a76ddd841a6559cbfdd97c82961251030e01036831279210f94606d472f05 - e6f698313d67ab9da38ff1ff8097264dabc87de85df0e1c363736f60ad0954e2 - 48ac6b9506b2cae19451845a6d633579ed341e367e4c22f525c5d147cea7bb85 - 45fbeacc161c4d3e9fa8ba12c7a06b6ddf56dc5aa3c49543f45c9e5ecc6f8533 - 8114465485f3740e2f38cd31e29e183a91cfe50c1b3bcdd2fac37f5254df38c5 - 26869522aa4a17cd3965dc35442e6687cec86274cc17d43d3eda36b71e293071 - 79ede7a6a4fdc587996a6717891a1931f63a07d468d3adf07b4df56402202fbd - 76acb24a68cc77a9f28b31e7337c815b8fefa81df6a47d57ed81612dc69c9878 - bace543f253d44df294a35bb9db6dd4fbef8d0196a5698e0a862c589519c07d5 - 8b6bd148954f415265dee893ca94024826c0f3a2ed0c308e3386637f158ed26b - 887a93e80fa6b42832e04ebea6f5c1a3cdb76cb6d4b2b0c0c882ab3c80a2c2da - 0e7b8d2f3c7b57751cc68aae7135976c9683eb14b703d23b90fe31ed4170b55c - 82f17754a013e65ad962e88a709be83eae9a00f0ba62c94bfbdf53eeb099ed19 - 1aa191b1dd13e47e02e7167063afc89bb091d7a38708fc5d7e8e5c0a34f4dd43 - cedb43a69a31e5c889f5dd485cc8036819248cfe8e49c4b519f4854c5dddb3a8 - 131e883c87b8f4af323007f112ae93bfa8e37701ff4c64237e4db2045bbefb74 - f54718774782453f8dfce92e55177663dbc8f49d8da668b0f745b98f0ca854f2" +checksum="e219394dff8efa55cff3bcdfeb11512c05429a8a8b1b267a4e25d7b4f25ff8bf + 70100e330a4357fd41aaace58191faa5d33ffc6160a71375fa50beac13426464 + 232de444679279f96d3aef9122c6ed1f1cd21519f8bade4921ba57cdae1841f5 + 7d72da039551edc420a8d26d4a36a8d2b4f157091acaf0743ea65da6b5fe94b9 + 0c26eee598ac67d9ee621a439c1c74fa3144a85a7a868330bc2896c01c2ec048 + 349c6745d419fa442dd9bb3b8e93a7ca3ee870d50365c52b059f7d17fdab7bf2 + 396b1ba5ce5f688e1ac46d240d5cf9ccb8e7c956c2fc11f92ad0cb8bba8fa02f + a059986fa9a302f51ed5de605f48750b5d4c56def5843f9024b11dbb54fd0576 + 1b0f2bab89d93a7279114fb288ac3d7593d12d1b42ac8f33c50a4b701bd20907 + aba82ecc6d91d6d47440fbffeb14f6ede17eb89a06566c001de50b5b35f948fb + 07b9b1837eaa5b4b1b7c45e37c83eb7225627daa088b841e006582cc244d798a + 581f415d8146dce16ec3ef25b43c323f01a8d90d3aad9ba16801b30df410ad6c + 2888542aac6163f93776bb43aa18a6636b2aa794ad8e349d95548faaf666569e + c296a9bd8c6f89ef7c75707d239d218b918f9fc68f1a10262362963cbbe8a010 + 47903e76d08ae2f2cdc51828a65f9b34839930219a2c6e017e729c0d41f9677d + 3e2a49c7314c050a680e85e40ec57794cdf8fa382c23744247d04db412d1527f + e3123b6fa35c0b60c90c635bc80da772eecc3c60acf596af4a78ab01d9651863 + f04e7ccb3416f29dadb85caf193a1420c56d52797b28ddb0ed300e33f3de5b43 + 9022ec0a832d35982d8ebe2a847fb8cfd2e8c7def938d2262a671921832cef09 + 1e1a2640a14b9644e6e0e25a8e400c800d9855678a84e70bac35cbcea6e6e2de + 248a7f831ebc78b21abc80046e1670183d24becc075929212d8f904a9a2bfad1 + 7b1ad4971690b75e41e881038773e9b14e74798888d4797b13a4d6149c6898ec + 83c2393f2440dac78b601b4e037c86242dbd32dbf20e80ba9eef4aa100975eaf + 9828b309b689d3dd193824b6d27e9d26ad0e64a6193b3917d80632051f7876e7 + 738653a9e4e5b42eb3aac6b21bd868bfd1d91e9f6df4fb9828dbfa5e3bf83edd + b43cd7995f75b5c59851fec42864bdece44fe1a5e29125a59b8b4efdedb6e068 + 076f46a1c75cad00b07dec0009859133a0a8edab07a91c9c19f735891ae38368 + f60db3af5aa6f9e54a18792c23d1e37f3eb31d995062eb8e42803442029ad10e + a0d2f462e3c1203315eeea160e44347a9f09a4e2be02fde958316987d280fce9 + 9c62dcfac247ec9daad9ae1040ce6cfe840f5ae7fc05c03531ef1baca8b9d2ed + 65438bc89ee12fac5322b17eb460c399e1c79153b8401b3a903b7dcc1c334f74 + cf414370af76d6acc24e79024930ab285544be64fe21be97364616dd2a579e10 + 2127e4879f5e59cc843b9ef2dc4fb06649520685ced51ab0d87e8d703705b17e + f868867c74a72317ec9df521e88e64308119def7b045119061a4e8be66285d0c + aee136f1b637c3fe7432b15c1184b8ecf019da291a756a8a1269ecfad675f999 + 23a783b408b8f72fc8ed32fd0c8b62c3aeee458569f6c239554b57897bac7375 + 0d9d01a16595895546b40da1836a798395cd571e2e25d6b6d0b6852c4181efe8 + a6a187d0f22a9c14a293ce0da887f6954218c27cad89bbafbf29bd19b487d1ea + 59b07afeed57833d55112aca0e4c054fdc7855c2b687a69ed8d3771b2b039d30 + 255759456642abb9b7a97f7ebedcc3c946d816b80db3b8ffdcbabb5420c96b41 + 56d761ca31c963351f6c34b15a82a31f5bf98a905eb1b02339a6e4613e12c7e5 + 19c814481e03422ecf538478806c4e64803c2a7a011eea614e26abe78210162b + a5324699458b5f767e48cbf763a9a7aa89ffe003b7f7b3a2fa199fd24d063206 + fbd135f039a85e064420f6cb6859fbca3ba6c24e438339e9308253cf8aead81b + c2f7b0ba8e1919b9452c0c02d3a8338442bfdcb17f2049c4b1e29a0c347fef0a + 89eb18e56ca896cfa9d4059c7a9798afb539c4f18ead11d39f10d00967013938 + 9ebda35cadfddbc0e460cc0003e745f0e1fff1cff40e7a0fc03b10e5780f8456 + 6ba07d9ad3fa236c014a081697cf7f9f870a5bc9b60b7e03a456de3e3e597acb + 6943914ef17d0f62de915721c526e4fbd3aa4d63bb8144cf95bd44a86a14bc69 + 4430402ad31bb9799f0b3110abbb2dc412022eb74b06bd5d656c6246f041b40c + 17914302e797f5362f8e6b7473ba02278003263c63dd20b044eb70a575550050 + 66bb52f540987cb548353cd0f15d34fc6d600bedd9c07df25e3e7770d12bd7de + 70cc073b366a3dc4c96369ba132308e7fa72f04c8ab3516460c45339d7ffb6b9 + 82a8ebb64d5e5af7d24b79d18650f632e90f9fd8c5d40379964d6f8bf403d336 + 613133513d1287ab13168f6ddf225d5ad9e697ec44f769cee3e9b70ee9b86150" From c046ccf2bcf225ce2dcb046549bda884b0e5568d Mon Sep 17 00:00:00 2001 From: John Date: Thu, 12 Nov 2020 21:29:37 +0100 Subject: [PATCH 03/15] glibc: update to 2.32. --- common/shlibs | 2 -- srcpkgs/glibc/template | 10 +++++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/common/shlibs b/common/shlibs index 5bd95138da0..7c26040352e 100644 --- a/common/shlibs +++ b/common/shlibs @@ -40,8 +40,6 @@ libnss_files.so.2 glibc-2.29_1 libnss_compat.so.2 glibc-2.29_1 libnss_dns.so.2 glibc-2.29_1 libnss_hesiod.so.2 glibc-2.29_1 -libnss_nisplus.so.2 glibc-2.29_1 -libnss_nis.so.2 glibc-2.29_1 libcrypt.so.1 glibc-2.29_1 libBrokenLocale.so.1 glibc-2.29_1 libmemusage.so glibc-2.29_1 diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template index dda99ba608d..9202e414545 100644 --- a/srcpkgs/glibc/template +++ b/srcpkgs/glibc/template @@ -1,14 +1,14 @@ # Template file for 'glibc' pkgname=glibc -version=2.30 -revision=2 +version=2.32 +revision=1 bootstrap=yes short_desc="GNU C library" 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=" @@ -96,12 +96,12 @@ do_configure() { SHELL=/bin/bash ../configure ${configure_args} \ --bindir=/usr/bin --sbindir=/usr/bin \ --libdir=${_libdir} --libexecdir=${_libdir} \ - --enable-add-ons=libidn --enable-obsolete-rpc \ + --enable-add-ons=libidn \ --enable-multi-arch --enable-bind-now \ --disable-profile --enable-kernel=3.2.0 \ --enable-stack-guard-randomization \ --without-selinux --without-cvs --without-gd \ - --disable-lock-elision --enable-obsolete-nsl \ + --disable-lock-elision \ --enable-stack-protector=strong \ --with-headers=${XBPS_CROSS_BASE}/usr/include \ --disable-werror \ From 7b05f47582e022c331fa40036ae1d20e098c3dbf Mon Sep 17 00:00:00 2001 From: John Date: Sun, 9 Aug 2020 22:36:02 +0200 Subject: [PATCH 04/15] gcc: update to 10.2.1pre1. Changed by q66: we're now using an upstream snapshot from alpine; this should allow us to get an assortment of regression fixes without having to patch them in also libssp fixes for musl, and typo fixes for libstdc++-devel pkg function also drop gccgo on 32-bit powerpc Co-authored-by: q66 --- common/shlibs | 8 +- srcpkgs/gcc/files/gccgo-musl.patch | 40 +++++----- srcpkgs/gcc/files/libssp-musl.patch | 29 ++++++- 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 | 55 ++++++++------ 7 files changed, 96 insertions(+), 160 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 7c26040352e..8d7862946d3 100644 --- a/common/shlibs +++ b/common/shlibs @@ -55,7 +55,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 @@ -861,8 +861,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 @@ -1731,7 +1731,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/files/libssp-musl.patch b/srcpkgs/gcc/files/libssp-musl.patch index 8d47b442aa1..e0b84f9acc9 100644 --- a/srcpkgs/gcc/files/libssp-musl.patch +++ b/srcpkgs/gcc/files/libssp-musl.patch @@ -4,9 +4,16 @@ Second part added to prevent gccgo from thinking it can -fsplit-stack on musl. --- gcc/gcc.c +++ gcc/gcc.c -@@ -876,9 +876,8 @@ +@@ -874,10 +874,15 @@ proper position among the other output files. */ + #define LINK_GCC_C_SEQUENCE_SPEC "%G %{!nolibc:%L %G}" #endif ++#ifdef ENABLE_DEFAULT_SSP ++#define NO_SSP_SPEC "%{nostdlib|nodefaultlibs|ffreestanding:-fno-stack-protector} " ++#else ++#define NO_SSP_SPEC "" ++#endif ++ #ifndef LINK_SSP_SPEC #ifdef TARGET_LIBC_PROVIDES_SSP -#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \ @@ -15,6 +22,26 @@ Second part added to prevent gccgo from thinking it can -fsplit-stack on musl. #else #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \ "|fstack-protector-strong|fstack-protector-explicit" \ +@@ -1155,7 +1160,7 @@ static const char *cc1_options = + %{-version:--version}\ + %{-help=*:--help=%*}\ + %{!fsyntax-only:%{S:%W{o*}%{!o*:-o %b.s}}}\ +- %{fsyntax-only:-o %j} %{-param*}\ ++ %{fsyntax-only:-o %j} %{-param*} " NO_SSP_SPEC "\ + %{coverage:-fprofile-arcs -ftest-coverage}\ + %{fprofile-arcs|fprofile-generate*|coverage:\ + %{!fprofile-update=single:\ +--- gcc/params.opt ++++ gcc/params.opt +@@ -853,7 +853,7 @@ Common Joined UInteger Var(param_ssa_name_def_chain_limit) Init(512) Param Optim + The maximum number of SSA_NAME assignments to follow in determining a value. + + -param=ssp-buffer-size= +-Common Joined UInteger Var(param_ssp_buffer_size) Init(8) IntegerRange(1, 65536) Param Optimization ++Common Joined UInteger Var(param_ssp_buffer_size) Init(4) IntegerRange(1, 65536) Param Optimization + The lower bound for a buffer to be considered for stack smashing protection. + + -param=stack-clash-protection-guard-size= --- gcc/config/i386/gnu-user-common.h +++ gcc/config/i386/gnu-user-common.h @@ -64,9 +64,3 @@ along with GCC; see the file COPYING3. If not see 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, 17 Jan 2021 16:00:28 +0100 Subject: [PATCH 05/15] build-style/void-cross: enable patching binutils --- common/build-style/void-cross.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh index e923c846025..e1a808369e4 100644 --- a/common/build-style/void-cross.sh +++ b/common/build-style/void-cross.sh @@ -41,12 +41,11 @@ _void_cross_build_binutils() { msg_normal "Patching binutils for ${cross_triplet}\n" cd ${wrksrc}/binutils-${ver} - # enable when crosstoolchains are updated to latest binutils - #if [ -d "${XBPS_SRCPKGDIR}/binutils/patches" ]; then - # for f in ${XBPS_SRCPKGDIR}/binutils/patches/*.patch; do - # _void_cross_apply_patch -p1 "$f" - # done - #fi + if [ -d "${XBPS_SRCPKGDIR}/binutils/patches" ]; then + for f in ${XBPS_SRCPKGDIR}/binutils/patches/*.patch; do + _void_cross_apply_patch -p1 "$f" + done + fi cd .. msg_normal "Building binutils for ${cross_triplet}\n" From 219dc2eff8db489319a3666148cf78d2d2c9c8a6 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 5 Jan 2021 21:46:22 +0100 Subject: [PATCH 06/15] build-style/void-cross: fix build with 5.10 kernel headers --- common/build-style/void-cross.sh | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh index e1a808369e4..a0783559b23 100644 --- a/common/build-style/void-cross.sh +++ b/common/build-style/void-cross.sh @@ -174,10 +174,11 @@ _void_cross_build_kernel_headers() { cd linux-${ver} - make ARCH=$cross_linux_arch headers_check - make ARCH=$cross_linux_arch \ - INSTALL_HDR_PATH=${wrksrc}/build_root/usr/${cross_triplet}/usr \ - headers_install + make ARCH=${cross_linux_arch} headers + find usr/include -name '.*' -delete + rm usr/include/Makefile + rm -r usr/include/drm + cp -a usr/include ${wrksrc}/build_root/usr/${cross_triplet}/usr touch ${wrksrc}/.linux_headers_done } @@ -533,11 +534,7 @@ do_install() { # Install Linux headers cd ${wrksrc}/linux-$(cat ${wrksrc}/.linux_version) - make ARCH=${cross_linux_arch} \ - INSTALL_HDR_PATH=${DESTDIR}/${sysroot}/usr headers_install - rm -f $(find ${DESTDIR}/${sysroot}/usr/include \ - -name .install -or -name ..install.cmd) - rm -rf ${DESTDIR}/${sysroot}/usr/include/drm + cp -a usr/include ${DESTDIR}/${sysroot}/usr # Install binutils cd ${wrksrc}/binutils_build From d2a87e250d5bd80d9c2e0cb61bcb9c05fac78161 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 1 Jan 2021 22:13:51 +0100 Subject: [PATCH 07/15] build-style/void-cross: disable usage of fixincl, it breaks glibc and does nothing for musl --- common/build-style/void-cross.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh index a0783559b23..5408bd9ef20 100644 --- a/common/build-style/void-cross.sh +++ b/common/build-style/void-cross.sh @@ -91,6 +91,10 @@ _void_cross_build_bootstrap_gcc() { msg_normal "Patching GCC for ${cross_triplet}\n" cd ${wrksrc}/gcc-${ver} + + # Do not run fixincludes + sed -i 's@./fixinc.sh@-c true@' Makefile.in + for f in ${XBPS_SRCPKGDIR}/gcc/patches/*.patch; do _void_cross_apply_patch -p0 "$f" done From b1fe9826c5705e9a6e1c69a179bf444e0ac27fca Mon Sep 17 00:00:00 2001 From: John Date: Fri, 1 Jan 2021 17:29:22 +0100 Subject: [PATCH 08/15] build-style/void-cross: remove enable-obsolete-{rpc,nsl} from glibc also enable glibc cross toolchains on musl --- common/build-style/void-cross.sh | 4 ---- common/environment/build-style/void-cross.sh | 7 ------- 2 files changed, 11 deletions(-) diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh index 5408bd9ef20..10c89e681c9 100644 --- a/common/build-style/void-cross.sh +++ b/common/build-style/void-cross.sh @@ -220,8 +220,6 @@ _void_cross_build_glibc_headers() { --host=${tgt} \ --with-headers=${wrksrc}/build_root/usr/${tgt}/usr/include \ --config-cache \ - --enable-obsolete-rpc \ - --enable-obsolete-nsl \ --enable-kernel=2.6.27 \ ${cross_glibc_configure_args} @@ -262,8 +260,6 @@ _void_cross_build_glibc() { --host=${tgt} \ --with-headers=${wrksrc}/build_root/usr/${tgt}/usr/include \ --config-cache \ - --enable-obsolete-rpc \ - --enable-obsolete-nsl \ --disable-profile \ --disable-werror \ --enable-kernel=2.6.27 \ diff --git a/common/environment/build-style/void-cross.sh b/common/environment/build-style/void-cross.sh index 08d1585e95c..62ce9eaa2e4 100644 --- a/common/environment/build-style/void-cross.sh +++ b/common/environment/build-style/void-cross.sh @@ -4,10 +4,3 @@ create_wrksrc=yes nostrip_files+=" libcaf_single.a libgcc.a libgcov.a libgcc_eh.a libgnarl_pic.a libgnarl.a libgnat_pic.a libgnat.a libgmem.a" - -# glibc crosstoolchains not available on musl hosts yet -if [ -z "$archs" -a "${cross_triplet/-musl}" = "${cross_triplet}" ]; then - if [ "$XBPS_TARGET_LIBC" != "glibc" ]; then - archs="~*-musl" - fi -fi From 45cb8006308fb2deda728f86eb6c842a85ca80af Mon Sep 17 00:00:00 2001 From: q66 Date: Sun, 17 Jan 2021 16:04:01 +0100 Subject: [PATCH 09/15] build-style/void-cross: fix for newer libucontext + autoguess arch --- common/build-style/void-cross.sh | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh index 10c89e681c9..6d57c288676 100644 --- a/common/build-style/void-cross.sh +++ b/common/build-style/void-cross.sh @@ -312,14 +312,33 @@ _void_cross_build_libucontext() { [ -f ${wrksrc}/.libucontext_build_done ] && return 0 local ver=$1 + local arch incpath msg_normal "Building libucontext for ${cross_triplet}\n" + case "$cross_triplet" in + x86_64*) arch=x86_64 ;; + i686*) arch=x86 ;; + powerpc64*) arch=ppc64 ;; + powerpc*) arch=ppc ;; + mips*64*) arch=mips64 ;; + mips*) arch=mips ;; + aarch64*) arch=aarch64 ;; + arm*) arch=arm ;; + riscv64*) arch=riscv64 ;; + s390x*) arch=s390x ;; + *) msg_error "Unknown libucontext arch for ${cross_triplet}\n" ;; + esac + cd ${wrksrc}/libucontext-${ver} # a terrible hack but seems to work for now + # we build a static-only library to prevent linking to a runtime + # since it's tiny it can be linked into libgo and we don't have + # to keep it around (which would possibly conflict with crossdeps) + incpath="${wrksrc}/build_root/usr/${cross_triplet}/usr/include" CC="${cross_triplet}-gcc" AS="${cross_triplet}-as" AR="${cross_triplet}-ar" \ - CPPFLAGS="-pipe ${cross_musl_cflags} -g0 -Os -nostdinc -isystem ${wrksrc}/build_root/usr/${cross_triplet}/usr/include" \ - make ARCH=${cross_libucontext_arch} libucontext.a + make ARCH=$arch libucontext.a \ + CFLAGS="${cross_musl_cflags} -g0 -nostdinc -isystem ${incpath}" cp libucontext.a ${wrksrc}/build_root/usr/${cross_triplet}/usr/lib From 28456d77625d495d2a064e730b00ec04237a5ec0 Mon Sep 17 00:00:00 2001 From: q66 Date: Sun, 17 Jan 2021 16:07:24 +0100 Subject: [PATCH 10/15] build-style/void-cross: remove linux and libucontext arch vars --- Manual.md | 4 +--- common/build-style/void-cross.sh | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/Manual.md b/Manual.md index 386daa24362..b012281e7fc 100644 --- a/Manual.md +++ b/Manual.md @@ -963,9 +963,7 @@ the out of source build by `meson_builddir` - `void-cross` For cross-toolchain packages used to build Void systems. You will need to specify `cross_triplet` (corresponds to the target triplet specified in the cross profile -for the target arch), `cross_linux_arch` (the architecture name in the Linux kernel source) -and when building Go support for musl targets, also `cross_libucontext_arch` (see `libucontext` -for available ones). Optionally, `cross_gcc_skip_go` can be specified. Individual subproject +for the target arch). Optionally, `cross_gcc_skip_go` can be specified. Individual subproject configure arguments can be specified via `cross_*_configure_args` where `*` is `binutils`, `gcc_bootstrap` (early gcc), `gcc` (final gcc), `glibc` (or `musl`), `configure_args` is additionally passed to both early and final `gcc`. You can also specify custom `CFLAGS` diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh index 6d57c288676..2f6e6370762 100644 --- a/common/build-style/void-cross.sh +++ b/common/build-style/void-cross.sh @@ -4,8 +4,6 @@ # Mandatory variables: # # - cross_triplet - the target triplet (e.g. aarch64-linux-gnu) -# - cross_linux_arch - the source ARCH of the kernel (e.g. arm64) -# - cross_libucontext_arch - only on musl without cross_gcc_skip_go # # Optional variables: # @@ -165,6 +163,7 @@ _void_cross_build_kernel_headers() { [ -f ${wrksrc}/.linux_headers_done ] && return 0 local ver=$1 + local arch msg_normal "Patching Linux headers for ${cross_triplet}\n" @@ -178,7 +177,18 @@ _void_cross_build_kernel_headers() { cd linux-${ver} - make ARCH=${cross_linux_arch} headers + case "$cross_triplet" in + x86_64*|i686*) arch=x86 ;; + powerpc*) arch=powerpc ;; + mips*) arch=mips ;; + aarch64*) arch=arm64 ;; + arm*) arch=arm ;; + riscv*) arch=riscv ;; + s390*) arch=s390 ;; + *) msg_error "Unknown Linux arch for ${cross_triplet}\n" ;; + esac + + make ARCH=${arch} headers find usr/include -name '.*' -delete rm usr/include/Makefile rm -r usr/include/drm @@ -421,13 +431,6 @@ _void_cross_build_gcc() { touch ${wrksrc}/.gcc_build_done } -_void_cross_check_var() { - local var="cross_${1}" - if [ -z "${!var}" ]; then - msg_error "cross_${1} not defined in template" - fi -} - _void_cross_test_ver() { local proj=$1 local noerr=$2 @@ -470,14 +473,11 @@ do_build() { libc_ver=$(cat .musl_version) if [ -z "$cross_gcc_skip_go" ]; then _void_cross_test_ver libucontext - _void_cross_check_var libucontext_arch libucontext_ver=$(cat .libucontext_version) fi fi - # Verify triplet - _void_cross_check_var triplet - _void_cross_check_var linux_arch + [ "${cross_triplet}" ] || msg_error "cross_triplet not defined in template\n" local sysroot="/usr/${cross_triplet}" From 868ee4860d6733bdcd8ef540794f8db6ee74d5bc Mon Sep 17 00:00:00 2001 From: q66 Date: Sun, 17 Jan 2021 17:28:29 +0100 Subject: [PATCH 11/15] build-style/void-cross: add minor-versioned gcc sylinks --- common/build-style/void-cross.sh | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/common/build-style/void-cross.sh b/common/build-style/void-cross.sh index 2f6e6370762..5ce5a0d4360 100644 --- a/common/build-style/void-cross.sh +++ b/common/build-style/void-cross.sh @@ -550,6 +550,7 @@ do_install() { ln -sf usr/lib ${DESTDIR}/${sysroot}/lib ln -sf usr/lib ${DESTDIR}/${sysroot}/lib${ws} ln -sf lib ${DESTDIR}/${sysroot}/usr/lib${ws} + ln -sf usr/include ${DESTDIR}/${sysroot}/include # Install Linux headers cd ${wrksrc}/linux-$(cat ${wrksrc}/.linux_version) @@ -566,6 +567,11 @@ do_install() { # Move libcc1.so* to the sysroot mv ${DESTDIR}/usr/lib/libcc1.so* ${DESTDIR}/${sysroot}/usr/lib + local gcc_ver=$(cat ${wrksrc}/.gcc_version) + local gcc_patch=${gcc_ver/_*} + local gcc_minor=${gcc_patch%.*} + local gcc_major=${gcc_minor%.*} + if [ -f ${wrksrc}/.musl_version ]; then # Install musl cd ${wrksrc}/musl_build @@ -584,20 +590,29 @@ do_install() { make install_root=${DESTDIR}/${sysroot} install install-headers # Remove bad header - rm -f ${DESTDIR}/usr/lib/gcc/${cross__triplet}/*/include-fixed/bits/statx.h + rm -f ${DESTDIR}/usr/lib/gcc/${cross_triplet}/${gcc_patch}/include-fixed/bits/statx.h fi - local gcc_ver=$(cat ${wrksrc}/.gcc_version) + # minor-versioned symlinks + mv ${DESTDIR}/usr/lib/gcc/${cross_triplet}/${gcc_patch} \ + ${DESTDIR}/usr/lib/gcc/${cross_triplet}/${gcc_minor} + ln -sfr ${DESTDIR}/usr/lib/gcc/${cross_triplet}/${gcc_minor} \ + ${DESTDIR}/usr/lib/gcc/${cross_triplet}/${gcc_patch} + + # ditto for c++ headers + mv ${DESTDIR}/${sysroot}/usr/include/c++/${gcc_patch} \ + ${DESTDIR}/${sysroot}/usr/include/c++/${gcc_minor} + ln -sfr ${DESTDIR}/${sysroot}/usr/include/c++/${gcc_minor} \ + ${DESTDIR}/${sysroot}/usr/include/c++/${gcc_patch} # Symlinks for gnarl and gnat shared libraries - local majorver=${gcc_ver%.*.*} - local adalib=usr/lib/gcc/${_triplet}/${gcc_ver}/adalib - mv ${DESTDIR}/${adalib}/libgnarl-${majorver}.so \ + local adalib=usr/lib/gcc/${_triplet}/${gcc_patch}/adalib + mv ${DESTDIR}/${adalib}/libgnarl-${gcc_major}.so \ ${DESTDIR}/${sysroot}/usr/lib - mv ${DESTDIR}/${adalib}/libgnat-${majorver}.so \ + mv ${DESTDIR}/${adalib}/libgnat-${gcc_major}.so \ ${DESTDIR}/${sysroot}/usr/lib - ln -sf libgnarl-${majorver}.so ${DESTDIR}/${sysroot}/usr/lib/libgnarl.so - ln -sf libgnat-${majorver}.so ${DESTDIR}/${sysroot}/usr/lib/libgnat.so + ln -sf libgnarl-${gcc_major}.so ${DESTDIR}/${sysroot}/usr/lib/libgnarl.so + ln -sf libgnat-${gcc_major}.so ${DESTDIR}/${sysroot}/usr/lib/libgnat.so rm -vf ${DESTDIR}/${adalib}/libgna{rl,t}.so # Remove unnecessary libatomic which is only built for gccgo From 3a1eb7b1f30cef492d717039d1dad1f5fc1e0727 Mon Sep 17 00:00:00 2001 From: q66 Date: Sun, 17 Jan 2021 16:42:04 +0100 Subject: [PATCH 12/15] cross-aarch64-linux-musl: update to gcc 10.2.1pre1 --- srcpkgs/cross-aarch64-linux-musl/template | 37 ++++++++++++----------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/srcpkgs/cross-aarch64-linux-musl/template b/srcpkgs/cross-aarch64-linux-musl/template index 4a85364ee1f..e5c31cb6583 100644 --- a/srcpkgs/cross-aarch64-linux-musl/template +++ b/srcpkgs/cross-aarch64-linux-musl/template @@ -1,16 +1,16 @@ # Template file for 'cross-aarch64-linux-musl' _triplet=aarch64-linux-musl -_binutils_version=2.32 -_gcc_version=9.3.0 +_binutils_version=2.35.1 +_gcc_version=10.2.1_pre1 _musl_version=1.1.24 -_linux_version=4.19 -_libucontext_version=0.9.0 +_linux_version=5.10.4 +_libucontext_version=1.0 pkgname=cross-${_triplet} -version=0.33 -revision=4 +version=0.34 +revision=1 build_style=void-cross configure_args="--with-arch=armv8-a" -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 gmp-devel mpfr-devel" depends="${pkgname}-libc-${version}_${revision}" short_desc="Void cross toolchain for ${_triplet}" @@ -19,26 +19,29 @@ homepage="https://www.voidlinux.org/" license="GPL-2.0-or-later, GPL-3.0-or-later, MIT" distfiles=" ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz - ${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://dev.alpinelinux.org/~nenolod/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 + https://github.com/kaniini/libucontext/archive/libucontext-${_libucontext_version}.tar.gz" +checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607 + 772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3 - 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1 - 0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68" + 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec + 23714e99a87f6dea82e8a073c526325161dd65462459820b16a6162be91955bb" nocross=yes cross_triplet=${_triplet} -cross_libucontext_arch=aarch64 -cross_linux_arch=arm64 cross_musl_cflags="-O2 -march=armv8-a" if [ "$XBPS_TARGET_MACHINE" = "aarch64-musl" ]; then broken="Can't build crosstoolchain to itself" fi +case "$XBPS_MACHINE" in + ppc64*) ;; + ppc*|mips*) broken="no gccgo support";; +esac + cross-aarch64-linux-musl-libc_package() { short_desc+=" - libc files" nostrip=yes From 76262a08d7b0eb9180997f905c3786935cf1cb48 Mon Sep 17 00:00:00 2001 From: q66 Date: Sun, 17 Jan 2021 16:42:05 +0100 Subject: [PATCH 13/15] cross-armv7l-linux-gnueabihf: update to gcc 10.2.1pre1 --- srcpkgs/cross-armv7l-linux-gnueabihf/template | 32 +++++++++++-------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/srcpkgs/cross-armv7l-linux-gnueabihf/template b/srcpkgs/cross-armv7l-linux-gnueabihf/template index d59d9d11929..abe150f2a27 100644 --- a/srcpkgs/cross-armv7l-linux-gnueabihf/template +++ b/srcpkgs/cross-armv7l-linux-gnueabihf/template @@ -1,15 +1,15 @@ # Template file for 'cross-armv7l-linux-gnueabihf' _triplet=armv7l-linux-gnueabihf -_binutils_version=2.32 -_gcc_version=9.3.0 -_glibc_version=2.30 -_linux_version=4.19 +_binutils_version=2.35.1 +_gcc_version=10.2.1_pre1 +_glibc_version=2.32 +_linux_version=5.10.4 pkgname=cross-${_triplet} -version=0.33 -revision=2 +version=0.34 +revision=1 build_style=void-cross configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard" -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 gmp-devel mpfr-devel" depends="${pkgname}-libc-${version}_${revision}" short_desc="Void cross toolchain for ${_triplet}" @@ -18,23 +18,27 @@ license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later" homepage="https://www.voidlinux.org/" distfiles=" ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz - ${GNU_SITE}/gcc/gcc-${_gcc_version}/gcc-${_gcc_version}.tar.xz + https://dev.alpinelinux.org/~nenolod/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 - 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1" + ${KERNEL_SITE}/kernel/v5.x/linux-${_linux_version}.tar.xz" +checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607 + 772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590 + 1627ea54f5a1a8467032563393e0901077626dc66f37f10ee6363bb722222836 + 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec" nocross=yes cross_triplet=${_triplet} -cross_linux_arch=arm cross_glibc_cflags="-O2 -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard" if [ "$XBPS_TARGET_MACHINE" = "armv7l" ]; then broken="Can't build crosstoolchain to itself" fi +case "$XBPS_MACHINE" in + ppc64*) ;; + ppc*|mips*) broken="no gccgo support";; +esac + cross-armv7l-linux-gnueabihf-libc_package() { short_desc+=" - glibc files" nostrip=yes From f53c3afae4cd112af3e166dc6c8ca75a08b3dea5 Mon Sep 17 00:00:00 2001 From: q66 Date: Sun, 17 Jan 2021 16:42:05 +0100 Subject: [PATCH 14/15] cross-armv7l-linux-musleabihf: update to gcc 10.2.1pre1 --- .../cross-armv7l-linux-musleabihf/template | 37 ++++++++++--------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/srcpkgs/cross-armv7l-linux-musleabihf/template b/srcpkgs/cross-armv7l-linux-musleabihf/template index fedf616d8b1..9a54186e914 100644 --- a/srcpkgs/cross-armv7l-linux-musleabihf/template +++ b/srcpkgs/cross-armv7l-linux-musleabihf/template @@ -1,16 +1,16 @@ # Template file for 'cross-armv7l-linux-musleabihf' _triplet=armv7l-linux-musleabihf -_binutils_version=2.32 -_gcc_version=9.3.0 +_binutils_version=2.35.1 +_gcc_version=10.2.1_pre1 _musl_version=1.1.24 -_linux_version=4.19 -_libucontext_version=0.9.0 +_linux_version=5.10.4 +_libucontext_version=1.0 pkgname=cross-${_triplet} -version=0.33 -revision=3 +version=0.34 +revision=1 build_style=void-cross configure_args="--with-arch=armv7-a --with-fpu=vfpv3 --with-float=hard" -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 gmp-devel mpfr-devel" depends="${pkgname}-libc-${version}_${revision}" short_desc="Void cross toolchain for ${_triplet}" @@ -19,26 +19,29 @@ homepage="https://www.voidlinux.org/" license="GPL-2.0-or-later, GPL-3.0-or-later, MIT" distfiles=" ${GNU_SITE}/binutils/binutils-${_binutils_version}.tar.xz - ${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://dev.alpinelinux.org/~nenolod/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 + https://github.com/kaniini/libucontext/archive/libucontext-${_libucontext_version}.tar.gz" +checksum="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607 + 772cfd5d30eb9cc5a996fec9ba8cdcb45d37df1c9b5770610103b814b732c590 1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3 - 0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1 - 0d53a415a307ef175153bbe60a572c940a922cb736ce13530b666e7ec2795d68" + 904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec + 23714e99a87f6dea82e8a073c526325161dd65462459820b16a6162be91955bb" nocross=yes cross_triplet=${_triplet} -cross_libucontext_arch=arm -cross_linux_arch=arm cross_musl_cflags="-O2 -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard" if [ "$XBPS_TARGET_MACHINE" = "armv7l-musl" ]; then broken="Can't build crosstoolchain to itself" fi +case "$XBPS_MACHINE" in + ppc64*) ;; + ppc*|mips*) broken="no gccgo support";; +esac + cross-armv7l-linux-musleabihf-libc_package() { short_desc+=" - libc files" nostrip=yes From cf30303e089fbd5d5f484b0f0c812766ee64b0c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Wed, 13 Jan 2021 11:45:12 -0300 Subject: [PATCH 15/15] caribou: add fix for crash observed in cinammon-screensaver. https://github.com/linuxmint/cinnamon-screensaver/issues/354 Also clean wrong and repeated entry from shlibs. --- common/shlibs | 1 - srcpkgs/caribou/patches/fix-crash.patch | 46 +++++++++++++++++++++++++ srcpkgs/caribou/patches/fix-vala.patch | 16 +++++++++ srcpkgs/caribou/template | 4 +-- 4 files changed, 64 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/caribou/patches/fix-crash.patch create mode 100644 srcpkgs/caribou/patches/fix-vala.patch diff --git a/common/shlibs b/common/shlibs index 8d7862946d3..4d12fdad9b2 100644 --- a/common/shlibs +++ b/common/shlibs @@ -894,7 +894,6 @@ liblcms2.so.2 lcms2-2.2_1 libcolord.so.2 libcolord-1.1.7_1 libcolordprivate.so.2 libcolord-1.1.7_1 libcolorhug.so.2 libcolord-1.1.7_1 -libcaribou.so.0 caribou-0.4.0_1 libgupnp-av-1.0.so.2 gupnp-av-0.10.0_1 libgrilo-0.3.so.0 grilo-0.3.2_1 libgrlnet-0.3.so.0 grilo-0.3.2_1 diff --git a/srcpkgs/caribou/patches/fix-crash.patch b/srcpkgs/caribou/patches/fix-crash.patch new file mode 100644 index 00000000000..a6fa3d7cd37 --- /dev/null +++ b/srcpkgs/caribou/patches/fix-crash.patch @@ -0,0 +1,46 @@ +From d41c8e44b12222a290eaca16703406b113a630c6 Mon Sep 17 00:00:00 2001 +From: Michael Webster +Date: Tue, 12 Jan 2021 18:01:47 +0000 +Subject: [PATCH] xadapter.vala: Remove XkbKeyTypesMask and fields from + XKbChangeMap call. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This was originally a workaround for xFree86 4.3 - see: +https://bugzilla.gnome.org/show_bug.cgi?id=673547 +​ +As of https://gitlab.freedesktop.org/xorg/xserver/-/commit/87c64fc5b0 this +causes a BadLength error when attempting to use shifted characters. +​ +Ref: +https://www.x.org/releases/X11R7.7/doc/libX11/XKB/xkblib.html#Changing_Map_Components_in_the_Server +--- + libcaribou/xadapter.vala | 9 ++------- + 1 file changed, 2 insertions(+), 7 deletions(-) + +diff --git a/libcaribou/xadapter.vala b/libcaribou/xadapter.vala +index 22858b7..1da5a78 100644 +--- a/libcaribou/xadapter.vala ++++ b/libcaribou/xadapter.vala +@@ -195,15 +195,10 @@ namespace Caribou { + + Xkb.MapChanges changes = Xkb.MapChanges (); + +- // We don't touch key types here but include the +- // information in XkbSetMap request to the server, because +- // some X servers need the information to check the sanity +- // of the keysyms change. +- changes.changed = (ushort) (Xkb.KeySymsMask | Xkb.KeyTypesMask); ++ changes.changed = (ushort) Xkb.KeySymsMask; + changes.first_key_sym = (char) this.reserved_keycode; + changes.num_key_syms = this.xkbdesc.map.key_sym_map[this.reserved_keycode].width; +- changes.first_type = 0; +- changes.num_types = this.xkbdesc.map.num_types; ++ + Xkb.change_map (this.xdisplay, this.xkbdesc, changes); + + this.xdisplay.flush (); +-- +GitLab + diff --git a/srcpkgs/caribou/patches/fix-vala.patch b/srcpkgs/caribou/patches/fix-vala.patch new file mode 100644 index 00000000000..9fae15bc231 --- /dev/null +++ b/srcpkgs/caribou/patches/fix-vala.patch @@ -0,0 +1,16 @@ +Patch from +https://github.com/archlinux/svntogit-packages/blob/bf8285526628664f46c1b790238c6e3555e51499/trunk/unicode_to_keyval-symbol-check.patch + +diff --git a/libcaribou/key-model.vala b/libcaribou/key-model.vala +index 89015bc..e88342e 100644 +--- a/libcaribou/key-model.vala ++++ b/libcaribou/key-model.vala +@@ -101,7 +101,7 @@ namespace Caribou { + unichar uc; + while (text.get_next_char (ref index, out uc)) { + uint keyval = Gdk.unicode_to_keyval (uc); +- if (keyval != uc | 0x01000000) ++ if (keyval != (uc | 0x01000000)) + _keyvals += keyval; + } + } else { diff --git a/srcpkgs/caribou/template b/srcpkgs/caribou/template index 6ac08ee5e22..bf135b75f8b 100644 --- a/srcpkgs/caribou/template +++ b/srcpkgs/caribou/template @@ -1,12 +1,12 @@ # Template file for 'caribou' pkgname=caribou version=0.4.21 -revision=4 +revision=5 build_style=gnu-configure build_helper="gir" configure_args="--disable-schemas-compile --disable-static --disable-gtk2-module PYTHON=/usr/bin/python3" -hostmakedepends="pkg-config intltool python3-gobject-devel libxslt" +hostmakedepends="pkg-config intltool python3-gobject-devel libxslt vala" makedepends="vala-devel libxklavier-devel libgee08-devel python3-gobject-devel clutter-devel gtk+3-devel libXtst-devel gir-freedesktop" depends="python3-gobject python3-atspi python3-dbus gir-freedesktop at-spi2-atk