Skip to content

Commit b2926ef

Browse files
nikictbaederr
authored andcommitted
Move patches and sources into main spec file
This way all the dependencies are listed in the main spec file. Given how small these are, I don't think there's benefit to having them split out.
1 parent 2e22c39 commit b2926ef

File tree

3 files changed

+44
-52
lines changed

3 files changed

+44
-52
lines changed

llvm.spec

Lines changed: 44 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,51 @@ Summary: The Low Level Virtual Machine
108108
License: Apache-2.0 WITH LLVM-exception OR NCSA
109109
URL: http://llvm.org
110110

111-
%include %{_sourcedir}/sources.spec.inc
111+
%if %{with snapshot_build}
112+
Source0: https://github.com/llvm/llvm-project/archive/%{llvm_snapshot_git_revision}.tar.gz
113+
%else
114+
Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:-rc%{rc_ver}}/%{src_tarball_dir}.tar.xz
115+
Source1: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:-rc%{rc_ver}}/%{src_tarball_dir}.tar.xz.sig
116+
Source6: release-keys.asc
117+
%endif
118+
119+
%if %{without compat_build}
120+
Source2005: macros.%{pkg_name_clang}
121+
%endif
112122

113-
%include %{_sourcedir}/patches.spec.inc
123+
# Sources we use to split up the main spec file in sections so that we can more
124+
# easily see what specfile sections are touched by a patch.
125+
%if %{with snapshot_build}
126+
Source1000: version.spec.inc
127+
%endif
128+
Source1001: build.spec.inc
129+
Source1002: changelog.spec.inc
130+
Source1003: check.spec.inc
131+
Source1004: files.spec.inc
132+
Source1005: globals.spec.inc
133+
Source1006: install.spec.inc
134+
Source1007: prep.spec.inc
135+
Source1008: packages.spec.inc
136+
137+
#region CLANG patches
138+
Patch2001: 0001-PATCH-clang-Make-funwind-tables-the-default-on-all-a.patch
139+
Patch2002: 0003-PATCH-clang-Don-t-install-static-libraries.patch
140+
#endregion
141+
142+
# Workaround a bug in ORC on ppc64le.
143+
# More info is available here: https://reviews.llvm.org/D159115#4641826
144+
Patch2005: 0001-Workaround-a-bug-in-ORC-on-ppc64le.patch
145+
146+
#region LLD patches
147+
Patch3002: 0001-Always-build-shared-libs-for-LLD.patch
148+
#endregion
149+
150+
#region RHEL patches
151+
# All RHEL
152+
Patch9001: 0001-Remove-myst_parser-dependency-for-RHEL.patch
153+
# RHEL 8 only
154+
Patch9002: 0001-Add-back-support-for-Python-3.6.patch
155+
#endregion
114156

115157
BuildRequires: gcc
116158
BuildRequires: gcc-c++

patches.spec.inc

Lines changed: 0 additions & 23 deletions
This file was deleted.

sources.spec.inc

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)