public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/rocm-compilersupport] epel10: Change --with gitcommit to --with preview
@ 2026-06-09 23:06 Tom Rix
  0 siblings, 0 replies; only message in thread
From: Tom Rix @ 2026-06-09 23:06 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/rocm-compilersupport
            Branch : epel10
            Commit : 769377e4c85c51a182515c41893aef92184b5405
            Author : Tom Rix <Tom.Rix@amd.com>
            Date   : 2026-03-04T14:47:53-08:00
            Stats  : +20/-32 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/rocm-compilersupport/c/769377e4c85c51a182515c41893aef92184b5405?branch=epel10

            Log:
            Change --with gitcommit to --with preview

Signed-off-by: Tom Rix <Tom.Rix@amd.com>

---
diff --git a/.gitignore b/.gitignore
index 8798e6c..92759bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@
 /rocm-compilersupport-7.1.0.tar.gz
 /rocm-compilersupport-7.1.1.tar.gz
 /rocm-compilersupport-7.2.0.tar.gz
+/rocm-compilersupport-7.11.0.tar.gz

diff --git a/rocm-compilersupport.spec b/rocm-compilersupport.spec
index f363f5f..d38188f 100644
--- a/rocm-compilersupport.spec
+++ b/rocm-compilersupport.spec
@@ -21,34 +21,23 @@
 #
 
 # For building earlier snapshots of the compiler
-%bcond_with gitcommit
-%if %{with gitcommit}
-%global commit0 1b0eada6b0ee93e2e694c8c146d23fca90bc11c5
-%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
-%global date0 20251024
-
-# The package follows LLVM's major version, but API version is still important:
-%global comgr_maj_api_ver 3
-# Upstream tags are based on rocm releases:
-%global rocm_release 7.1
+%bcond_with preview
+%if %{with preview}
+%global rocm_release 7.11
 %global rocm_patch 0
-# What LLVM is upstream using (use LLVM_VERSION_MAJOR from llvm/CMakeLists.txt):
-%global llvm_maj_ver 20
-%global llvm_version_suffix .rocm
-
+%global pkg_src therock-%{rocm_release}
 %else
-# Normal release
+%global rocm_release 7.2
+%global rocm_patch 0
+%global pkg_src rocm-%{rocm_release}.%{rocm_patch}
+%endif
 
 # The package follows LLVM's major version, but API version is still important:
 %global comgr_maj_api_ver 3
-# Upstream tags are based on rocm releases:
-%global rocm_release 7.2
-%global rocm_patch 0
 # What LLVM is upstream using (use LLVM_VERSION_MAJOR from llvm/CMakeLists.txt):
 %global llvm_maj_ver 22
 %global llvm_version_suffix .rocm
 
-%endif
 # local, fedora
 %global _comgr_full_api_ver %{comgr_maj_api_ver}.0
 # mock, suse
@@ -129,10 +118,10 @@
 
 Name:           %{pkg_name}
 Version:        %{llvm_maj_ver}
-%if %{with gitcommit}
-Release:        0.rocm%{rocm_version}^git%{date0}.%{shortcommit0}%{?dist}.1
+%if %{with preview}
+Release:        0.rocm%{rocm_version}%{?dist}
 %else
-Release:        3.rocm%{rocm_version}%{?dist}
+Release:        4.rocm%{rocm_version}%{?dist}
 %endif
 
 Summary:        Various AMD ROCm LLVM related services
@@ -144,11 +133,7 @@ Url:            https://github.com/ROCm/llvm-project
 # llvm is Apache-2.0 WITH LLVM-exception OR NCSA
 # hipcc is MIT, comgr and device-libs are NCSA:
 License:        (Apache-2.0 WITH LLVM-exception OR NCSA) AND NCSA AND MIT
-%if %{with gitcommit}
-Source0:        %{url}/archive/%{commit0}/llvm-project-%{shortcommit0}.tar.gz
-%else
-Source0:        %{url}/archive/refs/tags/rocm-%{rocm_version}.tar.gz#/rocm-compilersupport-%{rocm_version}.tar.gz
-%endif
+Source0:        %{url}/archive/refs/tags/%{pkg_src}.tar.gz#/rocm-compilersupport-%{rocm_version}.tar.gz
 Source1:        rocm-compilersupport.prep.in
 
 # Link comgr with static versions of llvm's libraries
@@ -161,8 +146,10 @@ Patch3:         0001-rocm-compilersupport-force-hip-runtime-detection.patch
 Patch4:         0001-rocm-compilersupport-simplify-use-runtime-wrapper-ch.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=2415065
 Patch5:         0001-lld-workaround-.gnu.version-change.patch
+%if %{without preview}
 # backport
 Patch6:         0001-SemaConcept.cpp-fix-MSVC-not-all-control-paths-retur.patch
+%endif
 
 BuildRequires:  cmake
 %if 0%{?fedora} || 0%{?suse_version}
@@ -405,11 +392,7 @@ Requires:      perl(Sys::Hostname)
 %endif
 
 %prep
-%if %{with gitcommit}
-%autosetup -p1 -n %{upstreamname}-%{commit0}
-%else
-%autosetup -p1 -n %{upstreamname}-rocm-%{rocm_version}
-%endif
+%autosetup -p1 -n %{upstreamname}-%{pkg_src}
 
 # Remove third-party
 #
@@ -1027,6 +1010,9 @@ rm -rf %{buildroot}%{bundle_prefix}/share/man/man1/scan-build.1
 %endif
 
 %changelog
+* Wed Mar 4 2026 Tom Rix <Tom.Rix@amd.com> 22-4.rocm7.2.0
+- Change --with gitcommit to --with preview
+
 * Mon Feb 16 2026 Tom Rix <Tom.Rix@amd.com> 22-3.rocm7.2.0
 - Fix build on TW
 - Fix dir ownership of clang-analyzer

diff --git a/sources b/sources
index 1aa6402..fe9bc0d 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 SHA512 (rocm-compilersupport-7.2.0.tar.gz) = cc68b61605e89291d8417e438e4134a6cb7c5112145fe0ac72e358ddbf300dc86bbed18a9bc143e86d5f4085b327e1c5f81e14b6d17001605d63c1171c29841e
+SHA512 (rocm-compilersupport-7.11.0.tar.gz) = 11bcfc50e1a09bd91ed4d0867837f419864eeae5874d12a9ccd1c8e3558daad1c389454c740abf975eb03e0973f2acd729c15cc9a4126ec0b5e0eb868cc247d5

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-06-09 23:06 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-09 23:06 [rpms/rocm-compilersupport] epel10: Change --with gitcommit to --with preview Tom Rix

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox