summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2009-10-07 15:16:59 +0000
committerBernard Cafarelli <voyageur@gentoo.org>2009-10-07 15:16:59 +0000
commit8e999dc845c38a01c95383255f9e56c6c3b5fca3 (patch)
treef37bc7a32e069f4f915cef20ea356eb90c524a9c /sys-devel/llvm/files
parentRe-Keywording for ppc. (diff)
downloadgentoo-2-8e999dc845c38a01c95383255f9e56c6c3b5fca3.tar.gz
gentoo-2-8e999dc845c38a01c95383255f9e56c6c3b5fca3.tar.bz2
gentoo-2-8e999dc845c38a01c95383255f9e56c6c3b5fca3.zip
Add USE flag for ocaml bindings, complete doc patch to fix ocmal doc failure, see bug #186279
(Portage version: 2.2_rc44/cvs/Linux x86_64)
Diffstat (limited to 'sys-devel/llvm/files')
-rw-r--r--sys-devel/llvm/files/llvm-2.6-nodoctargz.patch45
-rw-r--r--sys-devel/llvm/files/llvm-2.6-nohtmltargz.patch17
2 files changed, 45 insertions, 17 deletions
diff --git a/sys-devel/llvm/files/llvm-2.6-nodoctargz.patch b/sys-devel/llvm/files/llvm-2.6-nodoctargz.patch
new file mode 100644
index 000000000000..3d775e0bcce8
--- /dev/null
+++ b/sys-devel/llvm/files/llvm-2.6-nodoctargz.patch
@@ -0,0 +1,45 @@
+--- docs/Makefile.orig 2009-10-07 17:08:03.000000000 +0200
++++ docs/Makefile 2009-10-07 17:08:47.000000000 +0200
+@@ -46,13 +46,12 @@
+ # 'make generated BUILD_FOR_WEBSITE=1'
+ generated:: doxygen ocamldoc
+
+-install-html: $(PROJ_OBJ_DIR)/html.tar.gz
++install-html:
+ $(Echo) Installing HTML documentation
+ $(Verb) $(MKDIR) $(PROJ_docsdir)/html
+ $(Verb) $(MKDIR) $(PROJ_docsdir)/html/img
+ $(Verb) $(DataInstall) $(HTML) $(PROJ_docsdir)/html
+ $(Verb) $(DataInstall) $(IMAGES) $(PROJ_docsdir)/html/img
+- $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/html.tar.gz $(PROJ_docsdir)
+
+ $(PROJ_OBJ_DIR)/html.tar.gz: $(HTML)
+ $(Echo) Packaging HTML documentation
+@@ -64,12 +63,11 @@
+ install-doxygen: doxygen
+ $(Echo) Installing doxygen documentation
+ $(Verb) $(MKDIR) $(PROJ_docsdir)/html/doxygen
+- $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/doxygen.tar.gz $(PROJ_docsdir)
+ $(Verb) cd $(PROJ_OBJ_DIR)/doxygen && \
+ $(FIND) . -type f -exec \
+ $(DataInstall) {} $(PROJ_docsdir)/html/doxygen \;
+
+-doxygen: regendoc $(PROJ_OBJ_DIR)/doxygen.tar.gz
++doxygen: regendoc
+
+ regendoc:
+ $(Echo) Building doxygen documentation
+@@ -95,12 +93,11 @@
+ install-ocamldoc: ocamldoc
+ $(Echo) Installing ocamldoc documentation
+ $(Verb) $(MKDIR) $(PROJ_docsdir)/ocamldoc/html
+- $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/ocamldoc.tar.gz $(PROJ_docsdir)
+ $(Verb) cd $(PROJ_OBJ_DIR)/ocamldoc && \
+ $(FIND) . -type f -exec \
+ $(DataInstall) {} $(PROJ_docsdir)/ocamldoc/html \;
+
+-ocamldoc: regen-ocamldoc $(PROJ_OBJ_DIR)/ocamldoc.tar.gz
++ocamldoc: regen-ocamldoc
+
+ regen-ocamldoc:
+ $(Echo) Building ocamldoc documentation
diff --git a/sys-devel/llvm/files/llvm-2.6-nohtmltargz.patch b/sys-devel/llvm/files/llvm-2.6-nohtmltargz.patch
deleted file mode 100644
index 65209e6d0b95..000000000000
--- a/sys-devel/llvm/files/llvm-2.6-nohtmltargz.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- docs/Makefile.orig 2009-09-25 15:02:13.000000000 +0200
-+++ docs/Makefile 2009-09-25 15:02:47.000000000 +0200
-@@ -46,13 +46,12 @@
- # 'make generated BUILD_FOR_WEBSITE=1'
- generated:: doxygen ocamldoc
-
--install-html: $(PROJ_OBJ_DIR)/html.tar.gz
-+install-html:
- $(Echo) Installing HTML documentation
- $(Verb) $(MKDIR) $(PROJ_docsdir)/html
- $(Verb) $(MKDIR) $(PROJ_docsdir)/html/img
- $(Verb) $(DataInstall) $(HTML) $(PROJ_docsdir)/html
- $(Verb) $(DataInstall) $(IMAGES) $(PROJ_docsdir)/html/img
-- $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/html.tar.gz $(PROJ_docsdir)
-
- $(PROJ_OBJ_DIR)/html.tar.gz: $(HTML)
- $(Echo) Packaging HTML documentation