From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 535431388BF for ; Thu, 7 Jan 2016 22:10:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9631BE07D6; Thu, 7 Jan 2016 22:10:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C0A25E07D6 for ; Thu, 7 Jan 2016 22:10:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B33FA340A03 for ; Thu, 7 Jan 2016 22:10:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 63C0AD02 for ; Thu, 7 Jan 2016 22:10:21 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1452204581.7449e122ce962900ac9411971a06c2416c967e08.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/llvm/files/, sys-devel/llvm/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/llvm/Manifest sys-devel/llvm/files/llvm-2.8-alignof.patch sys-devel/llvm/files/llvm-2.8-darwin8.patch sys-devel/llvm/llvm-2.8-r2.ebuild X-VCS-Directories: sys-devel/llvm/ sys-devel/llvm/files/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 7449e122ce962900ac9411971a06c2416c967e08 X-VCS-Branch: master Date: Thu, 7 Jan 2016 22:10:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 77c41740-4c45-4178-a684-2552d9839053 X-Archives-Hash: a0b3810fc30c9a9c51531d355d62a9d8 commit: 7449e122ce962900ac9411971a06c2416c967e08 Author: Michał Górny gentoo org> AuthorDate: Thu Jan 7 09:16:57 2016 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Jan 7 22:09:41 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7449e122 sys-devel/llvm: Remove ancient 2.8 version sys-devel/llvm/Manifest | 1 - sys-devel/llvm/files/llvm-2.8-alignof.patch | 59 ---------- sys-devel/llvm/files/llvm-2.8-darwin8.patch | 15 --- sys-devel/llvm/llvm-2.8-r2.ebuild | 168 ---------------------------- 4 files changed, 243 deletions(-) diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest index 0ece351..f23c5de 100644 --- a/sys-devel/llvm/Manifest +++ b/sys-devel/llvm/Manifest @@ -20,7 +20,6 @@ DIST compiler-rt-3.7.0.src.tar.xz 1192832 SHA256 227fa998520bc94974a428dc8e7654d DIST compiler-rt-3.7.1.src.tar.xz 1181772 SHA256 9d4769e4a927d3824bcb7a9c82b01e307c68588e6de4e7f04ab82d82c5af8181 SHA512 bf434519ea0838264c30de1e1e8681320aa868df0ecc825a45c659077b963a4120c18216946558cbf8aea24a8ac8ec39af2066dab906bc7cabc0894d51d61325 WHIRLPOOL 0bea047e48622884a6fc6bb3826046e9de5b3192006cc41c0ccd9d6c611674869c3c15988b531a0f7d9fea2cf951b90ecef385b85db765c6f99a48692fdcf223 DIST lldb-3.7.0.src.tar.xz 10649660 SHA256 f4d7505bc111044eaa4033af012221e492938405b62522b8e3e354c20c4b71e9 SHA512 52157782ef13e2c8b7b35ff3ccc05887195fe46ddb6bafcf0707a3c46c1e034734b55342b8dbfc46cae7a8c3cb1012345284e4bedb2344c5016b8d19a12e90df WHIRLPOOL 8c0803a51820ec67944e27061c858e95a92aefa38a1540241fead2b63c5b065c1268cf958b14d8841f62fc8aea5da1e20204704426598bfc2c4e61bcda135c43 DIST lldb-3.7.1.src.tar.xz 10650524 SHA256 9a0bc315ef55f44c98cdf92d064df0847f453ed156dd0ef6a87e04f5fd6a0e01 SHA512 d2d3e1052026edd6ef9113ff5362acb4a32cef598098b4031c35e389301130ef2e1bda594f30de4d65c9fdc0beaecdd35afcf36676eb540baad34015aca294d1 WHIRLPOOL bba9c700788f0cf86ac1de51383a223e1c92f724719cdd327d83189cb77714c1e10fb78569aeed3b3c639062a3410bb114f646a271fd0d9e8c9a8e45d090330a -DIST llvm-2.8-r1.tgz 9112527 SHA256 25addb742f1c6cc12877ed0ee924dda962d848368ee095be8e48342ae613d43b SHA512 8688d5cf415e8aef74cca6a14587af36234a6347e2238ac2c0d66805c42926b9399f36390e1a58a4081e902b0904adb818c1a360d5df572dfa893d6f79f5e35a WHIRLPOOL 0da9250e31242b55586c9138089e742aab5d414d5f3412ebf917ae8b9506f984c6134a932be93ec7e4c01c79f6c21d508cb0b2e0ec283419bd4ae4db745430ae DIST llvm-2.9.tgz 9574781 SHA256 661236cfa17428b48cfa9cbb9909f7569c64b8ecd219fd91dbc00e3b557b3779 SHA512 9cb0fa0bb8ac02661fd6f926001a15e0ad4a9660683421dc86b03f1cf5184142c5815f9f9283ee7cdf8d474e01177f83406122253342e0e95ddc878821660070 WHIRLPOOL f7b445b6b5d455f29ca68c342511b8b5e6eedec525af1cc60440c4de544df2332aa241bffca29eda5d2428a3f518e093a626bd45c7f8a9e0656d0f68aef5d9d1 DIST llvm-3.0.tar.gz 10350539 SHA256 519eb11d3499ce99c6ffdb8718651fc91425ed7690eac91c8d6853474f7c0477 SHA512 602bb5590b70cb9138bc19d8c630c62bbabdcb2132215c921fe4bce4e3f74dfc66440b9dcd458ff55a86047cc9cc0417c6563715c133e0db222e4b88f07c13bb WHIRLPOOL 6f4ece3ec747352cd78b08d25c5b1cda91140eb6957d509161e45395e47c074f8d2102bfcaeabcdef8c1f6672f2cf06d88e290667666122da029391b3528d440 DIST llvm-3.1.src.tar.gz 11077429 SHA256 1ea05135197b5400c1f88d00ff280d775ce778f8f9ea042e25a1e1e734a4b9ab SHA512 fb941094601043e405ccc57473414ef92437b09c200e71614f93d8e93b2a58cca8d78c385be037e064b0711cd6268802c774ce4a40fc0ea17bf576305304d2aa WHIRLPOOL c5c72e139296e1c186131f991010f52f958063a4fcfcb1f8527b53a2aaa7edcaca70ab6cf86c25d08640dcf6d720a865fda7dc7eb06cf1ce9c23fd37b5d597ef diff --git a/sys-devel/llvm/files/llvm-2.8-alignof.patch b/sys-devel/llvm/files/llvm-2.8-alignof.patch deleted file mode 100644 index ae7f314..0000000 --- a/sys-devel/llvm/files/llvm-2.8-alignof.patch +++ /dev/null @@ -1,59 +0,0 @@ -Index: include/llvm/ADT/StringMap.h -=================================================================== ---- include/llvm/ADT/StringMap.h (révision 117773) -+++ include/llvm/ADT/StringMap.h (révision 117774) -@@ -167,7 +167,7 @@ - - unsigned AllocSize = static_cast(sizeof(StringMapEntry))+ - KeyLength+1; -- unsigned Alignment = alignof(); -+ unsigned Alignment = alignOf(); - - StringMapEntry *NewItem = - static_cast(Allocator.Allocate(AllocSize,Alignment)); -Index: include/llvm/Support/AlignOf.h -=================================================================== ---- include/llvm/Support/AlignOf.h (révision 117773) -+++ include/llvm/Support/AlignOf.h (révision 117774) -@@ -49,12 +49,12 @@ - - }; - --/// alignof - A templated function that returns the mininum alignment of -+/// alignOf - A templated function that returns the mininum alignment of - /// of a type. This provides no extra functionality beyond the AlignOf - /// class besides some cosmetic cleanliness. Example usage: --/// alignof() returns the alignment of an int. -+/// alignOf() returns the alignment of an int. - template --static inline unsigned alignof() { return AlignOf::Alignment; } -+static inline unsigned alignOf() { return AlignOf::Alignment; } - - } // end namespace llvm - #endif -Index: include/llvm/Support/Allocator.h -=================================================================== ---- include/llvm/Support/Allocator.h (révision 117773) -+++ include/llvm/Support/Allocator.h (révision 117774) -@@ -201,7 +201,7 @@ - char *End = Slab == Allocator.CurSlab ? Allocator.CurPtr : - (char *)Slab + Slab->Size; - for (char *Ptr = (char*)(Slab+1); Ptr < End; Ptr += sizeof(T)) { -- Ptr = Allocator.AlignPtr(Ptr, alignof()); -+ Ptr = Allocator.AlignPtr(Ptr, alignOf()); - if (Ptr + sizeof(T) <= End) - reinterpret_cast(Ptr)->~T(); - } -Index: include/llvm/CodeGen/SlotIndexes.h -=================================================================== ---- include/llvm/CodeGen/SlotIndexes.h (révision 117773) -+++ include/llvm/CodeGen/SlotIndexes.h (révision 117774) -@@ -393,7 +393,7 @@ - IndexListEntry *entry = - static_cast( - ileAllocator.Allocate(sizeof(IndexListEntry), -- alignof())); -+ alignOf())); - - new (entry) IndexListEntry(mi, index); - diff --git a/sys-devel/llvm/files/llvm-2.8-darwin8.patch b/sys-devel/llvm/files/llvm-2.8-darwin8.patch deleted file mode 100644 index 284ab47..0000000 --- a/sys-devel/llvm/files/llvm-2.8-darwin8.patch +++ /dev/null @@ -1,15 +0,0 @@ -Avoid like in Makefile.rules -ld: -rpath can only be used when targeting Mac OS X 10.5 or later - ---- unittests/Makefile.unittest -+++ unittests/Makefile.unittest -@@ -37,7 +37,9 @@ - ifeq ($(ENABLE_SHARED), 1) - # Add the absolute path to the dynamic library. This is ok because - # we'll never install unittests. -+ifneq ($(DARWIN_MAJVERS),4) - LD.Flags += $(RPATH) -Wl,$(SharedLibDir) -+endif - # Also set {DYLD,LD}_LIBRARY_PATH because OSX ignores the rpath most - # of the time. - Run.Shared := $(SHLIBPATH_VAR)="$(SharedLibDir)$${$(SHLIBPATH_VAR):+:}$$$(SHLIBPATH_VAR)" diff --git a/sys-devel/llvm/llvm-2.8-r2.ebuild b/sys-devel/llvm/llvm-2.8-r2.ebuild deleted file mode 100644 index ed5e542..0000000 --- a/sys-devel/llvm/llvm-2.8-r2.ebuild +++ /dev/null @@ -1,168 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" -inherit eutils multilib toolchain-funcs - -DESCRIPTION="Low Level Virtual Machine" -HOMEPAGE="http://llvm.org/" -# Upstream silently re-released the tarball... -# drop the -> in 2.9 -SRC_URI="http://llvm.org/releases/${PV}/${P}.tgz -> ${P}-r1.tgz" - -LICENSE="UoI-NCSA" -SLOT="0" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="debug +libffi multitarget ocaml test udis86" - -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? ( virtual/libffi ) - ocaml? ( dev-lang/ocaml ) - udis86? ( dev-libs/udis86[pic(+)] )" -RDEPEND="dev-lang/perl" - -S=${WORKDIR}/${PN}-${PV/_pre*} - -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.7-nodoctargz.patch - epatch "${FILESDIR}"/${PN}-2.6-commandguide-nops.patch - epatch "${FILESDIR}"/${PN}-2.8-darwin8.patch - # Upstream backport, r117774 - epatch "${FILESDIR}"/${P}-alignof.patch - - # Additional unistd.h include for GCC 4.7 - epatch "${FILESDIR}"/${PN}-2.9-gcc4.7.patch - - # User patches - epatch_user -} - -src_configure() { - local CONF_FLAGS="--enable-shared" - - if use debug; then - CONF_FLAGS="${CONF_FLAGS} --disable-optimized" - einfo "Note: Compiling LLVM in debug mode will create huge and slow binaries" - # ...and you probably shouldn't use tmpfs, unless it can hold 900MB - else - CONF_FLAGS="${CONF_FLAGS} \ - --enable-optimized \ - --with-optimize-option= \ - --disable-assertions \ - --disable-expensive-checks" - fi - - 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 - - CONF_FLAGS="${CONF_FLAGS} \ - --with-llvmgccdir=/dev/null \ - --with-llvmgcc=nope \ - --with-llvmgxx=nope" - - 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 - 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" - - # Fix install_names on Darwin. The build system is too complicated - # to just fix this, so we correct it post-install - local lib= f= odylib= - if [[ ${CHOST} == *-darwin* ]] ; then - for lib in lib{EnhancedDisassembly,LLVM-${PV},BugpointPasses,LLVMHello,LTO,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 - odylib=$(scanmacho -BF'%n#f' "${f}" | tr ',' '\n' | grep libLLVM-${PV}.dylib) - ebegin "fixing install_name reference to ${odylib} of ${f##*/}" - install_name_tool \ - -change "${odylib}" \ - "${EPREFIX}"/usr/lib/${PN}/libLLVM-${PV}.dylib \ - "${f}" - eend $? - done - fi -}