Merge remote-tracking branch 'up/f38' into f38-riscv64
Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
This commit is contained in:
commit
df8fc7f4c1
GPG Key ID:
8B7F1DA0E2C9FDBB
|
|
@ -0,0 +1,25 @@
|
|||
diff -Naur a/llvm/docs/conf.py b/llvm/docs/conf.py
|
||||
--- a/llvm/docs/conf.py 2020-09-15 09:12:24.318287611 +0000
|
||||
+++ b/llvm/docs/conf.py 2020-09-15 15:01:00.025893199 +0000
|
||||
@@ -36,20 +36,7 @@
|
||||
'.rst': 'restructuredtext',
|
||||
}
|
||||
|
||||
-try:
|
||||
- import recommonmark
|
||||
-except ImportError:
|
||||
- # manpages do not use any .md sources
|
||||
- if not tags.has('builder-man'):
|
||||
- raise
|
||||
-else:
|
||||
- import sphinx
|
||||
- if sphinx.version_info >= (3, 0):
|
||||
- # This requires 0.5 or later.
|
||||
- extensions.append('recommonmark')
|
||||
- else:
|
||||
- source_parsers = {'.md': 'recommonmark.parser.CommonMarkParser'}
|
||||
- source_suffix['.md'] = 'markdown'
|
||||
+import sphinx
|
||||
|
||||
# The encoding of source files.
|
||||
#source_encoding = 'utf-8-sig'
|
||||
16
llvm.spec
16
llvm.spec
|
|
@ -24,7 +24,7 @@
|
|||
#global rc_ver 4
|
||||
%global maj_ver 16
|
||||
%global min_ver 0
|
||||
%global patch_ver 4
|
||||
%global patch_ver 5
|
||||
%global llvm_srcdir llvm-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:rc%{rc_ver}}.src
|
||||
%global cmake_srcdir cmake-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:rc%{rc_ver}}.src
|
||||
%global third_party_srcdir third-party-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:rc%{rc_ver}}.src
|
||||
|
|
@ -99,6 +99,8 @@ Source6: release-keys.asc
|
|||
|
||||
# See https://reviews.llvm.org/D137890 for the next two patches
|
||||
Patch2: 0001-llvm-Add-install-targets-for-gtest.patch
|
||||
# RHEL-specific patch to avoid unwanted recommonmark dep
|
||||
Patch101: 0101-Deactivate-markdown-doc.patch
|
||||
# Patching third-party dir with a 200 offset in patch number
|
||||
Patch201: 0201-third-party-Add-install-targets-for-gtest.patch
|
||||
|
||||
|
|
@ -112,7 +114,9 @@ BuildRequires: libffi-devel
|
|||
BuildRequires: ncurses-devel
|
||||
BuildRequires: python3-psutil
|
||||
BuildRequires: python3-sphinx
|
||||
%if %{undefined rhel}
|
||||
BuildRequires: python3-recommonmark
|
||||
%endif
|
||||
BuildRequires: multilib-rpm-config
|
||||
%if %{with gold}
|
||||
BuildRequires: binutils-devel
|
||||
|
|
@ -227,7 +231,7 @@ cd ..
|
|||
mv %{third_party_srcdir} third-party
|
||||
|
||||
%setup -T -q -b 0 -n %{llvm_srcdir}
|
||||
%autopatch -M200 -p2
|
||||
%autopatch -M%{?!rhel:100}%{?rhel:200} -p2
|
||||
|
||||
%py3_shebang_fix \
|
||||
test/BugPoint/compile-custom.ll.py \
|
||||
|
|
@ -568,10 +572,16 @@ fi
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Thu Jun 01 2023 David Abdurachmanov <davidlt@rivosinc.com> - 16.0.4-1.0.riscv64
|
||||
* Sat Jun 10 2023 David Abdurachmanov <davidlt@rivosinc.com> - 16.0.5-1.0.riscv64
|
||||
- Disable tests on riscv64 for now
|
||||
- Lower memory consumption on riscv64
|
||||
|
||||
* Mon Jun 05 2023 Tulio Magno Quites Machado Filho <tuliom@redhat.com> - 16.0.5-1
|
||||
- Update to LLVM 16.0.5
|
||||
|
||||
* Fri May 19 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 16.0.4-2
|
||||
- Avoid recommonmark dependency in RHEL builds
|
||||
|
||||
* Thu May 18 2023 Tulio Magno Quites Machado Filho <tuliom@redhat.com> - 16.0.4-1
|
||||
- Update to LLVM 16.0.4
|
||||
|
||||
|
|
|
|||
12
sources
12
sources
|
|
@ -1,6 +1,6 @@
|
|||
SHA512 (llvm-16.0.4.src.tar.xz) = b88e4a5844e99da4389be49900dfafd1e64284aa5c7541974490c7dd3a688a2f8dd4c4fbd53e859d4b7862a822ea1d05bbbd863322b296cb779936148a90244e
|
||||
SHA512 (llvm-16.0.4.src.tar.xz.sig) = 3d933492bc93121e2883f0c97481a335f71f67dcd54276ebce3ab8be2a6f83bb00216e94b3e340df0a66b80c95d92cb046f902ee29d6c73fabed25aefa1fbbff
|
||||
SHA512 (cmake-16.0.4.src.tar.xz) = 942f10a5d1e3e48768d62a2595f8670872069ab2065871c786a435ae23108fb263e8c3db906dca0e68aeb8aad00f62f7604cd2f41da9e00f574b6021f846bb9d
|
||||
SHA512 (cmake-16.0.4.src.tar.xz.sig) = 53a604eda96a7018f7b2dc93f0bd639d414065e7ab66112c879040630555b53c15ead98f11e9f6fb315d04a56396b9c9bab3781c596227e785bcb320c055f767
|
||||
SHA512 (third-party-16.0.4.src.tar.xz) = 39f53a61097322305bd153a349cd66b3b1e046a6737a53f171968d395f257320f385a6ca992278f052048fb76beb51f68ff5d81bb0dd0740e661b1010fab49f4
|
||||
SHA512 (third-party-16.0.4.src.tar.xz.sig) = a6937ee06f3141afdfce4e79175c8d7deb421c26fa584fc49aeeaf22f60e4b2368e5fba1d7909b91b2caec237e40e6ec4af490cada1bc397b84b442f4c979965
|
||||
SHA512 (llvm-16.0.5.src.tar.xz) = f5fa671e16c4dfe4d506320cbe386261315c1cfd79ff70d0fcfbd945003c26a5f936249dd880ad86711015ff4d2e05d6102f96318a25d52cd1e9e316f6e4d685
|
||||
SHA512 (llvm-16.0.5.src.tar.xz.sig) = f31bdd66b7c551fba531d77f089ed82fa23e84a61428bc599849f22c909c6eed36d015553902869329c14bf32e91574dd3549be0ec4fa306499d5e2cf70f711f
|
||||
SHA512 (cmake-16.0.5.src.tar.xz) = 0b81399c872dc886f486568537dab7033de347ba9ea68243db7df6f5651b22c5e3034a5a505185e076de2091b0d8721d35136450d1e1d1ab821bfdd6c5992df2
|
||||
SHA512 (cmake-16.0.5.src.tar.xz.sig) = 12659c47e1ff4215f0bfe2354bd3a07618f560df0c3098f469c06c04825112cd0bf5610f0e58d7de3ee84d57adbb57a60a5de20b2c8bad9ff70c64e78c3dc3e5
|
||||
SHA512 (third-party-16.0.5.src.tar.xz) = a66caf8761d72e8c59ce87faea09f3d3f3ba17c92c1a07bae09304801b76d29962444a06b1fab61eeca085822ed7c14d0c41976c3493220ceff9877d63a85cef
|
||||
SHA512 (third-party-16.0.5.src.tar.xz.sig) = 2ff778429cfff931dc9b8ebad977b83616f1e68d7653b79417403dc1237fe92a955c251c01acf4e4f17d3ef46d6b5a2c35bd5db8bea2fe954fb43a0e8fecd741
|
||||
|
|
|
|||
Loading…
Reference in New Issue