diff options
| -rw-r--r-- | sys-devel/clang/Manifest | 14 | ||||
| -rw-r--r-- | sys-devel/llvm/ChangeLog | 9 | ||||
| -rw-r--r-- | sys-devel/llvm/Manifest | 12 | ||||
| -rw-r--r-- | sys-devel/llvm/llvm-3.0_rc1.ebuild | 155 | ||||
| -rw-r--r-- | sys-devel/llvm/llvm-9999.ebuild | 32 |
5 files changed, 181 insertions, 41 deletions
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest index b04a920aae75..b1fb452d4bc7 100644 --- a/sys-devel/clang/Manifest +++ b/sys-devel/clang/Manifest @@ -7,19 +7,23 @@ AUX clang-2.8-darwin-prefix.patch 4989 RMD160 e2c863f62b6f9ef3b26b9b2a41cfd9950f AUX clang-2.8-gcc-4.4.4.patch 710 RMD160 3d7246d1af95ab0a45035c9caede4844da33ef9e SHA1 72c9d2c1433623c3f6c7f5720b3dff46b190feea SHA256 ce722ffd0b2dfb8d1a36db3927238ebacd19469823fa84ca3e415ca7cfcb454d AUX clang-2.9-darwin-prefix.patch 5023 RMD160 eb394810701c92404312eb9366c4f6fb5c9a1e20 SHA1 a0c58d19df0eacb9bf915573973dae5771de8afd SHA256 12b49f753dbc22054906c8a4ab8ccb98b175a636226272bbcd49c298905836c7 AUX clang-2.9-gccversions.patch 661 RMD160 7cdc194ccc202f84a62fea56e8d5de4aded793a5 SHA1 79ff1f652d4ded66c509676a6b35eab0a41db761 SHA256 cdfd4202f50fd4edad694269ee1af64db3452cb14a5926539eb93a4cfb3fad08 +AUX clang-3.0-fix_cxx_include_root.patch 1369 RMD160 80f2496019bf044e6fd741742ad19e7e1aaaa5c4 SHA1 4c296223d1c7a78f42b798cbe76549154e70b89d SHA256 9e9a85da80e7faf66dca07538d19c5f93a80efb9b87f411f9a546b235a44864e DIST clang-2.8.tgz 5666777 RMD160 f00956b6de29cc09f3992aeabd140f2189c6cf39 SHA1 94977c84ce136307dbbeade95e67bfe3c25161ff SHA256 ed83481553e6a39a8a2953e89630d881d87833506f096a90f18d93ec2bdee0c1 DIST clang-2.9.tgz 6243772 RMD160 4ab79cbd0e2ad25a2272e6ee2fbbf546818dbd73 SHA1 5fd3b5cec050ec12858c1602b23cf096282ad4a4 SHA256 70c41f3f782a71cbaa7bc8d6ea29fce4263ad3e8558dfecc6dc11cdef17909df +DIST clang-3.0rc1.src.tar.gz 7230982 RMD160 e733785cbab9f529a8922211995f8ffb49450ee3 SHA1 bdcba36fa06dffe4b9235b13ea7740f30a04c23d SHA256 ece20a7d2acc31343785ec909b17a281f318ae5c847306ca3ab04ca8180394f6 DIST llvm-2.8-r1.tgz 9112527 RMD160 3f5a71d07e105a7cf46eafc7a9006a927035012c SHA1 6d49fe039d28e8664de25491c775cb2c599e30c1 SHA256 25addb742f1c6cc12877ed0ee924dda962d848368ee095be8e48342ae613d43b DIST llvm-2.9.tgz 9574781 RMD160 caeaa067fda1eb34196b356a087645f83731cfb7 SHA1 500f587f840199ac53c4fc7572839d08fa9d9123 SHA256 661236cfa17428b48cfa9cbb9909f7569c64b8ecd219fd91dbc00e3b557b3779 +DIST llvm-3.0rc1.src.tar.gz 10348118 RMD160 84c9a5911e0e0e4243784b9c6f6c8e1bf18afd59 SHA1 055a2ef81cdabb8e0325f4cba563552b57bb0cc0 SHA256 800d67413f846e7059c05b1748398457e03a7785393c0c565bcfb5248d50edf4 EBUILD clang-2.8-r3.ebuild 6797 RMD160 ecb174c3026addd2435661bdcca680d27c8f0ccc SHA1 068109d69dc0abc43d3ec57c010028cf273cd0ff SHA256 e1039d4fce36749d5c1aee7e1a95ebcc9a45f1ca2ace4070fd33eac32ae52382 EBUILD clang-2.9-r1.ebuild 6460 RMD160 56389cfa3a9d277c63a0cbf4e96781d331fa30f3 SHA1 8250c053ee1f802d8dc7cba02f9d6139910767bf SHA256 2891bc50c715d38060a5ea4bff21a83ccc90fa335490831adb264fd2308c55a7 -EBUILD clang-9999.ebuild 6026 RMD160 15a3c0d016e444104f961de16060b61b8a18c70c SHA1 1e5f0dcbd70de67827e550ec2d96b2137ee6b9c4 SHA256 d066e78102dc0e060a473c0caea0c4f18cbadc395f68d21196972a5cad363c3d -MISC ChangeLog 7937 RMD160 9d068feddaee2bb5032ad2c415155e777655b32e SHA1 f69591e8497f66b0867c57e24db646f701d4d6e3 SHA256 d4ff82083d306e8044e1ddf85db01d9b7fab157c0ee3b38741789aac91a51faf +EBUILD clang-3.0_rc1.ebuild 6176 RMD160 4be6556ed061ccdb6c47ec036286e5966ef7a48d SHA1 9b54406ca78cdfd0c5fe10dfea2d44aab10f414e SHA256 2b5672819d0294ac96599e6866295b19d2b213f9a38fca9c7efe3665ebff2926 +EBUILD clang-9999.ebuild 6027 RMD160 b8076cfc9bd5e8b4cee94bee3950e2f049545f09 SHA1 63188915d3a7bc2b7de52ee2b27f8c2599d08e1d SHA256 0601d19582ad7b7ff6afc9a90cfbb3461d2ddbe2ea0e208195a06fcd8f62e95d +MISC ChangeLog 8294 RMD160 9770175c74d41651ade8c9f1c35619d89c65fc1b SHA1 d2fd89e231863b3351670c076cf24bf8d8b4fdf9 SHA256 cf7d928a36c6b60cfbc875275f32aeac0054d9e6997382e3d98aed97e8e4083f MISC metadata.xml 1339 RMD160 5f8b76cda96fc95f67fd8ff7f977c116a4f0f28a SHA1 034f922ae098216b179e9d5c78246f9caa95b9d6 SHA256 0ef2f9bcc4f3293dcb69b2c882b93737b9be496e6f8789efa69df6adb2c1edf8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iF4EAREIAAYFAk6K83kACgkQFYEBGcdFJfKScgEAlR+cq3RCOw1kBtaA38a1QTKa -clbHKNbtDu10YKOCwPcBAJycX0jNQ6D451UFidQwREgUgYTB7bKeXYUGI2eZHHFK -=3OzY +iF4EAREIAAYFAk66mEAACgkQFYEBGcdFJfLm7gD8CjnWHAeqd1gyqbMcUaRi/SSc +oJcA8qcdT0Fiy9G0S80A/iHIDyAKnzA6MhLAHYeEQvec5vOKLz1KcywCtkvgOAcc +=UvHs -----END PGP SIGNATURE----- diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog index b97d4af135be..b50e9b5cfd60 100644 --- a/sys-devel/llvm/ChangeLog +++ b/sys-devel/llvm/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-devel/llvm # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.47 2011/10/04 11:43:37 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.48 2011/11/09 15:11:05 voyageur Exp $ + +*llvm-3.0_rc1 (09 Nov 2011) + + 09 Nov 2011; Bernard Cafarelli <voyageur@gentoo.org> +llvm-3.0_rc1.ebuild, + llvm-9999.ebuild: + Add rc release to prepare for 3.0, remove llvm-gcc detection code (not used + in configure anymore) 04 Oct 2011; Bernard Cafarelli <voyageur@gentoo.org> llvm-2.8-r2.ebuild, -llvm-2.8-r4.ebuild, llvm-2.9-r2.ebuild, llvm-9999.ebuild: diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest index 9a3d4a3afc7a..a9c3f59145ba 100644 --- a/sys-devel/llvm/Manifest +++ b/sys-devel/llvm/Manifest @@ -9,15 +9,17 @@ AUX llvm-2.9-Operator.h-c++0x.patch 2062 RMD160 3f137dc80cac2d77b978a332a731e443 AUX llvm-2.9-nodoctargz.patch 1569 RMD160 6589aa0a41f47e915ce93fe6dcf68dd601c3bcdc SHA1 19795ec9c34e6ec5539ec6a77944ceb51abdef72 SHA256 62f1b080364d94e528bb34f0063562d16a59395aa7f97277bba88fbd93e00b84 DIST llvm-2.8-r1.tgz 9112527 RMD160 3f5a71d07e105a7cf46eafc7a9006a927035012c SHA1 6d49fe039d28e8664de25491c775cb2c599e30c1 SHA256 25addb742f1c6cc12877ed0ee924dda962d848368ee095be8e48342ae613d43b DIST llvm-2.9.tgz 9574781 RMD160 caeaa067fda1eb34196b356a087645f83731cfb7 SHA1 500f587f840199ac53c4fc7572839d08fa9d9123 SHA256 661236cfa17428b48cfa9cbb9909f7569c64b8ecd219fd91dbc00e3b557b3779 +DIST llvm-3.0rc1.src.tar.gz 10348118 RMD160 84c9a5911e0e0e4243784b9c6f6c8e1bf18afd59 SHA1 055a2ef81cdabb8e0325f4cba563552b57bb0cc0 SHA256 800d67413f846e7059c05b1748398457e03a7785393c0c565bcfb5248d50edf4 EBUILD llvm-2.8-r2.ebuild 6156 RMD160 9e76bf90d103993330bcf8701c8ee490117c3ab1 SHA1 f691fe35a6a02da441fd9aa1c52a04a2aff298a9 SHA256 9bc669e88d0a49b5fa7c5ada8da9752cade9876fb03bb16cbad1afebee507d1b EBUILD llvm-2.9-r2.ebuild 6114 RMD160 efa267a42dfe1d35c0ea5c9e4a52252491e4a9db SHA1 02591fa875edd371f2a47347aa0d74e1cbaac969 SHA256 98092eca9ecb3327b696d76d31a72f766004ec7501c7c569dda5be82ecb9ff60 -EBUILD llvm-9999.ebuild 6016 RMD160 4976ef4a36d8df3f6e572239e1f72bb76016f994 SHA1 99bd699bf214e7474719da3a48ef86dac0d3dd93 SHA256 c2ac834a217cc3826d6d486b68332c3b1a562496f477f15804802c435af59e17 -MISC ChangeLog 7819 RMD160 7a450a3763661fb8cef6e2f728df2c3fba20eebe SHA1 6179ad1ff54f098d36605da79b205f9870137775 SHA256 4356332d05c5632a4ef096b73b82bbc24e30bd6ef6d05995392d1f290e8ed239 +EBUILD llvm-3.0_rc1.ebuild 5053 RMD160 a5ad413fad52e68a7c384c789905f2ad31ea4aa9 SHA1 b1f8afec213fa4393a355df0a1974400418d4f24 SHA256 f2fe88cac73d0d875dcf77000309c2210a1114cc7e626e46d169beca72183d8f +EBUILD llvm-9999.ebuild 4974 RMD160 8956e441647bfa6cf3bf15960fd7124cd8e90d28 SHA1 f0d7c502087051edb3b311f15376aace0c357f5c SHA256 080fe2ecb218c0bae613e8031f6cfb50b3fc191bfa9216d244c56432cbb36cf6 +MISC ChangeLog 8048 RMD160 7e031956170b6f6dd7b7fa68923c7986777c45c4 SHA1 02718edc0598cb03e218fb4613e50a3c2cd1b9c7 SHA256 31552d0885cc800ee649093a1ee138513a865ae5adc0cec581e7b09753aa56c9 MISC metadata.xml 2234 RMD160 b14138857d612a9f5568760b1e70b80f344d978c SHA1 53d1e496b0e80e9acc24fd1cb8858e9efc93d7c0 SHA256 83a322d633e38210fe9946ea92902a17142863fe26578bb1b1bad773952b0419 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iF4EAREIAAYFAk6K8XcACgkQFYEBGcdFJfKpIAEAi7hiUPysqysIdctsIML1N1C7 -4DjysZr/5lbEX5n6I+gBAKfeO7YHH8Jn8VnMJxoy4gBfBpMcNug6WTQ90nKV8oT2 -=wn+s +iF4EAREIAAYFAk66mBYACgkQFYEBGcdFJfK2VQEAh8b/1J7xGVDAiO+DrHWhOKJI +PKO33zHjf5yYfYPvs88A/iPRhshdzzXL5ABE4VnbB8daoEXCSRr15jglJMK3dKna +=h37t -----END PGP SIGNATURE----- diff --git a/sys-devel/llvm/llvm-3.0_rc1.ebuild b/sys-devel/llvm/llvm-3.0_rc1.ebuild new file mode 100644 index 000000000000..b25e8fb60256 --- /dev/null +++ b/sys-devel/llvm/llvm-3.0_rc1.ebuild @@ -0,0 +1,155 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.0_rc1.ebuild,v 1.1 2011/11/09 15:11:05 voyageur Exp $ + +EAPI="3" +inherit eutils flag-o-matic multilib toolchain-funcs + +DESCRIPTION="Low Level Virtual Machine" +HOMEPAGE="http://llvm.org/" +SRC_URI="http://llvm.org/pre-releases/${PV/_rc*}/${PV/3.0_}/sources/${P/_}.src.tar.gz" + +LICENSE="UoI-NCSA" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="debug +libffi multitarget ocaml test udis86 vim-syntax" + +DEPEND="dev-lang/perl + >=sys-devel/make-3.79 + >=sys-devel/flex-2.5.4 + >=sys-devel/bison-1.875d + || ( >=sys-devel/gcc-3.0 >=sys-devel/gcc-apple-4.2.1 ) + || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-3.2.3 ) + libffi? ( dev-util/pkgconfig + virtual/libffi ) + ocaml? ( dev-lang/ocaml ) + udis86? ( amd64? ( dev-libs/udis86[pic] ) + !amd64? ( dev-libs/udis86 ) )" +RDEPEND="dev-lang/perl + libffi? ( virtual/libffi ) + vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )" + +S=${WORKDIR}/${P/_} + +pkg_setup() { + # need to check if the active compiler is ok + + broken_gcc=" 3.2.2 3.2.3 3.3.2 4.1.1 " + broken_gcc_x86=" 3.4.0 3.4.2 " + broken_gcc_amd64=" 3.4.6 " + + gcc_vers=$(gcc-fullversion) + + if [[ ${broken_gcc} == *" ${version} "* ]] ; then + elog "Your version of gcc is known to miscompile llvm." + elog "Check http://www.llvm.org/docs/GettingStarted.html for" + elog "possible solutions." + die "Your currently active version of gcc is known to miscompile llvm" + fi + + if [[ ${CHOST} == i*86-* && ${broken_gcc_x86} == *" ${version} "* ]] ; then + elog "Your version of gcc is known to miscompile llvm on x86" + elog "architectures. Check" + elog "http://www.llvm.org/docs/GettingStarted.html for possible" + elog "solutions." + die "Your currently active version of gcc is known to miscompile llvm" + fi + + if [[ ${CHOST} == x86_64-* && ${broken_gcc_amd64} == *" ${version} "* ]]; + then + elog "Your version of gcc is known to miscompile llvm in amd64" + elog "architectures. Check" + elog "http://www.llvm.org/docs/GettingStarted.html for possible" + elog "solutions." + die "Your currently active version of gcc is known to miscompile llvm" + fi +} + +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 := $(PROJ_prefix)/share/doc/'${PF}, \ + -e 's,^PROJ_etcdir.*,PROJ_etcdir := '"${EPREFIX}"'/etc/llvm,' \ + -e 's,^PROJ_libdir.*,PROJ_libdir := $(PROJ_prefix)/'$(get_libdir)/${PN}, \ + -i Makefile.config.in || die "Makefile.config sed failed" + sed -e 's,$ABS_RUN_DIR/lib,'"${EPREFIX}"/usr/$(get_libdir)/${PN}, \ + -i tools/llvm-config/llvm-config.in.in || die "llvm-config sed failed" + + einfo "Fixing rpath and CFLAGS" + sed -e 's,\$(RPATH) -Wl\,\$(\(ToolDir\|LibDir\)),$(RPATH) -Wl\,'"${EPREFIX}"/usr/$(get_libdir)/${PN}, \ + -e '/OmitFramePointer/s/-fomit-frame-pointer//' \ + -i Makefile.rules || die "rpath sed failed" + + epatch "${FILESDIR}"/${PN}-2.6-commandguide-nops.patch + epatch "${FILESDIR}"/${PN}-2.9-nodoctargz.patch +} + +src_configure() { + local CONF_FLAGS="--enable-shared + --with-optimize-option= + $(use_enable !debug optimized) + $(use_enable debug assertions) + $(use_enable debug expensive-checks)" + + if use multitarget; then + CONF_FLAGS="${CONF_FLAGS} --enable-targets=all" + else + CONF_FLAGS="${CONF_FLAGS} --enable-targets=host-only" + fi + + if use amd64; then + CONF_FLAGS="${CONF_FLAGS} --enable-pic" + fi + + if use ocaml; then + CONF_FLAGS="${CONF_FLAGS} --enable-bindings=ocaml" + else + CONF_FLAGS="${CONF_FLAGS} --enable-bindings=none" + fi + + if use udis86; then + CONF_FLAGS="${CONF_FLAGS} --with-udis86" + fi + + if use libffi; then + append-cppflags "$(pkg-config --cflags libffi)" + fi + CONF_FLAGS="${CONF_FLAGS} $(use_enable libffi)" + econf ${CONF_FLAGS} || die "econf failed" +} + +src_compile() { + emake VERBOSE=1 KEEP_SYMBOLS=1 REQUIRES_RTTI=1 || die "emake failed" +} + +src_install() { + emake KEEP_SYMBOLS=1 DESTDIR="${D}" install || die "install failed" + + if use vim-syntax; then + insinto /usr/share/vim/vimfiles/syntax + doins utils/vim/*.vim + fi + + # Fix install_names on Darwin. The build system is too complicated + # to just fix this, so we correct it post-install + if [[ ${CHOST} == *-darwin* ]] ; then + for lib in lib{EnhancedDisassembly,LLVM-${PV},LTO}.dylib {BugpointPasses,LLVMHello,profile_rt}.dylib ; do + # libEnhancedDisassembly is Darwin10 only, so non-fatal + [[ -f ${ED}/usr/lib/${PN}/${lib} ]] || continue + ebegin "fixing install_name of $lib" + install_name_tool \ + -id "${EPREFIX}"/usr/lib/${PN}/${lib} \ + "${ED}"/usr/lib/${PN}/${lib} + eend $? + done + for f in "${ED}"/usr/bin/* "${ED}"/usr/lib/${PN}/libLTO.dylib ; do + ebegin "fixing install_name reference to libLLVM-${PV}.dylib of ${f##*/}" + install_name_tool \ + -change "@executable_path/../lib/libLLVM-${PV}.dylib" \ + "${EPREFIX}"/usr/lib/${PN}/libLLVM-${PV}.dylib \ + "${f}" + eend $? + done + fi +} diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild index 2d567c186d72..171369e9b8b6 100644 --- a/sys-devel/llvm/llvm-9999.ebuild +++ b/sys-devel/llvm/llvm-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 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.15 2011/10/04 11:43:37 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.16 2011/11/09 15:11:05 voyageur Exp $ EAPI="3" inherit subversion eutils flag-o-matic multilib toolchain-funcs @@ -13,7 +13,7 @@ ESVN_REPO_URI="http://llvm.org/svn/llvm-project/llvm/trunk" LICENSE="UoI-NCSA" SLOT="0" KEYWORDS="" -IUSE="debug +libffi llvm-gcc multitarget ocaml test udis86 vim-syntax" +IUSE="debug +libffi multitarget ocaml test udis86 vim-syntax" DEPEND="dev-lang/perl >=sys-devel/make-3.79 @@ -30,8 +30,6 @@ RDEPEND="dev-lang/perl libffi? ( virtual/libffi ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )" -S=${WORKDIR}/${PN}-${PV/_pre*} - pkg_setup() { # need to check if the active compiler is ok @@ -103,32 +101,6 @@ src_configure() { CONF_FLAGS="${CONF_FLAGS} --enable-pic" fi - # things would be built differently depending on whether llvm-gcc is - # used or not. - local LLVM_GCC_DIR=/dev/null - local LLVM_GCC_DRIVER=nope ; local LLVM_GPP_DRIVER=nope - if use llvm-gcc ; then - if has_version sys-devel/llvm-gcc; then - LLVM_GCC_DIR=$(ls -d ${EROOT}/usr/$(get_libdir)/llvm-gcc* 2> /dev/null) - LLVM_GCC_DRIVER=$(find ${LLVM_GCC_DIR} -name 'llvm*-gcc' 2> /dev/null) - if [[ -z ${LLVM_GCC_DRIVER} ]] ; then - die "failed to find installed llvm-gcc, LLVM_GCC_DIR=${LLVM_GCC_DIR}" - fi - einfo "Using $LLVM_GCC_DRIVER" - LLVM_GPP_DRIVER=${LLVM_GCC_DRIVER/%-gcc/-g++} - else - eerror "llvm-gcc USE flag enabled, but sys-devel/llvm-gcc was not found" - eerror "Building with standard gcc, re-merge this package after installing" - eerror "llvm-gcc to build with it" - eerror "This is normal behavior on first LLVM merge" - fi - fi - - CONF_FLAGS="${CONF_FLAGS} \ - --with-llvmgccdir=${LLVM_GCC_DIR} \ - --with-llvmgcc=${LLVM_GCC_DRIVER} \ - --with-llvmgxx=${LLVM_GPP_DRIVER}" - if use ocaml; then CONF_FLAGS="${CONF_FLAGS} --enable-bindings=ocaml" else |