diff options
author | Bernard Cafarelli <voyageur@gentoo.org> | 2010-04-27 11:49:23 +0000 |
---|---|---|
committer | Bernard Cafarelli <voyageur@gentoo.org> | 2010-04-27 11:49:23 +0000 |
commit | 4c830f17fdf7329740ec429a2755886a10579fc3 (patch) | |
tree | c715bf72d852cf37bc1ce65281842cf70196835e /sys-devel/llvm | |
parent | bump (diff) | |
download | historical-4c830f17fdf7329740ec429a2755886a10579fc3.tar.gz historical-4c830f17fdf7329740ec429a2755886a10579fc3.tar.bz2 historical-4c830f17fdf7329740ec429a2755886a10579fc3.zip |
2.7 official release version bump
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'sys-devel/llvm')
-rw-r--r-- | sys-devel/llvm/ChangeLog | 8 | ||||
-rw-r--r-- | sys-devel/llvm/Manifest | 6 | ||||
-rw-r--r-- | sys-devel/llvm/files/llvm-2.7-nodoctargz.patch | 47 | ||||
-rw-r--r-- | sys-devel/llvm/llvm-2.7.ebuild (renamed from sys-devel/llvm/llvm-2.6-r1.ebuild) | 38 |
4 files changed, 72 insertions, 27 deletions
diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog index 2ccda0c5d967..eed93e368f02 100644 --- a/sys-devel/llvm/ChangeLog +++ b/sys-devel/llvm/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-devel/llvm # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.11 2010/04/26 13:14:11 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.12 2010/04/27 11:49:22 voyageur Exp $ + +*llvm-2.7 (27 Apr 2010) + + 27 Apr 2010; Bernard Cafarelli <voyageur@gentoo.org> -llvm-2.6-r1.ebuild, + +llvm-2.7.ebuild, +files/llvm-2.7-nodoctargz.patch: + 2.7 official release version bump 26 Apr 2010; Bernard Cafarelli <voyageur@gentoo.org> llvm-2.6-r2.ebuild: --without-udis86 is broken in configure script diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest index b322f27c7396..b578a83599c0 100644 --- a/sys-devel/llvm/Manifest +++ b/sys-devel/llvm/Manifest @@ -1,8 +1,10 @@ AUX llvm-2.6-cflags.patch 1177 RMD160 9c9061834d87357930d3ea1ef9f56a355885acb9 SHA1 4472b00a4d22b29e690e69fa0c2a365858634484 SHA256 f666995873ab6fe987229c941efb168de2bf9353115248ae37942a2d30d67182 AUX llvm-2.6-commandguide-nops.patch 975 RMD160 1178c27a8845c2c86d6d381ba3d95b4b9b627f1e SHA1 41b9d8c3ae0ed1023ec72bf629c53fa8981e0264 SHA256 0e36fb43e020fa380230a8c6f2a79b9a19e12e857e833ef856e2b41aaa283649 AUX llvm-2.6-nodoctargz.patch 1602 RMD160 b4de7f5e68386bd9dab44a6d7addae0eb9d7f958 SHA1 5a2faf5d9c52f1eb1f1eac3aa69b6d0499c093a4 SHA256 503d31616ca7c76f6da1cd46d6e7c54241effbd11652ab568759350f0c21e473 +AUX llvm-2.7-nodoctargz.patch 1878 RMD160 a6134fd292a1a2c6a594e787ce73b15012be04bb SHA1 9d32a0e15791789d8bf58dfecf9580a00d150319 SHA256 983657329ebede731b397ba0256d729b3958f39faea64c9f7d065ab8d2a3e7fd DIST llvm-2.6.tar.gz 7790380 RMD160 24d58cb052ab5879aae59eaf4885ec41186ee22a SHA1 547471147cbf6d3e49539e01196ffada2c79c250 SHA256 4cd9257350c5ff8b9b139d19497e2396c0604eef0e5d6504f5c1463b09bf2d84 -EBUILD llvm-2.6-r1.ebuild 5213 RMD160 ae3d0e9a544cc7432b79a5901de306b28b02c00d SHA1 890a614e13fe8c4343fa2e041f79ca9bf1e3b6fb SHA256 ae82cba7a32104537097644ce330e89d7725a01abe2e11b135af338044ad7b62 +DIST llvm-2.7.tgz 8374297 RMD160 0fa2f362dd6a45efec35ce8fa0f8d36d98f32c8f SHA1 059fc21b0ec1b649c4a3dec81756e5f92aa131a2 SHA256 99664bdc8503a306038166af33f28eb426d99e297575a59d74a1a0dcbddbbca5 EBUILD llvm-2.6-r2.ebuild 5352 RMD160 6db0a5d94f6899b6a980c56c0e6fe7dc9f8db92d SHA1 1e828b8a8b2895a2bd6552e33d24e8d4b70da851 SHA256 f3d5db9b82156cb56a2657a3de2aa30220bf81da9e94d4d46cb25c0d7eb02ee1 -MISC ChangeLog 2133 RMD160 088e4f37ed12973386130877897226ab652bae10 SHA1 2a7da3bc9f0c39e95b2422354d7bedbbb7321174 SHA256 406981ea2a2e229cfa625f1dec6d271baf91cd089d8845bf02bc719b19f0747c +EBUILD llvm-2.7.ebuild 4740 RMD160 f8d13e0107f1080a23006d420b86a1fd50c2cd43 SHA1 54c91594ddeb55e8ad9816d16012fbfb695255c8 SHA256 eef5d58d82e2e85079ecac4afcc31cd82d8016a0a13a5ae2c1dc1213a26221ff +MISC ChangeLog 2325 RMD160 7e825a53a16962c165298ad4fb3a222153e2a43a SHA1 c9f18f95140fe1a0fa6e1e6cb76b3e75e388d7f7 SHA256 74033c3a7692ebfff6183bc7c188a50281b6c23ecb28fbf34f0d82d791dda1fd MISC metadata.xml 2384 RMD160 9e29d256ab1d3d7cc23fe25d170a1716b6e35dba SHA1 db599887234c1013a7849be3e1b6bd399c716598 SHA256 44f73ce01ca8dc1d2fea546bb70550d6324ed893a224a6db8e55fd932b3a10f8 diff --git a/sys-devel/llvm/files/llvm-2.7-nodoctargz.patch b/sys-devel/llvm/files/llvm-2.7-nodoctargz.patch new file mode 100644 index 000000000000..cce09eb20fc8 --- /dev/null +++ b/sys-devel/llvm/files/llvm-2.7-nodoctargz.patch @@ -0,0 +1,47 @@ +--- docs/Makefile.orig 2010-04-26 15:00:58.000000000 +0200 ++++ docs/Makefile 2010-04-26 15:03:12.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) $(DESTDIR)$(PROJ_docsdir)/html + $(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/img + $(Verb) $(DataInstall) $(HTML) $(DESTDIR)$(PROJ_docsdir)/html + $(Verb) $(DataInstall) $(IMAGES) $(DESTDIR)$(PROJ_docsdir)/html/img +- $(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/html.tar.gz $(DESTDIR)$(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) $(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 +@@ -95,7 +93,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 \; +@@ -105,7 +102,6 @@ + $(Verb) $(RM) -rf $(PROJ_OBJ_DIR)/ocamldoc.tar* + $(Verb) $(TAR) cf $(PROJ_OBJ_DIR)/ocamldoc.tar ocamldoc + $(Verb) $(GZIP) $(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-2.6-r1.ebuild b/sys-devel/llvm/llvm-2.7.ebuild index 51a54ed9e3e6..0563e0c3516d 100644 --- a/sys-devel/llvm/llvm-2.6-r1.ebuild +++ b/sys-devel/llvm/llvm-2.7.ebuild @@ -1,18 +1,18 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-2.6-r1.ebuild,v 1.1 2010/03/18 19:38:22 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-2.7.ebuild,v 1.1 2010/04/27 11:49:22 voyageur Exp $ EAPI="2" inherit eutils multilib toolchain-funcs DESCRIPTION="Low Level Virtual Machine" HOMEPAGE="http://llvm.org/" -SRC_URI="http://llvm.org/releases/${PV}/${P}.tar.gz" +SRC_URI="http://llvm.org/releases/${PV}/${P}.tgz" LICENSE="UoI-NCSA" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -IUSE="alltargets debug +libffi llvm-gcc ocaml test" +IUSE="alltargets debug +libffi llvm-gcc ocaml test udis86" DEPEND="dev-lang/perl >=sys-devel/make-3.79 @@ -25,7 +25,8 @@ DEPEND="dev-lang/perl libffi? ( virtual/libffi ) llvm-gcc? ( sys-devel/llvm-gcc ) ocaml? ( dev-lang/ocaml ) - test? ( dev-util/dejagnu )" + test? ( dev-util/dejagnu ) + udis86? ( dev-libs/udis86 )" RDEPEND="dev-lang/perl" S=${WORKDIR}/${PN}-${PV/_pre*} @@ -68,30 +69,16 @@ src_prepare() { # unfortunately ./configure won't listen to --mandir and the-like, so take # care of this. einfo "Fixing install dirs" - sed -e 's,^PROJ_docsdir.*,PROJ_docsdir := $(DESTDIR)$(PROJ_prefix)/share/doc/'${PF}, \ - -e 's,^PROJ_etcdir.*,PROJ_etcdir := $(DESTDIR)/etc/llvm,' \ - -e 's,^PROJ_libdir.*,PROJ_libdir := $(DESTDIR)/usr/'$(get_libdir), \ - -i Makefile.config.in || die "sed failed" - - # this points by default to the build directory - einfo "Fixing gccld and gccas" - sed -e 's,^TOOLDIR.*,TOOLDIR=/usr/bin,' \ - -i tools/gccld/gccld.sh tools/gccas/gccas.sh || die "sed failed" + sed -e 's,^PROJ_docsdir.*,PROJ_docsdir := $(PROJ_prefix)/share/doc/'${PF}, \ + -e 's,^PROJ_etcdir.*,PROJ_etcdir := /etc/llvm,' \ + -e 's,^PROJ_libdir.*,PROJ_libdir := $(PROJ_prefix)/'$(get_libdir), \ + -i Makefile.config.in || die "Makefile.config sed failed" einfo "Fixing rpath" sed -e 's/\$(RPATH) -Wl,\$(\(ToolDir\|LibDir\))//g' -i Makefile.rules || die "sed failed" - # Fix docs installation - sed -e '/^NO_INSTALL_MANS/s/$/$(DST_MAN_DIR)tblgen.1 $(DST_MAN_DIR)llvmgcc.1 $(DST_MAN_DIR)llvmgxx.1/' \ - -i docs/CommandGuide/Makefile || die "manpages sed failed" - epatch "${FILESDIR}"/${PN}-2.6-nodoctargz.patch + epatch "${FILESDIR}"/${PN}-2.7-nodoctargz.patch epatch "${FILESDIR}"/${PN}-2.6-commandguide-nops.patch - - # Buggy test, http://llvm.org/bugs/show_bug.cgi?id=5047 - rm test/DebugInfo/2009-01-15-dbg_declare.ll - - # Do not force -O3 -fomit-frame-pointer on users - epatch "${FILESDIR}"/${PN}-2.6-cflags.patch } src_configure() { @@ -150,12 +137,15 @@ src_configure() { CONF_FLAGS="${CONF_FLAGS} --enable-bindings=none" fi + if use udis86; then + CONF_FLAGS="${CONF_FLAGS} --with-udis86" + fi CONF_FLAGS="${CONF_FLAGS} $(use_enable libffi)" econf ${CONF_FLAGS} || die "econf failed" } src_compile() { - emake VERBOSE=1 KEEP_SYMBOLS=1 || die "emake failed" + emake VERBOSE=1 KEEP_SYMBOLS=1 REQUIRES_RTTI=1 || die "emake failed" } src_install() { |