[packages/llvm] - added use-ocamlfind-for-ocamldoc patch from llvm bts - BR: ocaml-ctypes-devel - updated files

Sat Mar 21 15:47:19 CET 2015

commit 4ba3b2b350da5288478015115fc33da43e1da4f9
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Mar 21 15:48:54 2015 +0100

    - added use-ocamlfind-for-ocamldoc patch from llvm bts
    - BR: ocaml-ctypes-devel
    - updated files

 llvm-use-ocamlfind-for-ocamldoc.patch | 30 ++++++++++++++++++++++++++++++
 llvm.spec                             | 21 ++++++++++++++++-----
 2 files changed, 46 insertions(+), 5 deletions(-)
---

diff --git a/llvm.spec b/llvm.spec
index 2cf02cd..3742134 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -8,8 +8,8 @@
 %bcond_with	apidocs	# doxygen docs (HUGE, so they are not built by default)
 %bcond_with	tests	# run tests
 
-%ifarch s390 s390x sparc64 x32
-# No ocaml on these arches or no native ocaml (required for ocaml-ctypes)
+# No ocaml on other arches or no native ocaml (required for ocaml-ctypes)
+%ifnarch %{ix86} %{x8664} arm aarch64 ppc sparc sparcv9 
 %undefine	with_ocaml
 %endif
 
@@ -39,6 +39,7 @@ Patch0:		%{name}-config.patch
 # Data files should be installed with timestamps preserved
 Patch1:		%{name}-2.6-timestamp.patch
 Patch2:		%{name}-pld.patch
+Patch3:		%{name}-use-ocamlfind-for-ocamldoc.patch
 Patch4:		%{name}-lldb.patch
 Patch5:		%{name}-lldb-atomic.patch
 Patch6:		%{name}-lld-link.patch
@@ -61,7 +62,7 @@ BuildRequires:	libltdl-devel
 BuildRequires:	libtool >= 2:1.5.22
 BuildRequires:	libstdc++-devel >= 5:3.4
 %if %{with ocaml}
-BuildRequires:	ocaml-ctypes
+BuildRequires:	ocaml-ctypes-devel
 BuildRequires:	ocaml-findlib
 BuildRequires:	ocaml-ocamldoc
 BuildRequires:	ocaml-ounit
@@ -423,6 +424,7 @@ mv lld-%{version}.src tools/lld
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 %if %{with lldb}
 %patch4 -p1
 %ifarch i386 i486
@@ -511,6 +513,7 @@ cd ..
 rm -rf $RPM_BUILD_ROOT
 %{__make} -C obj -j1 install \
 	PROJ_docsdir=/moredocs \
+	VERBOSE=1 \
 	DESTDIR=$RPM_BUILD_ROOT
 
 # Static analyzer not installed by default:
@@ -525,6 +528,8 @@ done
 %py_comp $RPM_BUILD_ROOT%{_libdir}/clang-analyzer/scan-view
 %py_ocomp $RPM_BUILD_ROOT%{_libdir}/clang-analyzer/scan-view
 %py_postclean %{_libdir}/clang-analyzer/scan-view
