diff options
| -rw-r--r-- | dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.7.0-r3.ebuild (renamed from dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.7.0-r2.ebuild) | 2 | ||||
| -rw-r--r-- | dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.8.0-r2.ebuild (renamed from dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.8.0-r1.ebuild) | 2 | ||||
| -rw-r--r-- | eclass/cuda.eclass | 8 | ||||
| -rw-r--r-- | sci-libs/pdal/pdal-2.4.3.ebuild | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.7.0-r2.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.7.0-r3.ebuild index b4b3850015f4..d412200970f0 100644 --- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.7.0-r2.ebuild +++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.7.0-r3.ebuild @@ -47,7 +47,7 @@ pkg_setup() { src_prepare() { # ATTENTION: change requires revbump - local cuda_supported_gcc="8.5 9.4 9.5 10.3 10.4 11.1 11.2 11.3" + local cuda_supported_gcc="8.5 9.4 9.5 10 10.3 10.4 11 11.1 11.2 11.3" sed \ -e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \ diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.8.0-r1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.8.0-r2.ebuild index 14112f7a0201..3d18c5e4310e 100644 --- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.8.0-r1.ebuild +++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.8.0-r2.ebuild @@ -47,7 +47,7 @@ pkg_setup() { src_prepare() { # ATTENTION: change requires revbump - local cuda_supported_gcc="8.5 9.4 9.5 10.3 10.4 11.1 11.2 11.3" + local cuda_supported_gcc="8.5 9.4 9.5 10 10.3 10.4 11 11.1 11.2 11.3" sed \ -e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \ diff --git a/eclass/cuda.eclass b/eclass/cuda.eclass index 3dc8299c275c..81c8c1f2fc59 100644 --- a/eclass/cuda.eclass +++ b/eclass/cuda.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 case "${EAPI:-0}" in @@ -87,7 +87,7 @@ cuda_gccdir() { # Try the current gcc version first ver=$(gcc-version) if [[ -n "${ver}" ]] && [[ ${vers} =~ ${ver} ]]; then - dirs=( ${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/${ver}*/ ) + dirs=( ${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/${ver%.*}*/ ) gcc_bindir="${dirs[${#dirs[@]}-1]}" fi @@ -96,14 +96,14 @@ cuda_gccdir() { ver=$(ver_cut 1-2 "${ver##*sys-devel/gcc-}") if [[ -n "${ver}" ]] && [[ ${vers} =~ ${ver} ]]; then - dirs=( ${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/${ver}*/ ) + dirs=( ${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/${ver%.*}*/ ) gcc_bindir="${dirs[${#dirs[@]}-1]}" fi fi for ver in ${vers}; do if has_version "=sys-devel/gcc-${ver}*"; then - dirs=( ${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/${ver}*/ ) + dirs=( ${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/${ver%.*}*/ ) gcc_bindir="${dirs[${#dirs[@]}-1]}" fi done diff --git a/sci-libs/pdal/pdal-2.4.3.ebuild b/sci-libs/pdal/pdal-2.4.3.ebuild index 72c3e319af65..961bd7205f69 100644 --- a/sci-libs/pdal/pdal-2.4.3.ebuild +++ b/sci-libs/pdal/pdal-2.4.3.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/PDAL/PDAL/releases/download/${PV}/PDAL-${PV}-src.tar LICENSE="BSD" SLOT="0/14" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~x86" IUSE="postgres test" RESTRICT="!test? ( test )" |