commit d706a70da5c1ad6aa6f6c858ebe9fb803500f118
Author: Jakub Bogusz <qbo...@pld-linux.org>
Date: Thu Oct 13 16:23:38 2016 +0200
- added ocaml-shared patch (build ocaml shared libs regardless of
BUILD_SHARED_LIBS setting
- updated files
llvm-ocaml-shared.patch | 26 ++++++++++++++++++++++++++
llvm.spec | 40 +++++++++++++++++++++++++++++-----------
2 files changed, 55 insertions(+), 11 deletions(-)
---
diff --git a/llvm.spec b/llvm.spec
index 8035a87..1ff5596 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -47,10 +47,11 @@ Patch1: %{name}-pld.patch
Patch2: libdir.patch
Patch3: x32-gcc-toolchain.patch
Patch4: cmake-buildtype.patch
+Patch5: %{name}-ocaml-shared.patch
URL: http://llvm.org/
BuildRequires: bash
BuildRequires: bison
-BuildRequires: cmake
+BuildRequires: cmake >= 2.8.8
BuildRequires: flex
BuildRequires: gcc >= 5:3.4
# gcc4 might be installed, but not current __cc
@@ -411,6 +412,7 @@ Summary(pl.UTF-8): Wydajny debugger nowej generacji
Group: Development/Debuggers
URL: http://lldb.llvm.org/
Requires: %{name} = %{version}-%{release}
+Requires: python-six
%description -n lldb
LLDB is a next generation, high-performance debugger. It is built as a
@@ -481,18 +483,19 @@ Dokumentacja HTML wiązania OCamla do LLVM-a.
%prep
%setup -q -n %{name}-%{version}.src -a1 %{?with_rt:-a2} %{?with_lldb:-a3}
%{?with_polly:-a4} -a5 -a6
-mv cfe-%{version}.src tools/clang
+%{__mv} cfe-%{version}.src tools/clang
%{?with_rt:mv compiler-rt-%{version}.src projects/compiler-rt}
%{?with_lldb:mv lldb-%{version}.src tools/lldb}
%{?with_polly:mv polly-%{version}.src tools/polly}
-mv clang-tools-extra-%{version}.src tools/clang/tools/extra
-mv lld-%{version}.src tools/lld
+%{__mv} clang-tools-extra-%{version}.src tools/clang/tools/extra
+%{__mv} lld-%{version}.src tools/lld
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
grep -rl /usr/bin/env tools utils | xargs sed -i -e '1{
s,^#!.*bin/env python,#!%{__python},
@@ -605,9 +608,11 @@ done
# Get rid of erroneously installed example files.
%{__rm} $RPM_BUILD_ROOT%{_libdir}/LLVMHello.so
# test?
-%{__rm} $RPM_BUILD_ROOT%{_bindir}/llvm-c-test
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/{c-index-test,llvm-c-test}
# not this OS
%{__rm} $RPM_BUILD_ROOT%{_datadir}/clang/clang-format-bbedit.applescript
+# use system six
+%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/six.py*
%clean
rm -rf $RPM_BUILD_ROOT
@@ -618,9 +623,6 @@ rm -rf $RPM_BUILD_ROOT
%post -n clang -p /sbin/ldconfig
%postun -n clang -p /sbin/ldconfig
-%post -n clang-tools-extra -p /sbin/ldconfig
-%postun -n clang-tools-extra -p /sbin/ldconfig
-
%post -n lldb -p /sbin/ldconfig
%postun -n lldb -p /sbin/ldconfig
@@ -658,6 +660,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/llvm-pdbdump
%attr(755,root,root) %{_bindir}/obj2yaml
%attr(755,root,root) %{_bindir}/opt
+%attr(755,root,root) %{_bindir}/sancov
%attr(755,root,root) %{_bindir}/verify-uselistorder
%attr(755,root,root) %{_bindir}/yaml2obj
%if %{with doc}
@@ -673,6 +676,7 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/llvm-dis.1*
%{_mandir}/man1/llvm-dwarfdump.1*
%{_mandir}/man1/llvm-extract.1*
+%{_mandir}/man1/llvm-lib.1*
%{_mandir}/man1/llvm-link.1*
%{_mandir}/man1/llvm-nm.1*
%{_mandir}/man1/llvm-profdata.1*
@@ -696,6 +700,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/llvm-config
%attr(755,root,root) %{_libdir}/libLLVM.so
%attr(755,root,root) %{_libdir}/BugpointPasses.so
+%{_libdir}/libLLVM*.a
%{_includedir}/llvm
%{_includedir}/llvm-c
%dir %{_datadir}/llvm
@@ -741,7 +746,6 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/clang/%{version}/include
%if %{with rt}
%ifarch %{ix86} %{x8664}
-%{_libdir}/clang/%{version}/asan_blacklist.txt
%dir %{_libdir}/clang/%{version}/lib
%dir %{_libdir}/clang/%{version}/lib/linux
%endif
@@ -750,12 +754,20 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root)
%{_libdir}/clang/%{version}/lib/linux/libclang_rt.*-i*86.so
%endif
%ifarch %{x8664}
-%{_libdir}/clang/%{version}/dfsan_abilist.txt
-%{_libdir}/clang/%{version}/msan_blacklist.txt
%{_libdir}/clang/%{version}/lib/linux/libclang_rt.*-x86_64.a
%attr(755,root,root)
%{_libdir}/clang/%{version}/lib/linux/libclang_rt.*-x86_64.so
%{_libdir}/clang/%{version}/lib/linux/libclang_rt.*-x86_64.a.syms
%endif
+%ifarch %{ix86} %{x8664} %{arm} aarch64 mips mips64 ppc64
+%{_libdir}/clang/%{version}/asan_blacklist.txt
+%endif
+%ifarch %{ix86} %{x8664} mips64
+%{_libdir}/clang/%{version}/cfi_blacklist.txt
+%endif
+%ifarch %{x8664} aarch64 mips64
+%{_libdir}/clang/%{version}/dfsan_abilist.txt
+%{_libdir}/clang/%{version}/msan_blacklist.txt
+%endif
%endif
%dir %{_datadir}/clang
%{_datadir}/clang/clang-format-diff.py
@@ -790,6 +802,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libclang*.a
%{_includedir}/clang
%{_includedir}/clang-c
+%{_datadir}/clang/cmake
%files -n clang-doc
%defattr(644,root,root,755)
@@ -808,12 +821,17 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/clang-query
%attr(755,root,root) %{_bindir}/clang-rename
%attr(755,root,root) %{_bindir}/clang-tidy
+%attr(755,root,root) %{_bindir}/modularize
%attr(755,root,root) %{_bindir}/pp-trace
+%{_datadir}/clang/clang-tidy-diff.py
+%{_datadir}/clang/run-clang-tidy.py
%files -n lld
%defattr(644,root,root,755)
%doc tools/lld/{LICENSE.TXT,README.md}
+%attr(755,root,root) %{_bindir}/ld.lld
%attr(755,root,root) %{_bindir}/lld
+%attr(755,root,root) %{_bindir}/lld-link
%files -n lld-devel
%defattr(644,root,root,755)
diff --git a/llvm-ocaml-shared.patch b/llvm-ocaml-shared.patch
new file mode 100644
index 0000000..0ab5cac
--- /dev/null
+++ b/llvm-ocaml-shared.patch
@@ -0,0 +1,26 @@
+--- llvm-3.8.1.src/cmake/modules/AddOCaml.cmake.orig 2016-10-11
22:03:29.695199936 +0200
++++ llvm-3.8.1.src/cmake/modules/AddOCaml.cmake 2016-10-12
20:14:25.327621462 +0200
+@@ -37,11 +37,13 @@
+
+ set(ocaml_inputs)
+
++ option(OCAML_BUILD_SHARED_LIBS "Build ocaml shared libraries" ON)
++
+ set(ocaml_outputs "${bin}/${name}.cma")
+ if( ARG_C )
+ list(APPEND ocaml_outputs
+ "${bin}/lib${name}${CMAKE_STATIC_LIBRARY_SUFFIX}")
+- if ( BUILD_SHARED_LIBS )
++ if ( OCAML_BUILD_SHARED_LIBS )
+ list(APPEND ocaml_outputs
+ "${bin}/dll${name}${CMAKE_SHARED_LIBRARY_SUFFIX}")
+ endif()
+@@ -62,7 +64,7 @@
+ list(APPEND ocaml_flags ${dep_ocaml_flags})
+ endforeach()
+
+- if( NOT BUILD_SHARED_LIBS )
++ if( NOT OCAML_BUILD_SHARED_LIBS )
+ list(APPEND ocaml_flags "-custom")
+ endif()
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/llvm.git/commitdiff/d706a70da5c1ad6aa6f6c858ebe9fb803500f118
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