+# not this OS
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/clang-analyzer/scan-build/*.bat
 
 %if %{with doc}
 install -d $RPM_BUILD_ROOT%{_mandir}/man1
@@ -594,6 +599,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/llvm-cov
 %attr(755,root,root) %{_bindir}/llvm-diff
 %attr(755,root,root) %{_bindir}/llvm-dis
+%attr(755,root,root) %{_bindir}/llvm-dsymutil
 %attr(755,root,root) %{_bindir}/llvm-dwarfdump
 %attr(755,root,root) %{_bindir}/llvm-extract
 %attr(755,root,root) %{_bindir}/llvm-link
@@ -609,8 +615,12 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/llvm-stress
 %attr(755,root,root) %{_bindir}/llvm-symbolizer
 %attr(755,root,root) %{_bindir}/llvm-tblgen
+%attr(755,root,root) %{_bindir}/llvm-vtabledump
 %attr(755,root,root) %{_bindir}/macho-dump
+%attr(755,root,root) %{_bindir}/obj2yaml
 %attr(755,root,root) %{_bindir}/opt
+%attr(755,root,root) %{_bindir}/verify-uselistorder
+%attr(755,root,root) %{_bindir}/yaml2obj
 %if %{with doc}
 %{_mandir}/man1/bugpoint.1*
 %{_mandir}/man1/lit.1*
@@ -638,7 +648,7 @@ rm -rf $RPM_BUILD_ROOT
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libLLVM-%{version}.so
-%attr(755,root,root) %{_libdir}/libLLVM-3.5.so
+%attr(755,root,root) %{_libdir}/libLLVM-3.6.so
 
 %files devel
 %defattr(644,root,root,755)
@@ -736,6 +746,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/clang-apply-replacements
 %attr(755,root,root) %{_bindir}/clang-modernize
 %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}/pp-trace
 %{_libdir}/libmodernizeCore.a
@@ -747,6 +758,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n lld-devel
 %defattr(644,root,root,755)
+%{_libdir}/liblldConfig.a
 %{_libdir}/liblldCore.a
 %{_libdir}/liblldDriver.a
 %{_libdir}/liblldELF.a
@@ -787,7 +799,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files ocaml-devel
 %defattr(644,root,root,755)
-%{_libdir}/libllvm*.a
 %{_libdir}/ocaml/libLLVM*.a
 %{_libdir}/ocaml/libllvm*.a
 %{_libdir}/ocaml/llvm*.a
diff --git a/llvm-use-ocamlfind-for-ocamldoc.patch b/llvm-use-ocamlfind-for-ocamldoc.patch
new file mode 100644
index 0000000..8a838c3
--- /dev/null
+++ b/llvm-use-ocamlfind-for-ocamldoc.patch
@@ -0,0 +1,30 @@
+diff -upr llvm-3.6.0.src.orig/docs/Makefile llvm-3.6.0.src/docs/Makefile
+--- llvm-3.6.0.src.orig/docs/Makefile	2014-10-29 00:45:25.000000000 +0200
++++ llvm-3.6.0.src/docs/Makefile	2015-02-28 10:12:35.647351241 +0200
+@@ -41,7 +41,7 @@ install_targets := install-html
+ ifeq ($(ENABLE_DOXYGEN),1)
+ install_targets += install-doxygen
+ endif
+-ifdef OCAMLDOC
++ifdef OCAMLFIND
+ ifneq (,$(filter ocaml,$(BINDINGS_TO_BUILD)))
+ install_targets += install-ocamldoc
+ endif
+@@ -49,7 +49,7 @@ endif
+ install-local:: $(install_targets)
+ 
+ generated_targets := doxygen
+-ifdef OCAMLDOC
++ifdef OCAMLFIND
+ generated_targets += ocamldoc
+ endif
+ 
+@@ -120,7 +120,7 @@ regen-ocamldoc:
+ 	$(Verb) $(MAKE) -C $(LEVEL)/bindings/ocaml ocamldoc
+ 	$(Verb) $(MKDIR) $(PROJ_OBJ_DIR)/ocamldoc/html
+ 	$(Verb) \
+-		$(OCAMLDOC) -d $(PROJ_OBJ_DIR)/ocamldoc/html -sort -colorize-code -html \
++		$(OCAMLFIND) ocamldoc -d $(PROJ_OBJ_DIR)/ocamldoc/html -sort -colorize-code -html \
+ 		`$(FIND) $(LEVEL)/bindings/ocaml -name "*.odoc" \
+ 		         -path "*/$(BuildMode)/*.odoc" -exec echo -load '{}' ';'`
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/llvm.git/commitdiff/4ba3b2b350da5288478015115fc33da43e1da4f9

