#162 Remove rc_ver handling
Closed a month ago by tbaeder. Opened 2 months ago by tbaeder.
rpms/ tbaeder/clang rawhide  into  rawhide

file modified
+7 -15
@@ -4,7 +4,6 @@ 

  %global maj_ver 14

  %global min_ver 0

  %global patch_ver 0

- #global rc_ver 4

  %global clang_version %{maj_ver}.%{min_ver}.%{patch_ver}

  

  %if %{with compat_build}
@@ -25,32 +24,26 @@ 

  %global pkg_libdir %{_libdir}

  %endif

  

- %global build_install_prefix %{buildroot}%{install_prefix}

- 

  %ifarch ppc64le

  # Too many threads on ppc64 systems causes OOM errors.

  %global _smp_mflags -j8

  %endif

  

- %global clang_srcdir clang-%{clang_version}%{?rc_ver:rc%{rc_ver}}.src

- %global clang_tools_srcdir clang-tools-extra-%{clang_version}%{?rc_ver:rc%{rc_ver}}.src

- 

- %if !%{maj_ver} && 0%{?rc_ver}

- %global abi_revision 2

- %endif

+ %global clang_srcdir clang-%{clang_version}.src

+ %global clang_tools_srcdir clang-tools-extra-%{clang_version}.src

  

  Name:		%pkg_name

- Version:	%{clang_version}%{?rc_ver:~rc%{rc_ver}}

+ Version:	%{clang_version}

  Release:	2%{?dist}

  Summary:	A C language family front-end for LLVM

  

  License:	NCSA

  URL:		http://llvm.org

- Source0:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{clang_version}%{?rc_ver:-rc%{rc_ver}}/%{clang_srcdir}.tar.xz

- Source3:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{clang_version}%{?rc_ver:-rc%{rc_ver}}/%{clang_srcdir}.tar.xz.sig

+ Source0:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/%{clang_srcdir}.tar.xz

+ Source3:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/%{clang_srcdir}.tar.xz.sig

  %if %{without compat_build}

- Source1:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{clang_version}%{?rc_ver:-rc%{rc_ver}}/%{clang_tools_srcdir}.tar.xz

- Source2:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{clang_version}%{?rc_ver:-rc%{rc_ver}}/%{clang_tools_srcdir}.tar.xz.sig

+ Source1:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/%{clang_tools_srcdir}.tar.xz

+ Source2:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/%{clang_tools_srcdir}.tar.xz.sig

  %endif

  Source4:	tstellar-gpg-key.asc

  %if %{without compat_build}
@@ -359,7 +352,6 @@ 

  	-DLLVM_ENABLE_NEW_PASS_MANAGER=ON \

  	-DLLVM_ENABLE_SPHINX=ON \

  	-DCLANG_LINK_CLANG_DYLIB=ON \

- 	%{?abi_revision:-DLLVM_ABI_REVISION=%{abi_revision}} \

  	-DSPHINX_WARNINGS_AS_ERRORS=OFF \

  	\

  	-DCLANG_BUILD_EXAMPLES:BOOL=OFF \

We don't package release candidates anymore.

Not 100% sure if this isn't a bit premature.

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci

I think Serge mentioned this offline, but we stll do rc builds in COPR, so I think we should keep this.

Pull-Request has been closed by tbaeder

a month ago
Metadata