#205 Avoid recommonmark dependency in RHEL builds
Merged 12 months ago by yselkowitz. Opened a year ago by yselkowitz.
rpms/ yselkowitz/clang rawhide  into  rawhide

@@ -0,0 +1,38 @@ 

+ From f4e2d711e5cfd8e357d770e2da7a114086ee8659 Mon Sep 17 00:00:00 2001

+ From: =?UTF-8?q?Timm=20B=C3=A4der?= <tbaeder@redhat.com>

+ Date: Thu, 22 Sep 2022 10:49:43 +0200

+ Subject: disable recommonmark

+ 

+ ---

+  clang/docs/conf.py | 15 +--------------

+  1 file changed, 1 insertion(+), 14 deletions(-)

+ 

+ diff --git a/clang/docs/conf.py b/clang/docs/conf.py

+ index b8a42018191a..912449a7f792 100644

+ --- a/clang/docs/conf.py

+ +++ b/clang/docs/conf.py

+ @@ -37,20 +37,7 @@ source_suffix = {

+      '.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'

+ -- 

+ 2.37.1

+ 

file modified
+7 -1
@@ -75,6 +75,10 @@ 

  

  Patch11:    0001-Change-LLVM_COMMON_CMAKE_UTILS-usage.patch

  

+ # RHEL specific patches

+ # Avoid unwanted dependency on python-recommonmark

+ Patch101:  0009-disable-recommonmark.patch

+ 

  %if %{without compat_build}

  # Patches for clang-tools-extra

  # See https://reviews.llvm.org/D120301
@@ -107,7 +111,9 @@ 

  BuildRequires:	python3-lit

  

  BuildRequires:	python3-sphinx

+ %if %{undefined rhel}

  BuildRequires:	python3-recommonmark

+ %endif

  BuildRequires:	libatomic

  

  # We need python3-devel for %%py3_shebang_fix
@@ -276,7 +282,7 @@ 

  	clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py

  

  %setup -q -n %{clang_srcdir}

- %autopatch -M200 -p2

+ %autopatch -M%{?!rhel:100}%{?rhel:200} -p2

  

  # failing test case

  rm test/CodeGen/profile-filter.c

python-recommonmark and its dependencies are unwanted in RHEL. This is based on changes already in c9s.

ELN scratch build: https://koji.fedoraproject.org/koji/taskinfo?taskID=100990299

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/3e30d9e17aa849eca82b8cdd0de33909

The tests failed because llvm-16.0.3 didn't reach stable yet.
We need to re-run the tests after https://bodhi.fedoraproject.org/updates/FEDORA-2023-c1473b46dd becomes available in the repo.

rebased onto 738cdd238a9169235c23c8ddaab688357a4c2932

a year ago

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/a823e78a48c54dd99700079c8ee08db4

Why are you using the fedora spec file for a rhel build and not the centos spec flie?

CI test builds have now succeeded, per the above comment. Can this be merged now so that we can include it in the ELN rebuild of 16.0.3?

I'm working on preparing for the next version of RHEL. Rawhide feeds into ELN, from which CentOS Stream 10 will be branched, which itself becomes the source of RHEL 10. This is needed to drop a bunch of unwanted dependencies from ELN (and hence CS/RHEL 10 when they branch), but does not affect the Fedora builds.

rebased onto e13d80c7cc6ffdfa181abd16f4c1c410387a6d07

a year ago

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/09d6a2ff74fe41dbbaf93352ca91c92c

Patch LGTM too.
The failure happened because it needs a rebase.
I plan to do this and merge this PR as soon as I complete building the v16.0.4 packages for rawhide.

rebased onto b534a5d

12 months ago

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/0293dcba04c44462a6c61f947abbe8d5

Pull-Request has been merged by yselkowitz

12 months ago
Metadata