diff options
Diffstat (limited to 'source/d')
| -rwxr-xr-x | source/d/gcc/fetch-from-svn-and-prep-tarball.sh | 4 | ||||
| -rwxr-xr-x | source/d/gcc/gcc.SlackBuild | 6 | ||||
| -rw-r--r-- | source/d/gcc/patches/gcc.PR90397.patch | 45 | ||||
| -rwxr-xr-x | source/d/rust/rust.SlackBuild | 2 | ||||
| -rw-r--r-- | source/d/rust/rust.url | 2 |
5 files changed, 54 insertions, 5 deletions
diff --git a/source/d/gcc/fetch-from-svn-and-prep-tarball.sh b/source/d/gcc/fetch-from-svn-and-prep-tarball.sh index b38c2fc0c..de2459067 100755 --- a/source/d/gcc/fetch-from-svn-and-prep-tarball.sh +++ b/source/d/gcc/fetch-from-svn-and-prep-tarball.sh @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2018, 2019 Patrick J. Volkerding, Sebeka, Minnesota, USA # # Parts of this script are based on the gcc_release script by # Jeffrey Law, Bernd Schmidt, Mark Mitchell. @@ -18,7 +18,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -BRANCH=${BRANCH:-gcc-8-branch} +BRANCH=${BRANCH:-gcc-9-branch} rm -rf tmp-fetch mkdir tmp-fetch diff --git a/source/d/gcc/gcc.SlackBuild b/source/d/gcc/gcc.SlackBuild index 0866c201a..6a4f32426 100755 --- a/source/d/gcc/gcc.SlackBuild +++ b/source/d/gcc/gcc.SlackBuild @@ -57,7 +57,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gcc SRCVER=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} VERSION=$(echo $SRCVER | cut -f 1 -d _) -BUILD=${BUILD:-4} +BUILD=${BUILD:-5} # How many jobs to run in parallel: NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -172,6 +172,9 @@ cat $CWD/slack-desc.gcc-gdc > $PKG10/install/slack-desc # Fix internal compiler error (PR90303): zcat $CWD/patches/Fix-ipa-devirt-ICEs-with-types-requiring-structural-equality-PR-tree-optimization-90303.patch.gz | patch -p0 --verbose || exit 1 + # Fix std::variant friend declaration that broke clang (PR90397): + zcat $CWD/patches/gcc.PR90397.patch.gz | patch -p1 --verbose || exit 1 + # Fix perms/owners: chown -R root:root . find . -perm 777 -exec chmod 755 {} \; @@ -368,6 +371,7 @@ cat $CWD/slack-desc.gcc-gdc > $PKG10/install/slack-desc --verbose \ --with-arch-directory=$LIB_ARCH \ --disable-gtktest \ + --enable-clocale=gnu \ $GCC_ARCHOPTS \ --target=${TARGET} \ --build=${TARGET} \ diff --git a/source/d/gcc/patches/gcc.PR90397.patch b/source/d/gcc/patches/gcc.PR90397.patch new file mode 100644 index 000000000..454fb5201 --- /dev/null +++ b/source/d/gcc/patches/gcc.PR90397.patch @@ -0,0 +1,45 @@ +From f4f53ba83ac1e711f5e78cddc4f4063108327e81 Mon Sep 17 00:00:00 2001 +From: redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> +Date: Fri, 10 May 2019 22:23:10 +0000 +Subject: [PATCH] PR libstdc++/90397 fix std::variant friend declaration + +Clang diagnoses insert inconsistent noexcept-specifier on the friend +declaration of __get. Add . + + PR libstdc++/90397 + * include/std/variant (variant): Add noexcept to friend declaration. + +git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-9-branch@271083 138bc75d-0d04-0410-961f-82ee72b054a4 +--- + libstdc++-v3/ChangeLog | 3 +++ + libstdc++-v3/include/std/variant | 3 ++- + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog +index d440be5e49d8..4ac03895bcae 100644 +--- a/libstdc++-v3/ChangeLog ++++ b/libstdc++-v3/ChangeLog +@@ -1,5 +1,8 @@ + 2019-05-10 Jonathan Wakely <jwakely@redhat.com> + ++ PR libstdc++/90397 ++ * include/std/variant (variant): Add noexcept to friend declaration. ++ + Backport from mainline + 2019-04-26 Jonathan Wakely <jwakely@redhat.com> + +diff --git a/libstdc++-v3/include/std/variant b/libstdc++-v3/include/std/variant +index 8c7d7f37fe28..75fb0dc164ac 100644 +--- a/libstdc++-v3/include/std/variant ++++ b/libstdc++-v3/include/std/variant +@@ -1556,7 +1556,8 @@ namespace __variant + #endif + + template<size_t _Np, typename _Vp> +- friend constexpr decltype(auto) __detail::__variant::__get(_Vp&& __v); ++ friend constexpr decltype(auto) ++ __detail::__variant::__get(_Vp&& __v) noexcept; + + template<typename _Vp> + friend void* __detail::__variant::__get_storage(_Vp&& __v); + diff --git a/source/d/rust/rust.SlackBuild b/source/d/rust/rust.SlackBuild index 658b4c4b7..8a52b31ac 100755 --- a/source/d/rust/rust.SlackBuild +++ b/source/d/rust/rust.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=rust SRCNAM="${PKGNAM}c" -VERSION=${VERSION:-1.34.1} +VERSION=${VERSION:-1.34.2} BUILD=${BUILD:-1} # Set this to YES to build with the system LLVM, or NO to use the bundled LLVM. diff --git a/source/d/rust/rust.url b/source/d/rust/rust.url index a7022733d..ab9c83b98 100644 --- a/source/d/rust/rust.url +++ b/source/d/rust/rust.url @@ -1,5 +1,5 @@ # Source code (repacked to .tar.xz): -lftpget https://static.rust-lang.org/dist/rustc-1.34.1-src.tar.gz +lftpget https://static.rust-lang.org/dist/rustc-1.34.2-src.tar.gz gzip -d rustc-*tar.gz plzip -9 -v rustc-*tar |