diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2012-04-30 15:19:44 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2012-04-30 15:19:44 +0000 |
| commit | 3542a03704a82cea222c0f46d8f81621f4bf9464 (patch) | |
| tree | 8c3f25b7a951240ad6a9c154e7a372055626152e /sys-devel | |
| parent | Install everything in client/lib. Remove sed script by Greg Watson (bug 190584). (diff) | |
| download | gentoo-2-3542a03704a82cea222c0f46d8f81621f4bf9464.tar.gz gentoo-2-3542a03704a82cea222c0f46d8f81621f4bf9464.tar.bz2 gentoo-2-3542a03704a82cea222c0f46d8f81621f4bf9464.zip | |
Fix nodoctargz patch for latest source, bug #413111
(Portage version: 2.2.01.20430-prefix/cvs/Darwin i386)
Diffstat (limited to 'sys-devel')
| -rw-r--r-- | sys-devel/llvm/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-devel/llvm/files/llvm-3.2-nodoctargz.patch | 45 | ||||
| -rw-r--r-- | sys-devel/llvm/llvm-9999.ebuild | 4 |
3 files changed, 52 insertions, 3 deletions
diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog index f75e5e8e1f2a..c493f5aed0b9 100644 --- a/sys-devel/llvm/ChangeLog +++ b/sys-devel/llvm/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-devel/llvm # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.68 2012/04/30 15:09:25 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.69 2012/04/30 15:19:44 grobian Exp $ + + 30 Apr 2012; Fabian Groffen <grobian@gentoo.org> + +files/llvm-3.2-nodoctargz.patch, llvm-9999.ebuild: + Fix nodoctargz patch for latest source, bug #413111 30 Apr 2012; Fabian Groffen <grobian@gentoo.org> llvm-9999.ebuild: Extract the version LLVM refers to internally so we can properly fix diff --git a/sys-devel/llvm/files/llvm-3.2-nodoctargz.patch b/sys-devel/llvm/files/llvm-3.2-nodoctargz.patch new file mode 100644 index 000000000000..3a622b53daa9 --- /dev/null +++ b/sys-devel/llvm/files/llvm-3.2-nodoctargz.patch @@ -0,0 +1,45 @@ +--- docs/Makefile.orig 2012-04-30 17:00:01.000000000 +0200 ++++ docs/Makefile 2012-04-30 17:15:52.000000000 +0200 +@@ -52,11 +52,10 @@ + # 'make generated BUILD_FOR_WEBSITE=1' + generated:: $(generated_targets) + +-install-html: $(PROJ_OBJ_DIR)/html.tar.gz ++install-html: + $(Echo) Installing HTML documentation + $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html + $(Verb) $(DataInstall) $(HTML) $(DESTDIR)$(PROJ_docsdir)/html +- $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/html.tar.gz $(DESTDIR)$(PROJ_docsdir) + + $(PROJ_OBJ_DIR)/html.tar.gz: $(HTML) + $(Echo) Packaging HTML documentation +@@ -68,12 +67,11 @@ + install-doxygen: doxygen + $(Echo) Installing doxygen documentation + $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/doxygen +- $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/doxygen.tar.gz $(DESTDIR)$(PROJ_docsdir) + $(Verb) cd $(PROJ_OBJ_DIR)/doxygen && \ + $(FIND) . -type f -exec \ + $(DataInstall) {} $(DESTDIR)$(PROJ_docsdir)/html/doxygen \; + +-doxygen: regendoc $(PROJ_OBJ_DIR)/doxygen.tar.gz ++doxygen: regendoc + + regendoc: + $(Echo) Building doxygen documentation +@@ -99,7 +97,6 @@ + install-ocamldoc: ocamldoc + $(Echo) Installing ocamldoc documentation + $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/ocamldoc/html +- $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/ocamldoc.tar.gz $(DESTDIR)$(PROJ_docsdir) + $(Verb) cd $(PROJ_OBJ_DIR)/ocamldoc && \ + $(FIND) . -type f -exec \ + $(DataInstall) {} $(DESTDIR)$(PROJ_docsdir)/ocamldoc/html \; +@@ -109,7 +106,6 @@ + $(Verb) $(RM) -rf $(PROJ_OBJ_DIR)/ocamldoc.tar* + $(Verb) $(TAR) cf $(PROJ_OBJ_DIR)/ocamldoc.tar ocamldoc + $(Verb) $(GZIPBIN) $(PROJ_OBJ_DIR)/ocamldoc.tar +- $(Verb) $(CP) $(PROJ_OBJ_DIR)/ocamldoc.tar.gz $(PROJ_OBJ_DIR)/ocamldoc/html/ + + regen-ocamldoc: + $(Echo) Building ocamldoc documentation diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild index 714564b5706f..6f9358bf99ef 100644 --- a/sys-devel/llvm/llvm-9999.ebuild +++ b/sys-devel/llvm/llvm-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.24 2012/04/30 15:09:25 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.25 2012/04/30 15:19:44 grobian Exp $ EAPI="4" PYTHON_DEPEND="2" @@ -94,7 +94,7 @@ src_prepare() { python_convert_shebangs -r 2 test/Scripts epatch "${FILESDIR}"/${PN}-2.6-commandguide-nops.patch - epatch "${FILESDIR}"/${PN}-2.9-nodoctargz.patch + epatch "${FILESDIR}"/${PN}-3.2-nodoctargz.patch epatch "${FILESDIR}"/${PN}-3.0-PPC_macro.patch # User patches |