Skip to content

Commit 30b9621

Browse files
author
Matti Kosola
committed
Merge branch 'jb51574' into 'master'
Split llvm and clang libs to separate packages See merge request mer-core/llvm!13
2 parents 0096e7e + 43d6253 commit 30b9621

File tree

2 files changed

+25
-5
lines changed

2 files changed

+25
-5
lines changed

rpm/clang.spec

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ Requires: libstdc++-devel
6363
Requires: gcc-c++
6464

6565
Provides: clang(major) = %{maj_ver}
66+
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
6667

6768
%description
6869
clang: noun
@@ -74,11 +75,17 @@ The goal of the Clang project is to create a new C, C++, Objective C
7475
and Objective C++ front-end for the LLVM compiler. Its tools are built
7576
as libraries and designed to be loosely-coupled and extensible.
7677

78+
%package libs
79+
Summary: Runtime library for clang
80+
81+
%description libs
82+
Runtime library for clang.
83+
7784
%package devel
78-
Summary: Development header files for clang
79-
Requires: %{name}%{?_isa} = %{version}-%{release}
85+
Summary: Development header files for clang
86+
Requires: %{name}%{?_isa} = %{version}-%{release}
8087
# The clang CMake files reference tools from clang-tools-extra.
81-
Requires: %{name}-tools-extra%{?_isa} = %{version}-%{release}
88+
Requires: %{name}-tools-extra%{?_isa} = %{version}-%{release}
8289

8390
%description devel
8491
Development header files for clang.
@@ -198,6 +205,9 @@ popd
198205
%files
199206
%license clang/LICENSE.TXT
200207
%{clang_binaries}
208+
209+
%files libs
210+
%license clang/LICENSE.TXT
201211
%{_libdir}/clang/
202212
%{_libdir}/*.so.*
203213

rpm/llvm.spec

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ Requires(post): /sbin/ldconfig
2626
Requires(postun): /sbin/ldconfig
2727
BuildRequires: cmake, ninja
2828
BuildRequires: gcc, python3-base
29+
Requires: %{name}-libs = %{version}-%{release}
2930

3031
%description
3132
LLVM is a compiler infrastructure designed for compile-time, link-time, runtime,
@@ -37,10 +38,16 @@ languages is in development. The compiler infrastructure
3738
includes mirror sets of programming tools as well as libraries with equivalent
3839
functionality.
3940

41+
%package libs
42+
Summary: LLVM shared libraries
43+
44+
%description libs
45+
Shared libraries for the LLVM compiler infrastructure.
46+
4047
%package devel
4148
Summary: Libraries and Header Files for LLVM
4249
Group: Development/Tools
43-
Requires: %{name} = %{version}
50+
Requires: %{name} = %{version}-%{release}
4451

4552
%description devel
4653
LLVM Header files
@@ -104,9 +111,12 @@ popd
104111
%defattr(-, root, root)
105112
%license llvm/LICENSE.TXT
106113
%{_bindir}/*
114+
%{_datadir}/opt-viewer
115+
116+
%files libs
117+
%license llvm/LICENSE.TXT
107118
%{_libdir}/*.so.*
108119
%{_libdir}/libLLVM-*.so
109-
%{_datadir}/opt-viewer
110120

111121
%files devel
112122
%defattr(-, root, root)

0 commit comments

Comments
 (0)