rpms/llvm
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix source location

Browse Source
This commit is contained in:
serge-sans-paille 2020-09-01 10:40:54 +00:00
parent 9095ad677f
commit 130685912f
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
llvm.spec
View File

@ -11,7 +11,7 @@
%global llvm_libdir %{_libdir}/%{name} %global llvm_libdir %{_libdir}/%{name}
%global build_llvm_libdir %{buildroot}%{llvm_libdir} %global build_llvm_libdir %{buildroot}%{llvm_libdir}
%global rc_ver 2 %global rc_ver 2
%global baserelease 0.5 %global baserelease 0.6
%global llvm_srcdir llvm-%{version}%{?rc_ver:rc%{rc_ver}}.src %global llvm_srcdir llvm-%{version}%{?rc_ver:rc%{rc_ver}}.src
%global maj_ver 11 %global maj_ver 11
%global min_ver 0 %global min_ver 0
@ -44,18 +44,13 @@ Summary: The Low Level Virtual Machine
License: NCSA License: NCSA
URL: http://llvm.org URL: http://llvm.org
%if 0%{?rc_ver:1} Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}%{?rc_ver:-rc%{rc_ver}}/%{llvm_srcdir}.tar.xz
Source0: https://prereleases.llvm.org/%{version}/rc%{rc_ver}/%{llvm_srcdir}.tar.xz Source1: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}%{?rc_ver:-rc%{rc_ver}}/%{llvm_srcdir}.tar.xz.sig
Source3: https://prereleases.llvm.org/%{version}/rc%{rc_ver}/%{llvm_srcdir}.tar.xz.sig Source2: https://prereleases.llvm.org/%{version}/hans-gpg-key.asc
%else
Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/%{llvm_srcdir}.tar.xz
Source3: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/%{llvm_srcdir}.tar.xz.sig
%endif
%if %{without compat_build} %if %{without compat_build}
Source1: run-lit-tests Source3: run-lit-tests
Source2: lit.fedora.cfg.py Source4: lit.fedora.cfg.py
%endif %endif
Source4: https://prereleases.llvm.org/%{version}/hans-gpg-key.asc
# https://reviews.llvm.org/D85007 # https://reviews.llvm.org/D85007
# https://bugzilla.redhat.com/show_bug.cgi?id=1862012 # https://bugzilla.redhat.com/show_bug.cgi?id=1862012
@ -173,7 +168,7 @@ LLVM's modified googletest sources.
%endif %endif
%prep %prep
%{gpgverify} --keyring='%{SOURCE4}' --signature='%{SOURCE3}' --data='%{SOURCE0}' %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
%autosetup -n %{llvm_srcdir} -p2 %autosetup -n %{llvm_srcdir} -p2
pathfix.py -i %{__python3} -pn \ pathfix.py -i %{__python3} -pn \
@ -332,7 +327,7 @@ head -n -2 %{_vpath_builddir}/test/lit.site.cfg.py >> %{lit_cfg}
head -n -2 %{_vpath_builddir}/test/Unit/lit.site.cfg.py >> %{lit_unit_cfg} head -n -2 %{_vpath_builddir}/test/Unit/lit.site.cfg.py >> %{lit_unit_cfg}
# Install custom fedora config file # Install custom fedora config file
cp %{SOURCE2} %{buildroot}%{lit_fedora_cfg} cp %{SOURCE4} %{buildroot}%{lit_fedora_cfg}
# Patch lit config files to load custom fedora config: # Patch lit config files to load custom fedora config:
for f in %{lit_cfg} %{lit_unit_cfg}; do for f in %{lit_cfg} %{lit_unit_cfg}; do
@ -340,7 +335,7 @@ for f in %{lit_cfg} %{lit_unit_cfg}; do
done done
install -d %{buildroot}%{_libexecdir}/tests/llvm install -d %{buildroot}%{_libexecdir}/tests/llvm
install -m 0755 %{SOURCE1} %{buildroot}%{_libexecdir}/tests/llvm install -m 0755 %{SOURCE3} %{buildroot}%{_libexecdir}/tests/llvm
# Install lit tests. We need to put these in a tarball otherwise rpm will complain # Install lit tests. We need to put these in a tarball otherwise rpm will complain
# about some of the test inputs having the wrong object file format. # about some of the test inputs having the wrong object file format.
@ -540,6 +535,9 @@ fi
%endif %endif
%changelog %changelog
* Tue Sep 01 2020 sguelton@redhat.com - 11.0.0-0.6.rc2
- Fix source location
* Fri Aug 21 2020 Tom Stellard <tstellar@redhat.com> - 11.0.0-0.5.rc2 * Fri Aug 21 2020 Tom Stellard <tstellar@redhat.com> - 11.0.0-0.5.rc2
- 11.0.0-rc2 Release - 11.0.0-rc2 Release