From f3a2e7525ff29d76845066dc5927a9cab368f5f0 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sun, 6 Feb 2022 02:05:04 +0800 Subject: [PATCH 1/3] Remove dependency on python3-recommonmark (like RHEL9 llvm) --- 0001-Deactivate-markdown-doc.patch | 25 +++++++++++++++++++++++++ llvm11.spec | 10 +++++++++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 0001-Deactivate-markdown-doc.patch diff --git a/0001-Deactivate-markdown-doc.patch b/0001-Deactivate-markdown-doc.patch new file mode 100644 index 0000000..92e048d --- /dev/null +++ b/0001-Deactivate-markdown-doc.patch @@ -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' diff --git a/llvm11.spec b/llvm11.spec index 2b65038..327f4b6 100644 --- a/llvm11.spec +++ b/llvm11.spec @@ -11,7 +11,7 @@ %global llvm_libdir %{_libdir}/%{name} %global build_llvm_libdir %{buildroot}%{llvm_libdir} #global rc_ver 2 -%global baserelease 5 +%global baserelease 6 %global llvm_srcdir llvm-%{version}%{?rc_ver:rc%{rc_ver}}.src %global maj_ver 11 %global min_ver 1 @@ -64,6 +64,9 @@ Patch2: 0001-gcc11.patch Patch3: 0001-SystemZ-Assign-the-full-space-for-promoted-and-split.patch Patch4: 0001-MemCpyOpt-Correctly-merge-alias-scopes-during-call-s.patch +# RHEL-specific patches +Patch101: 0001-Deactivate-markdown-doc.patch + BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: cmake @@ -72,7 +75,9 @@ BuildRequires: zlib-devel BuildRequires: libffi-devel BuildRequires: ncurses-devel BuildRequires: python3-sphinx +%if !0%{?rhel} BuildRequires: python3-recommonmark +%endif BuildRequires: multilib-rpm-config %if %{with gold} BuildRequires: binutils-devel @@ -559,6 +564,9 @@ fi %endif %changelog +* Sun Feb 6 2022 Jens Petersen - 11.1.0-6 +- Remove dependency on python3-recommonmark (like RHEL9 llvm) + * Wed May 19 2021 sguelton@redhat.com - 11.1.0-5 - Fix handling of llvm-config From 24c83de862c8ea5ddd979793134eea77f99fe5dc Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 26 Feb 2022 22:49:31 +0800 Subject: [PATCH 2/3] s390x: disable 2 llvm-objcopy/ELF/compress-debug-sections-zlib tests --- llvm11.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/llvm11.spec b/llvm11.spec index 327f4b6..2c2ce45 100644 --- a/llvm11.spec +++ b/llvm11.spec @@ -189,6 +189,12 @@ LLVM's modified googletest sources. %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %autosetup -n %{llvm_srcdir} -p2 +%ifarch s390x +# 2 tests failing: +mv test/tools/llvm-objcopy/ELF/compress-debug-sections-zlib.test{,.DISABLED} +mv test/tools/llvm-objcopy/ELF/compress-debug-sections-zlib-gnu.test{,.DISABLED} +%endif + pathfix.py -i %{__python3} -pn \ test/BugPoint/compile-custom.ll.py \ tools/opt-viewer/*.py \ From 0be2bf1a85d56a2da8d6593563e5a8dd5040c2f7 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 28 Feb 2022 16:53:00 +0800 Subject: [PATCH 3/3] add missed changelog entry for s390x testsuite --- llvm11.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/llvm11.spec b/llvm11.spec index 2c2ce45..2efa3ce 100644 --- a/llvm11.spec +++ b/llvm11.spec @@ -572,6 +572,7 @@ fi %changelog * Sun Feb 6 2022 Jens Petersen - 11.1.0-6 - Remove dependency on python3-recommonmark (like RHEL9 llvm) +- s390x: disable 2 llvm-objcopy/ELF/compress-debug-sections-zlib tests * Wed May 19 2021 sguelton@redhat.com - 11.1.0-5 - Fix handling of llvm-config