commit: 6edc90a1c470d99ac0afb01430d7549882b3c73c Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Thu Jan 7 14:01:32 2016 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Thu Jan 7 22:09:41 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6edc90a1
sys-devel/llvm: Remove ancient 3.0 version sys-devel/llvm/Manifest | 1 - .../llvm-3.0-PPCCompilationCallbackC_static.patch | 27 --- sys-devel/llvm/files/llvm-3.0-gold_LTO_link.patch | 10 -- sys-devel/llvm/files/llvm-3.0-ocaml_install.patch | 16 -- sys-devel/llvm/files/llvm-3.0-set_soname.patch | 12 -- sys-devel/llvm/llvm-3.0-r2.ebuild | 181 --------------------- 6 files changed, 247 deletions(-) diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest index 340f77a..90b47c4 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-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 DIST llvm-3.2-manpages.tar.bz2 25962 SHA256 159eaaaf59a2cee66f6aa0bbc93ca4c9fa37a9a25d4116f085556cdbc32f75ca SHA512 75ce41827f99b9e08f0c3e374c49f8a231653bca28bea158ece551e5934bc61ae21bfaf158490f83b05c1a7926b95c8832c0eb023280dcafa671e7d551efa17e WHIRLPOOL 58382b3e92b2ef8b1f5a7ebf2d893852253976b781b2b2acd11dfd914fad9776f59ddc5559d3986832a00fde88539db6a5882aa69a6f3ceca90337a59420acc1 DIST llvm-3.2.src.tar.gz 12275252 SHA256 125090c4d26740f1d5e9838477c931ed7d9ad70d599ba265f46f3a42cb066343 SHA512 cc66171322dbbe40bcac0e0ea5b09df8ff52df63ded304f841f32f702270d6ab1512216413ee52498c3ebee8cd39c4cd23e3855d591944bc2ac0ae76f5be62cc WHIRLPOOL c3a39b2426293d0251b7769607ade873bb6bf8d54e7c8055773a9b75742bc8e39049fb71409a258c6f3d98775b78c280d4bfe4223ba91e5ed6ecae0eddf910e5 diff --git a/sys-devel/llvm/files/llvm-3.0-PPCCompilationCallbackC_static.patch b/sys-devel/llvm/files/llvm-3.0-PPCCompilationCallbackC_static.patch deleted file mode 100644 index 04e4024..0000000 --- a/sys-devel/llvm/files/llvm-3.0-PPCCompilationCallbackC_static.patch +++ /dev/null @@ -1,27 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=403519 -http://llvm.org/viewvc/llvm-project?view=rev&revision=153938 - ---- llvm/trunk/lib/Target/PowerPC/PPCJITInfo.cpp 2011/06/15 15:29:47 133059 -+++ llvm/trunk/lib/Target/PowerPC/PPCJITInfo.cpp 2012/04/03 06:59:28 153938 -@@ -291,9 +291,10 @@ - } - #endif - --extern "C" void *PPCCompilationCallbackC(unsigned *StubCallAddrPlus4, -- unsigned *OrigCallAddrPlus4, -- bool is64Bit) { -+extern "C" { -+static void* LLVM_ATTRIBUTE_USED PPCCompilationCallbackC(unsigned *StubCallAddrPlus4, -+ unsigned *OrigCallAddrPlus4, -+ bool is64Bit) { - // Adjust the pointer to the address of the call instruction in the stub - // emitted by emitFunctionStub, rather than the instruction after it. - unsigned *StubCallAddr = StubCallAddrPlus4 - 1; -@@ -337,6 +338,7 @@ - // stack after we restore all regs. - return Target; - } -+} - - - diff --git a/sys-devel/llvm/files/llvm-3.0-gold_LTO_link.patch b/sys-devel/llvm/files/llvm-3.0-gold_LTO_link.patch deleted file mode 100644 index 031448d..0000000 --- a/sys-devel/llvm/files/llvm-3.0-gold_LTO_link.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- tools/gold/Makefile 2011/11/23 03:03:21 145094 -+++ tools/gold/Makefile 2011/11/23 03:07:25 145095 -@@ -24,6 +24,6 @@ - # Because off_t is used in the public API, the largefile parts are required for - # ABI compatibility. - CXXFLAGS+=-I$(BINUTILS_INCDIR) -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 --CXXFLAGS+=$(SharedLibDir)/$(SharedPrefix)LTO$(SHLIBEXT) -+CXXFLAGS+=-L$(SharedLibDir)/$(SharedPrefix) -lLTO - - include $(LEVEL)/Makefile.common diff --git a/sys-devel/llvm/files/llvm-3.0-ocaml_install.patch b/sys-devel/llvm/files/llvm-3.0-ocaml_install.patch deleted file mode 100644 index 18f5cf6..0000000 --- a/sys-devel/llvm/files/llvm-3.0-ocaml_install.patch +++ /dev/null @@ -1,16 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=393023 -http://llvm.org/bugs/show_bug.cgi?id=11177 - -Index: llvm-3.0-3.0/bindings/ocaml/llvm/Makefile -=================================================================== ---- llvm-3.0-3.0.orig/bindings/ocaml/llvm/Makefile 2011-11-15 12:17:02.785987852 +0100 -+++ llvm-3.0-3.0/bindings/ocaml/llvm/Makefile 2011-11-15 12:20:12.661983615 +0100 -@@ -30,7 +30,7 @@ - $(OcamlDir)/META.llvm: META.llvm - $(Verb) $(CP) -f $< $@ - --install-meta:: $(ObjDir)/META.llvm -+install-meta:: $(ObjDir)/../META.llvm - $(Echo) "Install $(BuildMode) $(DestMETA)" - $(Verb) $(MKDIR) $(PROJ_libocamldir) - $(Verb) $(DataInstall) META.llvm "$(DestMETA)" diff --git a/sys-devel/llvm/files/llvm-3.0-set_soname.patch b/sys-devel/llvm/files/llvm-3.0-set_soname.patch deleted file mode 100644 index 69ba74d..0000000 --- a/sys-devel/llvm/files/llvm-3.0-set_soname.patch +++ /dev/null @@ -1,12 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=409267 -http://llvm.org/bugs/show_bug.cgi?id=12334 ---- tools/llvm-shlib/Makefile.orig 2012-03-26 18:14:13.071797115 +0200 -+++ tools/llvm-shlib/Makefile 2012-03-26 17:31:12.491196254 +0200 -@@ -67,6 +67,7 @@ - # Include everything from the .a's into the shared library. - LLVMLibsOptions := -Wl,--whole-archive $(LLVMLibsOptions) \ - -Wl,--no-whole-archive -+ LLVMLibsOptions += -Wl,--soname,lib$(LIBRARYNAME)$(SHLIBEXT) - endif - - ifeq ($(HOST_OS),Linux) diff --git a/sys-devel/llvm/llvm-3.0-r2.ebuild b/sys-devel/llvm/llvm-3.0-r2.ebuild deleted file mode 100644 index a0caca1..0000000 --- a/sys-devel/llvm/llvm-3.0-r2.ebuild +++ /dev/null @@ -1,181 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" -PYTHON_DEPEND="2" -inherit eutils flag-o-matic multilib toolchain-funcs python pax-utils - -DESCRIPTION="Low Level Virtual Machine" -HOMEPAGE="http://llvm.org/"; -SRC_URI="http://llvm.org/releases/${PV}/${P}.tar.gz"; - -LICENSE="UoI-NCSA" -SLOT="0" -KEYWORDS="amd64 ~ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="debug gold +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 ) - gold? ( >=sys-devel/binutils-2.22[cxx] ) - libffi? ( virtual/pkgconfig - virtual/libffi ) - ocaml? ( dev-lang/ocaml ) - udis86? ( dev-libs/udis86[pic(+)] )" -RDEPEND="dev-lang/perl - libffi? ( virtual/libffi ) - vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )" - -S=${WORKDIR}/${P}.src - -pkg_setup() { - # Required for test and build - python_set_active_version 2 - python_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" - - # Specify python version - python_convert_shebangs -r 2 test/Scripts - - epatch "${FILESDIR}"/${PN}-2.6-commandguide-nops.patch - epatch "${FILESDIR}"/${PN}-2.9-nodoctargz.patch - epatch "${FILESDIR}"/${P}-ocaml_install.patch - epatch "${FILESDIR}"/${P}-PPC_macro.patch - epatch "${FILESDIR}"/${P}-PPCCompilationCallbackC_static.patch - epatch "${FILESDIR}"/${P}-gold_LTO_link.patch - epatch "${FILESDIR}"/${P}-set_soname.patch - - # User patches - epatch_user -} - -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 gold; then - CONF_FLAGS="${CONF_FLAGS} --with-binutils-include=${EPREFIX}/usr/include/" - 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" - - pax-mark m Release/bin/lli - if use test; then - pax-mark m unittests/ExecutionEngine/JIT/Release/JITTests - fi -} - -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 - local lib= f= odylib= - if [[ ${CHOST} == *-darwin* ]] ; then - for lib in lib{EnhancedDisassembly,LLVM-${PV},LTO,profile_rt}.dylib {BugpointPasses,LLVMHello}.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 -}
