From 1382b5b37bb5a58433ce03d7a26a9f5b4be006e7 Mon Sep 17 00:00:00 2001
From: Gilver <rockgrub@disroot.org>
Date: Sun, 27 Apr 2025 06:15:25 -0500
Subject: [PATCH] chore: Update cuda-gcc (#4458)

* chore: Spec changes needed for update

Signed-off-by: Gilver <rockgrub@disroot.org>

* Update update.rhai

Signed-off-by: Gilver <rockgrub@disroot.org>

* Update cuda-gcc.spec

Signed-off-by: Gilver <rockgrub@disroot.org>

* Maybe just let the Rhai take care of this

Signed-off-by: Gilver <rockgrub@disroot.org>

* Update cuda-gcc.spec

Signed-off-by: Gilver <rockgrub@disroot.org>

* Update update.rhai

Signed-off-by: Gilver <rockgrub@disroot.org>

* Update cuda-gcc.spec

Signed-off-by: Gilver <rockgrub@disroot.org>

* Update update.rhai

Signed-off-by: Gilver <rockgrub@disroot.org>

---------

Signed-off-by: Gilver <rockgrub@disroot.org>
---
 anda/lib/nvidia/cuda-gcc/cuda-gcc.spec | 10 +++++++---
 anda/lib/nvidia/cuda-gcc/update.rhai   |  6 +++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/anda/lib/nvidia/cuda-gcc/cuda-gcc.spec b/anda/lib/nvidia/cuda-gcc/cuda-gcc.spec
index 57ddf951f6..0c6be30a7c 100644
--- a/anda/lib/nvidia/cuda-gcc/cuda-gcc.spec
+++ b/anda/lib/nvidia/cuda-gcc/cuda-gcc.spec
@@ -1,8 +1,12 @@
+%if 0%{?fedora} < 42 || 0%{?rhel} <= 10
 %global gcc_major 13
+%else
+%global gcc_major 14
+%endif
 
 Name:           cuda-gcc
 Version:        13.3.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GNU Compiler Collection CUDA compatibility package
 License:        BSD
 URL:            http://gcc.gnu.org
@@ -29,14 +33,14 @@ cat > %{buildroot}%{_sysconfdir}/profile.d/%{name}.sh <<EOF
 export NVCC_CCBIN='g++-%{gcc_major}'
 
 # Alternatively you can use the following:
-export NVCC_PREPEND_FLAGS='-ccbin %{_bindir}/g++-%{gcc_major}'
+#export NVCC_PREPEND_FLAGS='-ccbin %{_bindir}/g++-%{gcc_major}'
 EOF
 
 cat > %{buildroot}%{_sysconfdir}/profile.d/%{name}.csh <<EOF
 setenv NVCC_CCBIN 'g++-%{gcc_major}'
 
 # Alternatively you can use the following:
-setenv NVCC_PREPEND_FLAGS '-ccbin %{_bindir}/g++-%{gcc_major}'
+#setenv NVCC_PREPEND_FLAGS '-ccbin %{_bindir}/g++-%{gcc_major}'
 EOF
 
 %files
diff --git a/anda/lib/nvidia/cuda-gcc/update.rhai b/anda/lib/nvidia/cuda-gcc/update.rhai
index 0ae33b14f1..645c3be7fd 100644
--- a/anda/lib/nvidia/cuda-gcc/update.rhai
+++ b/anda/lib/nvidia/cuda-gcc/update.rhai
@@ -1,3 +1,7 @@
 import "andax/bump_extras.rhai" as bump;
 
-rpm.version(bump::bodhi("gcc13", bump::as_bodhi_ver(labels.branch)));
+if labels.branch >= "F42" {
+    rpm.version(bump::bodhi("gcc14", bump::as_bodhi_ver(labels.branch)));
+} else {
+    rpm.version(bump::bodhi("gcc13", bump::as_bodhi_ver(labels.branch)));
+}