commit 589b92f5c6bc0d6556f97ec385de86bc87c5b4d0
Author: Jakub Bogusz <[email protected]>
Date: Sat Nov 28 12:32:19 2015 +0100
- added BRs (and bcond) for multilib clang rt
llvm.spec | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
---
diff --git a/llvm.spec b/llvm.spec
index 9618fe3..f4df28b 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -6,13 +6,14 @@
# - no content in doc package (it used to contain parts of clang apidocs and
some examples)
#
# Conditional build:
-%bcond_without lldb # LLDB debugger
-%bcond_without polly # Polly cache-locality optimization, auto-parallelism
and vectorization
-%bcond_without rt # compiler-rt libraries
-%bcond_without ocaml # OCaml binding
-%bcond_without doc # HTML docs and man pages
-%bcond_with apidocs # doxygen docs (HUGE, so they are not built by default)
-%bcond_with tests # run tests
+%bcond_without lldb # LLDB debugger
+%bcond_without polly # Polly cache-locality optimization,
auto-parallelism and vectorization
+%bcond_without rt # compiler-rt libraries
+%bcond_without multilib # compiler-rt multilib libraries
+%bcond_without ocaml # OCaml binding
+%bcond_without doc # HTML docs and man pages
+%bcond_with apidocs # doxygen docs (HUGE, so they are not built by
default)
+%bcond_with tests # run tests
# No ocaml on other arches or no native ocaml (required for ocaml-ctypes)
%ifnarch %{ix86} %{x8664} arm aarch64 ppc sparc sparcv9
@@ -83,6 +84,12 @@ BuildRequires: dejagnu
BuildRequires: python
BuildRequires: tcl-devel
%endif
+%if %{with rt} && %{with multilib}
+%ifarch %{x8664}
+BuildRequires: gcc-c++-multilib-32
+BuildRequires: libstdc++-multilib-32-devel
+%endif
+%endif
%if %{with lldb}
BuildRequires: epydoc
%ifarch i386 i486
@@ -758,7 +765,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/libclang[A-Z]*.so.%{version}
%attr(755,root,root) %ghost %{_libdir}/libclang[A-Z]*.so.3.7
-%if %{with rt}
+%if %{with rt} && %{with multilib}
%ifarch %{x8664}
%files -n clang-multilib
%defattr(644,root,root,755)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/llvm.git/commitdiff/589b92f5c6bc0d6556f97ec385de86bc87c5b4d0
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
