mgorny 14/04/12 09:44:01 Modified: llvm-9999.ebuild ChangeLog Log: Remove the cmake hack since upstream started installing cmake files from Makefiles. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path 1.84 sys-devel/llvm/llvm-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?rev=1.84&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?rev=1.84&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?r1=1.83&r2=1.84 Index: llvm-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- llvm-9999.ebuild 10 Apr 2014 17:03:23 -0000 1.83 +++ llvm-9999.ebuild 12 Apr 2014 09:44:01 -0000 1.84 @@ -1,12 +1,12 @@ # Copyright 1999-2014 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.83 2014/04/10 17:03:23 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.84 2014/04/12 09:44:01 mgorny Exp $ EAPI=5 PYTHON_COMPAT=( python{2_6,2_7} pypy pypy2_0 ) -inherit cmake-utils eutils flag-o-matic git-r3 multibuild multilib \ +inherit eutils flag-o-matic git-r3 multibuild multilib \ multilib-minimal python-r1 toolchain-funcs pax-utils check-reqs DESCRIPTION="Low Level Virtual Machine" @@ -248,25 +248,6 @@ ECONF_SOURCE=${S} \ econf "${conf_flags[@]}" - - multilib_build_binaries && cmake_configure -} - -cmake_configure() { - # sadly, cmake doesn't seem to have host autodetection - # but it's fairly easy to steal this from configured autotools - local targets=$(sed -n -e 's/^TARGETS_TO_BUILD=//p' Makefile.config || die) - local libdir=$(get_libdir) - local mycmakeargs=( - # just the stuff needed to get correct cmake modules - $(cmake-utils_use ncurses LLVM_ENABLE_TERMINFO) - - -DLLVM_TARGETS_TO_BUILD="${targets// /;}" - -DLLVM_LIBDIR_SUFFIX=${libdir#lib} - ) - - BUILD_DIR=${S%/}_cmake \ - cmake-utils_src_configure } set_makeargs() { @@ -395,9 +376,6 @@ dosym ../../../../$(get_libdir)/LLVMgold.so \ /usr/${CHOST}/binutils-bin/lib/bfd-plugins/LLVMgold.so fi - - # install cmake modules - emake -C "${S%/}"_cmake/cmake/modules DESTDIR="${D}" install fi # Fix install_names on Darwin. The build system is too complicated 1.189 sys-devel/llvm/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?rev=1.189&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?rev=1.189&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?r1=1.188&r2=1.189 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v retrieving revision 1.188 retrieving revision 1.189 diff -u -r1.188 -r1.189 --- ChangeLog 10 Apr 2014 19:35:36 -0000 1.188 +++ ChangeLog 12 Apr 2014 09:44:01 -0000 1.189 @@ -1,6 +1,10 @@ # ChangeLog for sys-devel/llvm # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.188 2014/04/10 19:35:36 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.189 2014/04/12 09:44:01 mgorny Exp $ + + 12 Apr 2014; Michał Górny <mgo...@gentoo.org> llvm-9999.ebuild: + Remove the cmake hack since upstream started installing cmake files from + Makefiles. *llvm-3.4-r2 (10 Apr 2014)
