* [gentoo-commits] gentoo-x86 commit in sys-devel/llvm: llvm-3.4.1-r2.ebuild ChangeLog llvm-3.4.1-r1.ebuild llvm-3.4-r2.ebuild
@ 2014-06-14 18:49 Michal Gorny (mgorny)
0 siblings, 0 replies; only message in thread
From: Michal Gorny (mgorny) @ 2014-06-14 18:49 UTC (permalink / raw
To: gentoo-commits
mgorny 14/06/14 18:49:46
Modified: ChangeLog
Added: llvm-3.4.1-r2.ebuild
Removed: llvm-3.4.1-r1.ebuild llvm-3.4-r2.ebuild
Log:
Fix fixing LLVMgold.so plugin path for GNU linker, bug #508838.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path
1.199 sys-devel/llvm/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?rev=1.199&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?rev=1.199&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?r1=1.198&r2=1.199
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -r1.198 -r1.199
--- ChangeLog 11 Jun 2014 07:49:45 -0000 1.198
+++ ChangeLog 14 Jun 2014 18:49:46 -0000 1.199
@@ -1,6 +1,13 @@
# 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.198 2014/06/11 07:49:45 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.199 2014/06/14 18:49:46 mgorny Exp $
+
+*llvm-3.4.1-r2 (14 Jun 2014)
+
+ 14 Jun 2014; Michał Górny <mgorny@gentoo.org> +llvm-3.4.1-r2.ebuild,
+ -llvm-3.4-r2.ebuild, -llvm-3.4.1-r1.ebuild,
+ files/clang-3.4-gentoo-install.patch:
+ Fix fixing LLVMgold.so plugin path for GNU linker, bug #508838.
11 Jun 2014; Michał Górny <mgorny@gentoo.org>
+files/llvm-3.4-cmake-configparser.patch, llvm-3.4-r2.ebuild,
1.1 sys-devel/llvm/llvm-3.4.1-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.4.1-r2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.4.1-r2.ebuild?rev=1.1&content-type=text/plain
Index: llvm-3.4.1-r2.ebuild
===================================================================
# 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-3.4.1-r2.ebuild,v 1.1 2014/06/14 18:49:46 mgorny Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 pypy )
# this causes some issues so make it optional for now.
# 3.5 will have CMakeFiles support in autotools.
WANT_CMAKE=cmake
inherit cmake-utils eutils flag-o-matic multibuild multilib \
multilib-minimal python-r1 toolchain-funcs pax-utils check-reqs
DESCRIPTION="Low Level Virtual Machine"
HOMEPAGE="http://llvm.org/"
SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.gz
clang? ( http://llvm.org/releases/${PV}/compiler-rt-3.4.src.tar.gz
http://llvm.org/releases/${PV}/cfe-${PV}.src.tar.gz
http://llvm.org/releases/${PV}/clang-tools-extra-3.4.src.tar.gz )
!doc? ( http://dev.gentoo.org/~mgorny/dist/${PN}-3.4-manpages.tar.bz2 )"
LICENSE="UoI-NCSA"
SLOT="0/3.4"
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="clang debug doc gold +libffi multitarget ncurses ocaml python
+static-analyzer test udis86 xml video_cards_radeon
kernel_Darwin kernel_FreeBSD"
COMMON_DEPEND="
sys-libs/zlib:0=
clang? (
python? ( ${PYTHON_DEPS} )
static-analyzer? (
dev-lang/perl:*
${PYTHON_DEPS}
)
xml? ( dev-libs/libxml2:2= )
)
gold? ( >=sys-devel/binutils-2.22:*[cxx] )
libffi? ( virtual/libffi:0=[${MULTILIB_USEDEP}] )
ncurses? ( sys-libs/ncurses:5=[${MULTILIB_USEDEP}] )
ocaml? ( dev-lang/ocaml:0= )
udis86? ( dev-libs/udis86:0=[pic(+),${MULTILIB_USEDEP}] )"
DEPEND="${COMMON_DEPEND}
dev-lang/perl
>=sys-devel/make-3.81
>=sys-devel/flex-2.5.4
>=sys-devel/bison-1.875d
|| ( >=sys-devel/gcc-3.0 >=sys-devel/gcc-apple-4.2.1
( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx )
)
|| ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-3.2.3 )
clang? ( xml? ( virtual/pkgconfig ) )
doc? ( dev-python/sphinx )
libffi? ( virtual/pkgconfig )
${PYTHON_DEPS}"
RDEPEND="${COMMON_DEPEND}
clang? ( !<=sys-devel/clang-3.4-r99
!>=sys-devel/clang-9999 )
abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r2
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
PDEPEND="clang? ( =sys-devel/clang-${PV}-r100 )"
# pypy gives me around 1700 unresolved tests due to open file limit
# being exceeded. probably GC does not close them fast enough.
REQUIRED_USE="${PYTHON_REQUIRED_USE}
test? ( || ( $(python_gen_useflags 'python*') ) )"
S=${WORKDIR}/${P}.src
# Some people actually override that in make.conf. That sucks since
# we need to run install per-directory, and ninja can't do that...
# so why did it call itself ninja in the first place?
CMAKE_MAKEFILE_GENERATOR=emake
MULTILIB_CHOST_TOOLS=(
/usr/bin/llvm-config
)
pkg_pretend() {
# in megs
# !clang !debug !multitarget -O2 400
# !clang !debug multitarget -O2 550
# clang !debug !multitarget -O2 950
# clang !debug multitarget -O2 1200
# !clang debug multitarget -O2 5G
# clang !debug multitarget -O0 -g 12G
# clang debug multitarget -O2 16G
# clang debug multitarget -O0 -g 14G
local build_size=550
use clang && build_size=1200
if use debug; then
ewarn "USE=debug is known to increase the size of package considerably"
ewarn "and cause the tests to fail."
ewarn
(( build_size *= 14 ))
elif is-flagq -g || is-flagq -ggdb; then
ewarn "The C++ compiler -g option is known to increase the size of the package"
ewarn "considerably. If you run out of space, please consider removing it."
ewarn
(( build_size *= 10 ))
fi
# Multiply by number of ABIs :).
local abis=( $(multilib_get_enabled_abis) )
(( build_size *= ${#abis[@]} ))
local CHECKREQS_DISK_BUILD=${build_size}M
check-reqs_pkg_pretend
}
pkg_setup() {
pkg_pretend
# 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 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 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"
elog "solutions."
die "Your currently active version of gcc is known to miscompile llvm"
fi
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"
elog "solutions."
die "Your currently active version of gcc is known to miscompile llvm"
fi
}
src_unpack() {
default
rm -f "${S}"/tools/clang "${S}"/projects/compiler-rt \
|| die "symlinks removal failed"
if use clang; then
mv "${WORKDIR}"/cfe-${PV}.src "${S}"/tools/clang \
|| die "clang source directory move failed"
mv "${WORKDIR}"/compiler-rt-3.4 "${S}"/projects/compiler-rt \
|| die "compiler-rt source directory move failed"
mv "${WORKDIR}"/clang-tools-extra-3.4 "${S}"/tools/clang/tools/extra \
|| die "clang-tools-extra source directory move failed"
fi
}
src_prepare() {
epatch "${FILESDIR}"/${PN}-3.2-nodoctargz.patch
epatch "${FILESDIR}"/${PN}-3.4-gentoo-install.patch
# Hack cmake search path for Gentoo, bug #496480
epatch "${FILESDIR}"/${PN}-3.3-cmake-modulepath.patch
# Use built-in ConfigParser to avoid failures with configparser-3.2
# https://bugs.gentoo.org/show_bug.cgi?id=500856
epatch "${FILESDIR}"/${PN}-3.4-cmake-configparser.patch
if use clang; then
# Automatically select active system GCC's libraries, bugs #406163 and #417913
epatch "${FILESDIR}"/clang-3.1-gentoo-runtime-gcc-detection-v3.patch
epatch "${FILESDIR}"/clang-3.4-gentoo-install.patch
fi
if use prefix && use clang; then
sed -e "/^CFLAGS /s@-Werror@-I${EPREFIX}/usr/include@" \
-i 'projects/compiler-rt/make/platform/clang_linux.mk' || die
fi
local sub_files=(
Makefile.config.in
Makefile.rules
tools/llvm-config/llvm-config.cpp
)
use clang && sub_files+=(
tools/clang/lib/Driver/Tools.cpp
tools/clang/tools/scan-build/scan-build
)
# unfortunately ./configure won't listen to --mandir and the-like, so take
# care of this.
# note: we're setting the main libdir intentionally.
# where per-ABI is appropriate, we use $(GENTOO_LIBDIR) make.
einfo "Fixing install dirs"
sed -e "s,@libdir@,$(get_libdir),g" \
-e "s,@PF@,${PF},g" \
-e "s,@EPREFIX@,${EPREFIX},g" \
-i "${sub_files[@]}" \
|| die "install paths sed failed"
# User patches
epatch_user
python_setup
}
multilib_src_configure() {
# disable timestamps since they confuse ccache
local conf_flags=(
--disable-timestamps
--enable-keep-symbols
--enable-shared
--with-optimize-option=
$(use_enable !debug optimized)
$(use_enable debug assertions)
$(use_enable debug expensive-checks)
$(use_enable ncurses terminfo)
$(use_enable libffi)
)
if use clang; then
conf_flags+=( --with-clang-resource-dir=../lib/clang/${PV} )
fi
# well, it's used only by clang executable c-index-test
if multilib_is_native_abi && use clang && 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
targets='all'
else
targets='host,cpp'
use video_cards_radeon && targets+=',r600'
fi
conf_flags+=( --enable-targets=${targets} )
if multilib_is_native_abi; then
use gold && conf_flags+=( --with-binutils-include="${EPREFIX}"/usr/include/ )
# extra commas don't hurt
use ocaml && bindings+=',ocaml'
fi
[[ ${bindings} ]] || bindings='none'
conf_flags+=( --enable-bindings=${bindings} )
if use udis86; then
conf_flags+=( --with-udis86 )
fi
if use libffi; then
local CPPFLAGS=${CPPFLAGS}
append-cppflags "$(pkg-config --cflags libffi)"
fi
# llvm prefers clang over gcc, so we may need to force that
tc-export CC CXX
ECONF_SOURCE=${S} \
econf "${conf_flags[@]}"
multilib_is_native_abi && 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() {
MAKEARGS=(
VERBOSE=1
REQUIRES_RTTI=1
GENTOO_LIBDIR=$(get_libdir)
)
# for tests, we want it all! otherwise, we may use a little filtering...
# adding ONLY_TOOLS also disables unittest building...
if [[ ${EBUILD_PHASE_FUNC} != src_test ]]; then
local tools=( llvm-config )
use clang && tools+=( clang )
if multilib_is_native_abi; then
tools+=(
opt llvm-as llvm-dis llc llvm-ar llvm-nm llvm-link lli
llvm-extract llvm-mc llvm-bcanalyzer llvm-diff macho-dump
llvm-objdump llvm-readobj llvm-rtdyld llvm-dwarfdump llvm-cov
llvm-size llvm-stress llvm-mcmarkup llvm-symbolizer obj2yaml
yaml2obj lto bugpoint
)
# the build system runs explicitly specified tools in parallel,
# so we need to split it into two runs
if [[ ${1} != -1 ]]; then
# those require lto
tools+=( llvm-lto )
use gold && tools+=( gold )
# those require clang :)
# we need to explicitly specify all its tools
# since we're passing BUILD_CLANG_ONLY
use clang && tools+=(
clang/tools/{clang-check,clang-format,extra}
)
fi
fi
MAKEARGS+=(
# filter tools + disable unittests implicitly
ONLY_TOOLS="${tools[*]}"
# this disables unittests & docs from clang
BUILD_CLANG_ONLY=YES
)
fi
}
multilib_src_compile() {
local MAKEARGS
set_makeargs -1
emake "${MAKEARGS[@]}"
if multilib_is_native_abi; then
set_makeargs
emake -C tools "${MAKEARGS[@]}"
if use doc; then
emake -C "${S}"/docs -f Makefile.sphinx man
use clang && emake -C "${S}"/tools/clang/docs/tools \
BUILD_FOR_WEBSITE=1 DST_MAN_DIR="${T}"/ man
emake -C "${S}"/docs -f Makefile.sphinx html
fi
fi
if use debug; then
pax-mark m Debug+Asserts+Checks/bin/llvm-rtdyld
pax-mark m Debug+Asserts+Checks/bin/lli
else
pax-mark m Release/bin/llvm-rtdyld
pax-mark m Release/bin/lli
fi
}
multilib_src_test() {
local MAKEARGS
set_makeargs
# build the remaining tools & unittests
emake "${MAKEARGS[@]}"
pax-mark m unittests/ExecutionEngine/JIT/Release/JITTests
pax-mark m unittests/ExecutionEngine/MCJIT/Release/MCJITTests
pax-mark m unittests/Support/Release/SupportTests
# respect TMPDIR!
local -x LIT_PRESERVES_TMP=1
emake "${MAKEARGS[@]}" check
use clang && emake "${MAKEARGS[@]}" -C tools/clang test
}
src_install() {
local MULTILIB_WRAPPED_HEADERS=(
/usr/include/llvm/Config/config.h
/usr/include/llvm/Config/llvm-config.h
)
use clang && MULTILIB_WRAPPED_HEADERS+=(
/usr/include/clang/Config/config.h
)
multilib-minimal_src_install
# Remove unnecessary headers on FreeBSD, bug #417171
use kernel_FreeBSD && use clang && rm "${ED}"usr/lib/clang/${PV}/include/{std,float,iso,limits,tgmath,varargs}*.h
}
multilib_src_install() {
local MAKEARGS
set_makeargs
local root=${D}/_${ABI}
emake "${MAKEARGS[@]}" DESTDIR="${root}" install
multibuild_merge_root "${root}" "${D}"
# Fix broken alias.
ln -sf libLLVM-${PV}$(get_libname) \
"${ED%/}"/usr/$(get_libdir)/libLLVM-3.4$(get_libname) || die
if ! multilib_is_native_abi; then
# Backwards compat, will be happily removed someday.
dosym "${CHOST}"-llvm-config /usr/bin/llvm-config.${ABI}
else
# Install docs.
if use doc; then
doman "${S}"/docs/_build/man/*.1
use clang && doman "${T}"/clang.1
dohtml -r "${S}"/docs/_build/html/
else
if ! use clang; then
rm "${WORKDIR}"/${PN}-3.4-manpages/clang.1 || die
fi
doman "${WORKDIR}"/${PN}-3.4-manpages/*.1
fi
# Symlink the gold plugin.
if use gold; then
dodir /usr/${CHOST}/binutils-bin/lib/bfd-plugins
dosym ../../../../$(get_libdir)/LLVMgold.so \
/usr/${CHOST}/binutils-bin/lib/bfd-plugins/LLVMgold.so
fi
# install cmake modules
if use cmake; then
emake -C "${S%/}"_cmake/cmake/modules DESTDIR="${D}" install
fi
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= libpv=${PV}
if [[ ${CHOST} == *-darwin* ]] ; then
eval $(grep PACKAGE_VERSION= configure)
[[ -n ${PACKAGE_VERSION} ]] && libpv=${PACKAGE_VERSION}
for lib in lib{EnhancedDisassembly,LLVM-${libpv},LTO,profile_rt,clang}.dylib LLVMHello.dylib ; do
# libEnhancedDisassembly is Darwin10 only, so non-fatal
# + omit clang libs if not enabled
[[ -f ${ED}/usr/lib/${lib} ]] || continue
ebegin "fixing install_name of $lib"
install_name_tool \
-id "${EPREFIX}"/usr/lib/${lib} \
"${ED}"/usr/lib/${lib}
eend $?
done
for f in "${ED}"/usr/bin/* "${ED}"/usr/lib/lib{LTO,clang}.dylib ; do
# omit clang libs if not enabled
[[ -f ${ED}/usr/lib/${lib} ]] || continue
odylib=$(scanmacho -BF'%n#f' "${f}" | tr ',' '\n' | grep libLLVM-${libpv}.dylib)
ebegin "fixing install_name reference to ${odylib} of ${f##*/}"
install_name_tool \
-change "${odylib}" \
"${EPREFIX}"/usr/lib/libLLVM-${libpv}.dylib \
-change "@rpath/libclang.dylib" \
"${EPREFIX}"/usr/lib/libclang.dylib \
-change "${S}"/Release/lib/libclang.dylib \
"${EPREFIX}"/usr/lib/libclang.dylib \
"${f}"
eend $?
done
fi
}
multilib_src_install_all() {
insinto /usr/share/vim/vimfiles/syntax
doins utils/vim/*.vim
if use clang; then
cd tools/clang || die
if use static-analyzer ; then
dobin tools/scan-build/ccc-analyzer
dosym ccc-analyzer /usr/bin/c++-analyzer
dobin tools/scan-build/scan-build
insinto /usr/share/${PN}
doins tools/scan-build/scanview.css
doins tools/scan-build/sorttable.js
fi
python_inst() {
if use static-analyzer ; then
pushd tools/scan-view >/dev/null || die
python_doscript scan-view
touch __init__.py || die
python_moduleinto clang
python_domodule __init__.py Reporter.py Resources ScanView.py startfile.py
popd >/dev/null || die
fi
if use python ; then
pushd bindings/python/clang >/dev/null || die
python_moduleinto clang
python_domodule __init__.py cindex.py enumerations.py
popd >/dev/null || die
fi
# AddressSanitizer symbolizer (currently separate)
python_doscript "${S}"/projects/compiler-rt/lib/asan/scripts/asan_symbolize.py
}
python_foreach_impl python_inst
fi
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2014-06-14 18:49 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-14 18:49 [gentoo-commits] gentoo-x86 commit in sys-devel/llvm: llvm-3.4.1-r2.ebuild ChangeLog llvm-3.4.1-r1.ebuild llvm-3.4-r2.ebuild Michal Gorny (mgorny)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox