[packages/hotdoc] llvm runtime deps for c extension; rel 2

atler atler at pld-linux.org
Thu Feb 17 10:11:20 CET 2022


commit f03e9b24ba78aafdf22eb3f4fb6c32ebb7628226
Author: Jan Palus <atler at pld-linux.org>
Date:   Thu Feb 17 10:09:20 2022 +0100

    llvm runtime deps for c extension; rel 2

 clang_libdir.patch | 16 ++++++++++++++++
 hotdoc.spec        |  8 +++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)
---
diff --git a/hotdoc.spec b/hotdoc.spec
index fac227d..d3cd6b5 100644
--- a/hotdoc.spec
+++ b/hotdoc.spec
@@ -8,7 +8,7 @@ Summary:	A documentation tool micro-framework
 Summary(pl.UTF-8):	Mikroszkielet narzędzia do tworzenia dokumentacji
 Name:		hotdoc
 Version:	0.13.3
-Release:	1
+Release:	2
 License:	LGPL v2.1+
 Group:		Development/Tools
 #Source0Download: https://github.com/hotdoc/hotdoc/releases
@@ -24,6 +24,7 @@ Source3:	https://github.com/hotdoc/hotdoc_bootstrap_theme/archive/89e04ee/hotdoc
 Source4:	hotdoc-%{version}-hotdoc_bootstrap_theme-dist.tar.xz
 # Source4-md5:	d7907f232dbdc910457a20d445609165
 Patch0:		%{name}-setup.patch
+Patch1:		clang_libdir.patch
 URL:		https://hotdoc.github.io/
 BuildRequires:	cmake >= 2.8.9
 BuildRequires:	flex
@@ -47,6 +48,10 @@ BuildRequires:	python3-pkgconfig
 BuildRequires:	python3-schema
 BuildRequires:	python3-toposort >= 1.4
 BuildRequires:	python3-wheezy.template
+# libclang.so dlopen in c extension
+Requires:	clang-devel
+# llvm-config in c extension
+Requires:	llvm-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -62,6 +67,7 @@ itp.).
 %prep
 %setup -q -a1 -a2 -a3
 %patch0 -p1
+%patch1 -p1
 
 %{__mv} cmark-*/* cmark
 %{__mv} prism-*/* hotdoc/extensions/syntax_highlighting/prism
diff --git a/clang_libdir.patch b/clang_libdir.patch
new file mode 100644
index 0000000..9c8598f
--- /dev/null
+++ b/clang_libdir.patch
@@ -0,0 +1,16 @@
+--- hotdoc-0.13.3/hotdoc/extensions/c/c_extension.py.orig	2021-03-08 15:49:16.000000000 +0100
++++ hotdoc-0.13.3/hotdoc/extensions/c/c_extension.py	2022-02-17 10:03:43.620343184 +0100
+@@ -78,10 +78,9 @@
+     version = subprocess.check_output(['llvm-config', '--version']).strip().decode()
+     prefix = subprocess.check_output(['llvm-config', '--prefix']).strip().decode()
+ 
+-    for lib in ['lib', 'lib64']:
+-        p = os.path.join(prefix, lib, 'clang', version, 'include')
+-        if os.path.exists(p):
+-            return p
++    p = os.path.join(get_clang_libdir(), 'clang', version, 'include')
++    if os.path.exists(p):
++        return p
+ 
+     warn('clang-headers-not-found', CLANG_HEADERS_WARNING)
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/hotdoc.git/commitdiff/f03e9b24ba78aafdf22eb3f4fb6c32ebb7628226



More information about the pld-cvs-commit mailing list