From: "Michal Gorny (mgorny)" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in sys-devel/llvm: llvm-9999.ebuild ChangeLog
Date: Fri, 20 Dec 2013 10:53:47 +0000 (UTC) [thread overview]
Message-ID: <20131220105347.252262004B@flycatcher.gentoo.org> (raw)
mgorny 13/12/20 10:53:47
Modified: llvm-9999.ebuild ChangeLog
Log:
Fix gcc version check. Add missing libxml2 dependency (for clang). Install CMake modules.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path
1.67 sys-devel/llvm/llvm-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?rev=1.67&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?rev=1.67&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?r1=1.66&r2=1.67
Index: llvm-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- llvm-9999.ebuild 19 Dec 2013 19:08:25 -0000 1.66
+++ llvm-9999.ebuild 20 Dec 2013 10:53:46 -0000 1.67
@@ -1,12 +1,12 @@
# Copyright 1999-2013 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.66 2013/12/19 19:08:25 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.67 2013/12/20 10:53:46 mgorny Exp $
EAPI=5
PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
-inherit eutils flag-o-matic git-r3 multilib multilib-minimal \
+inherit cmake-utils eutils flag-o-matic git-r3 multilib multilib-minimal \
python-r1 toolchain-funcs pax-utils check-reqs
DESCRIPTION="Low Level Virtual Machine"
@@ -19,7 +19,9 @@
SLOT="0/${PV}"
KEYWORDS=""
IUSE="clang debug doc gold +libffi multitarget ncurses ocaml python
- +static-analyzer test udis86 video_cards_radeon kernel_Darwin"
+ +static-analyzer test udis86 xml video_cards_radeon kernel_Darwin"
+
+# TODO: update libxml2 to multilib, bug #480404
COMMON_DEPEND="
sys-libs/zlib:0=
@@ -29,6 +31,7 @@
dev-lang/perl
${PYTHON_DEPS}
)
+ xml? ( dev-libs/libxml2:2= )
)
gold? ( >=sys-devel/binutils-2.22[cxx] )
libffi? ( virtual/libffi:0=[${MULTILIB_USEDEP}] )
@@ -99,20 +102,20 @@
# 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 "
+ 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
+ if has "${gcc_vers}" "${broken_gcc[@]}"; 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
+ if use abi_x86_32 && has "${gcc_vers}" "${broken_gcc_x86[@]}"; 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"
@@ -120,8 +123,7 @@
die "Your currently active version of gcc is known to miscompile llvm"
fi
- if [[ ${CHOST} == x86_64-* && ${broken_gcc_amd64} == *" ${version} "* ]];
- then
+ if use abi_x86_64 && has "${gcc_vers}" "${broken_gcc_amd64[@]}"; 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"
@@ -195,6 +197,12 @@
if use clang; then
conf_flags+=( --with-clang-resource-dir=../lib/clang/3.5 )
fi
+ # well, it's used only by clang but easier to pass unconditionally
+ if use xml; then
+ conf_flags+=( XML2CONFIG="$(tc-getPKG_CONFIG) libxml-2.0" )
+ else
+ conf_flags+=( ac_cv_prog_XML2CONFIG="" )
+ fi
local targets bindings
if use multitarget; then
@@ -231,6 +239,25 @@
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() {
@@ -338,6 +365,9 @@
dodir /usr/${CHOST}/binutils-bin/lib/bfd-plugins
dosym ../../../../$(get_libdir)/LLVMgold.so \
/usr/${CHOST}/binutils-bin/lib/bfd-plugins/LLVMgold.so
+
+ # install cmake modules
+ emake -C "${S%/}"_cmake/cmake/modules DESTDIR="${D}" install
else
# Preserve ABI-variant of llvm-config,
# then drop all the executables since LLVM doesn't like to
1.153 sys-devel/llvm/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?rev=1.153&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?rev=1.153&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?r1=1.152&r2=1.153
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- ChangeLog 19 Dec 2013 19:08:25 -0000 1.152
+++ ChangeLog 20 Dec 2013 10:53:47 -0000 1.153
@@ -1,6 +1,10 @@
# ChangeLog for sys-devel/llvm
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.152 2013/12/19 19:08:25 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.153 2013/12/20 10:53:47 mgorny Exp $
+
+ 20 Dec 2013; Michał Górny <mgorny@gentoo.org> llvm-9999.ebuild:
+ Fix gcc version check. Add missing libxml2 dependency (for clang). Install
+ CMake modules.
19 Dec 2013; Michał Górny <mgorny@gentoo.org> llvm-9999.ebuild:
Symlink the LLVM gold plugin to bfd-plugins directory to enable LLVM object
next reply other threads:[~2013-12-20 10:53 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-20 10:53 Michal Gorny (mgorny) [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-07-19 17:29 [gentoo-commits] gentoo-x86 commit in sys-devel/llvm: llvm-9999.ebuild ChangeLog Michal Gorny (mgorny)
2015-06-13 20:51 Michal Gorny (mgorny)
2015-06-13 12:10 Michal Gorny (mgorny)
2015-06-13 12:00 Michal Gorny (mgorny)
2015-06-09 21:17 Michal Gorny (mgorny)
2015-06-09 16:54 Michal Gorny (mgorny)
2015-02-04 10:55 Michal Gorny (mgorny)
2014-12-31 10:37 Michal Gorny (mgorny)
2014-06-29 9:59 Michal Gorny (mgorny)
2014-04-12 9:44 Michal Gorny (mgorny)
2014-04-10 17:03 Michal Gorny (mgorny)
2014-04-07 20:59 Michal Gorny (mgorny)
2014-03-11 18:40 Michal Gorny (mgorny)
2014-01-06 21:16 Michal Gorny (mgorny)
2013-12-28 14:02 Michal Gorny (mgorny)
2013-12-27 14:43 Michal Gorny (mgorny)
2013-12-24 20:07 Michal Gorny (mgorny)
2013-12-24 10:09 Michal Gorny (mgorny)
2013-12-20 21:50 Michal Gorny (mgorny)
2013-12-20 13:18 Michal Gorny (mgorny)
2013-12-19 19:08 Michal Gorny (mgorny)
2013-12-19 17:26 Michal Gorny (mgorny)
2013-12-19 17:22 Michal Gorny (mgorny)
2013-12-19 11:08 Michal Gorny (mgorny)
2013-12-03 14:02 Michal Gorny (mgorny)
2013-11-30 10:33 Michal Gorny (mgorny)
2013-11-27 5:32 Michal Gorny (mgorny)
2013-11-12 18:30 Michal Gorny (mgorny)
2013-10-31 16:22 Michal Gorny (mgorny)
2013-10-13 7:44 Michal Gorny (mgorny)
2013-09-13 15:10 Michal Gorny (mgorny)
2013-09-10 8:22 Michal Gorny (mgorny)
2013-09-07 13:08 Michal Gorny (mgorny)
2013-03-21 9:12 Chi-Thanh Christopher Nguyen (chithanh)
2013-03-19 12:42 Chi-Thanh Christopher Nguyen (chithanh)
2012-05-10 6:03 Patrick Lauer (patrick)
2012-04-30 15:19 Fabian Groffen (grobian)
2012-04-30 15:09 Fabian Groffen (grobian)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20131220105347.252262004B@flycatcher.gentoo.org \
--to=mgorny@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox