* [gentoo-commits] gentoo-x86 commit in sys-devel/llvm: llvm-9999.ebuild llvm-3.5.0.ebuild ChangeLog
@ 2014-09-07 11:12 Michal Gorny (mgorny)
0 siblings, 0 replies; 3+ messages in thread
From: Michal Gorny (mgorny) @ 2014-09-07 11:12 UTC (permalink / raw
To: gentoo-commits
mgorny 14/09/07 11:12:00
Modified: llvm-9999.ebuild ChangeLog
Added: llvm-3.5.0.ebuild
Log:
Version bump, bug #522188.
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path
1.90 sys-devel/llvm/llvm-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?rev=1.90&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?rev=1.90&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?r1=1.89&r2=1.90
Index: llvm-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- llvm-9999.ebuild 14 Jul 2014 14:53:52 -0000 1.89
+++ llvm-9999.ebuild 7 Sep 2014 11:12:00 -0000 1.90
@@ -1,10 +1,10 @@
# 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.89 2014/07/14 14:53:52 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.90 2014/09/07 11:12:00 mgorny Exp $
EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} pypy pypy2_0 )
+PYTHON_COMPAT=( python2_7 pypy )
inherit eutils flag-o-matic git-r3 multibuild multilib \
multilib-minimal python-r1 toolchain-funcs pax-utils check-reqs
@@ -18,8 +18,9 @@
LICENSE="UoI-NCSA"
SLOT="0/${PV}"
KEYWORDS=""
-IUSE="clang debug doc gold +libffi multitarget ncurses ocaml python
- +static-analyzer test udis86 xml video_cards_radeon kernel_Darwin"
+IUSE="clang debug doc gold libedit +libffi multitarget ncurses ocaml python
+ +static-analyzer test xml video_cards_radeon
+ kernel_Darwin"
COMMON_DEPEND="
sys-libs/zlib:0=
@@ -32,10 +33,10 @@
xml? ( dev-libs/libxml2:2= )
)
gold? ( >=sys-devel/binutils-2.22:*[cxx] )
+ libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
ncurses? ( >=sys-libs/ncurses-5.9-r3:5=[${MULTILIB_USEDEP}] )
- ocaml? ( dev-lang/ocaml:0= )
- udis86? ( >=dev-libs/udis86-1.7-r2:0=[pic(+),${MULTILIB_USEDEP}] )"
+ ocaml? ( dev-lang/ocaml:0= )"
DEPEND="${COMMON_DEPEND}
dev-lang/perl
dev-python/sphinx
@@ -50,10 +51,10 @@
libffi? ( virtual/pkgconfig )
${PYTHON_DEPS}"
RDEPEND="${COMMON_DEPEND}
- clang? ( !<=sys-devel/clang-9999-r99 )
+ clang? ( !<=sys-devel/clang-${PV}-r99 )
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-9999-r100 )"
+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.
@@ -99,41 +100,22 @@
local CHECKREQS_DISK_BUILD=${build_size}M
check-reqs_pkg_pretend
+
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ echo 'int main() {return 0;}' > "${T}"/test.cxx || die
+ ebegin "Trying to build a C++11 test program"
+ if ! $(tc-getCXX) -std=c++11 -o /dev/null "${T}"/test.cxx; then
+ eerror "LLVM-${PV} requires C++11-capable C++ compiler. Your current compiler"
+ eerror "does not seem to support -std=c++11 option. Please upgrade your compiler"
+ eerror "to gcc-4.7 or an equivalent version supporting C++11."
+ die "Currently active compiler does not support -std=c++11"
+ fi
+ eend ${?}
+ fi
}
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() {
@@ -160,8 +142,15 @@
src_prepare() {
epatch "${FILESDIR}"/${PN}-3.2-nodoctargz.patch
+ epatch "${FILESDIR}"/${PN}-3.5-gcc-4.9.patch
epatch "${FILESDIR}"/${PN}-3.5-gentoo-install.patch
- use clang && epatch "${FILESDIR}"/clang-3.5-gentoo-install.patch
+
+ if use clang; then
+ # Automatically select active system GCC's libraries, bugs #406163 and #417913
+ epatch "${FILESDIR}"/clang-3.5-gentoo-runtime-gcc-detection-v3.patch
+
+ epatch "${FILESDIR}"/clang-3.5-gentoo-install.patch
+ fi
if use prefix && use clang; then
sed -e "/^CFLAGS /s@-Werror@-I${EPREFIX}/usr/include@" \
@@ -205,6 +194,7 @@
$(use_enable !debug optimized)
$(use_enable debug assertions)
$(use_enable debug expensive-checks)
+ $(use_enable libedit)
$(use_enable ncurses terminfo)
$(use_enable libffi)
)
@@ -234,10 +224,6 @@
[[ ${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)"
@@ -268,8 +254,8 @@
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
+ llvm-size llvm-stress llvm-mcmarkup llvm-profdata
+ llvm-symbolizer obj2yaml yaml2obj lto bugpoint
)
# the build system runs explicitly specified tools in parallel,
1.204 sys-devel/llvm/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?rev=1.204&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?rev=1.204&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?r1=1.203&r2=1.204
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -r1.203 -r1.204
--- ChangeLog 14 Jul 2014 14:53:52 -0000 1.203
+++ ChangeLog 7 Sep 2014 11:12:00 -0000 1.204
@@ -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.203 2014/07/14 14:53:52 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.204 2014/09/07 11:12:00 mgorny Exp $
+
+*llvm-3.5.0 (07 Sep 2014)
+
+ 07 Sep 2014; Michał Górny <mgorny@gentoo.org>
+ +files/clang-3.5-gentoo-runtime-gcc-detection-v3.patch,
+ +files/llvm-3.5-gcc-4.9.patch, +llvm-3.5.0.ebuild, llvm-9999.ebuild:
+ Version bump, bug #522188.
14 Jul 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org> llvm-3.3-r3.ebuild,
llvm-3.4.1-r2.ebuild, llvm-3.4.2.ebuild, llvm-9999.ebuild:
1.1 sys-devel/llvm/llvm-3.5.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.5.0.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.5.0.ebuild?rev=1.1&content-type=text/plain
Index: llvm-3.5.0.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.5.0.ebuild,v 1.1 2014/09/07 11:12:00 mgorny Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 pypy )
inherit 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.xz
clang? ( http://llvm.org/releases/${PV}/compiler-rt-${PV}.src.tar.xz
http://llvm.org/releases/${PV}/cfe-${PV}.src.tar.xz
http://llvm.org/releases/${PV}/clang-tools-extra-${PV}.src.tar.xz )
!doc? ( http://dev.gentoo.org/~voyageur/distfiles/${P}-manpages.tar.bz2 )"
LICENSE="UoI-NCSA"
SLOT="0/3.5"
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 libedit +libffi multitarget ncurses ocaml python
+static-analyzer test 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] )
libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
ncurses? ( >=sys-libs/ncurses-5.9-r3:5=[${MULTILIB_USEDEP}] )
ocaml? ( dev-lang/ocaml:0= )"
DEPEND="${COMMON_DEPEND}
app-arch/xz-utils
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-${PV}-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
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
if [[ ${MERGE_TYPE} != binary ]]; then
echo 'int main() {return 0;}' > "${T}"/test.cxx || die
ebegin "Trying to build a C++11 test program"
if ! $(tc-getCXX) -std=c++11 -o /dev/null "${T}"/test.cxx; then
eerror "LLVM-${PV} requires C++11-capable C++ compiler. Your current compiler"
eerror "does not seem to support -std=c++11 option. Please upgrade your compiler"
eerror "to gcc-4.7 or an equivalent version supporting C++11."
die "Currently active compiler does not support -std=c++11"
fi
eend ${?}
fi
}
pkg_setup() {
pkg_pretend
}
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-${PV}.src "${S}"/projects/compiler-rt \
|| die "compiler-rt source directory move failed"
mv "${WORKDIR}"/clang-tools-extra-${PV}.src "${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.5-gcc-4.9.patch
epatch "${FILESDIR}"/${PN}-3.5-gentoo-install.patch
if use clang; then
# Automatically select active system GCC's libraries, bugs #406163 and #417913
epatch "${FILESDIR}"/clang-3.5-gentoo-runtime-gcc-detection-v3.patch
epatch "${FILESDIR}"/clang-3.5-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"
if use clang; then
# constantly fails for a long time, likely due to our patches
rm tools/clang/test/Driver/cross-linux.c || die
fi
# 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 libedit)
$(use_enable ncurses terminfo)
$(use_enable libffi)
)
# 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 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[@]}"
}
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-profdata
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_CHOST_TOOLS=(
/usr/bin/llvm-config
)
local MULTILIB_WRAPPED_HEADERS=(
/usr/include/llvm/Config/config.h
/usr/include/llvm/Config/llvm-config.h
)
if use clang; then
# note: magic applied below
MULTILIB_CHOST_TOOLS+=(
/usr/bin/clang
/usr/bin/clang++
/usr/bin/clang-${PV}
/usr/bin/clang++-${PV}
)
MULTILIB_WRAPPED_HEADERS+=(
/usr/include/clang/Config/config.h
)
fi
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}"
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}"/${P}-manpages/clang.1 || die
fi
doman "${WORKDIR}"/${P}-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
fi
# apply CHOST and PV to clang executables
# they're statically linked so we don't have to worry about the lib
if use clang; then
local clang_tools=( clang clang++ )
local i
# append ${PV} and symlink back
# TODO: use alternatives.eclass? does that make any sense?
# maybe with USE=-clang on :0 and USE=clang on older
for i in "${clang_tools[@]}"; do
mv "${ED%/}/usr/bin/${i}"{,-${PV}} || die
dosym "${i}"-${PV} /usr/bin/${i}
done
# now prepend ${CHOST} and let the multilib-build.eclass symlink it
if ! multilib_is_native_abi; then
# non-native? let's replace it with a simple wrapper
for i in "${clang_tools[@]}"; do
rm "${ED%/}/usr/bin/${i}-${PV}" || die
cat > "${T}"/wrapper.tmp <<-_EOF_
#!${EPREFIX}/bin/sh
exec "${i}-${PV}" $(get_abi_CFLAGS) "\${@}"
_EOF_
newbin "${T}"/wrapper.tmp "${i}-${PV}"
done
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] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-devel/llvm: llvm-9999.ebuild llvm-3.5.0.ebuild ChangeLog
@ 2014-09-29 16:03 Michal Gorny (mgorny)
0 siblings, 0 replies; 3+ messages in thread
From: Michal Gorny (mgorny) @ 2014-09-29 16:03 UTC (permalink / raw
To: gentoo-commits
mgorny 14/09/29 16:03:23
Modified: llvm-9999.ebuild llvm-3.5.0.ebuild ChangeLog
Log:
Block configparser-3.2 since it is known to break the build.
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path
1.91 sys-devel/llvm/llvm-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?rev=1.91&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?rev=1.91&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?r1=1.90&r2=1.91
Index: llvm-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- llvm-9999.ebuild 7 Sep 2014 11:12:00 -0000 1.90
+++ llvm-9999.ebuild 29 Sep 2014 16:03:23 -0000 1.91
@@ -1,6 +1,6 @@
# 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.90 2014/09/07 11:12:00 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.91 2014/09/29 16:03:23 mgorny Exp $
EAPI=5
@@ -37,6 +37,7 @@
libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
ncurses? ( >=sys-libs/ncurses-5.9-r3:5=[${MULTILIB_USEDEP}] )
ocaml? ( dev-lang/ocaml:0= )"
+# configparser-3.2 breaks the build (3.3 or none at all are fine)
DEPEND="${COMMON_DEPEND}
dev-lang/perl
dev-python/sphinx
@@ -49,6 +50,7 @@
|| ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-3.2.3 )
clang? ( xml? ( virtual/pkgconfig ) )
libffi? ( virtual/pkgconfig )
+ !<dev-python/configparser-3.3.0.2
${PYTHON_DEPS}"
RDEPEND="${COMMON_DEPEND}
clang? ( !<=sys-devel/clang-${PV}-r99 )
1.3 sys-devel/llvm/llvm-3.5.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.5.0.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.5.0.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.5.0.ebuild?r1=1.2&r2=1.3
Index: llvm-3.5.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.5.0.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- llvm-3.5.0.ebuild 16 Sep 2014 14:33:37 -0000 1.2
+++ llvm-3.5.0.ebuild 29 Sep 2014 16:03:23 -0000 1.3
@@ -1,6 +1,6 @@
# 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.5.0.ebuild,v 1.2 2014/09/16 14:33:37 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.5.0.ebuild,v 1.3 2014/09/29 16:03:23 mgorny Exp $
EAPI=5
@@ -39,6 +39,7 @@
libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
ncurses? ( >=sys-libs/ncurses-5.9-r3:5=[${MULTILIB_USEDEP}] )
ocaml? ( dev-lang/ocaml:0= )"
+# configparser-3.2 breaks the build (3.3 or none at all are fine)
DEPEND="${COMMON_DEPEND}
app-arch/xz-utils
dev-lang/perl
@@ -52,6 +53,7 @@
clang? ( xml? ( virtual/pkgconfig ) )
doc? ( dev-python/sphinx )
libffi? ( virtual/pkgconfig )
+ !<dev-python/configparser-3.3.0.2
${PYTHON_DEPS}"
RDEPEND="${COMMON_DEPEND}
clang? ( !<=sys-devel/clang-${PV}-r99
1.208 sys-devel/llvm/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?rev=1.208&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?rev=1.208&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?r1=1.207&r2=1.208
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -r1.207 -r1.208
--- ChangeLog 18 Sep 2014 20:06:55 -0000 1.207
+++ ChangeLog 29 Sep 2014 16:03:23 -0000 1.208
@@ -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.207 2014/09/18 20:06:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.208 2014/09/29 16:03:23 mgorny Exp $
+
+ 29 Sep 2014; Michał Górny <mgorny@gentoo.org> llvm-3.5.0.ebuild,
+ llvm-9999.ebuild:
+ Block configparser-3.2 since it is known to break the build.
18 Sep 2014; Michał Górny <mgorny@gentoo.org>
files/clang-3.5-gentoo-runtime-gcc-detection-v3.patch:
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-devel/llvm: llvm-9999.ebuild llvm-3.5.0.ebuild ChangeLog
@ 2014-12-31 2:04 Mike Frysinger (vapier)
0 siblings, 0 replies; 3+ messages in thread
From: Mike Frysinger (vapier) @ 2014-12-31 2:04 UTC (permalink / raw
To: gentoo-commits
vapier 14/12/31 02:04:45
Modified: llvm-9999.ebuild llvm-3.5.0.ebuild ChangeLog
Log:
Fix typo with location of --disable-shared.
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path
1.95 sys-devel/llvm/llvm-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?rev=1.95&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?rev=1.95&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?r1=1.94&r2=1.95
Index: llvm-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- llvm-9999.ebuild 26 Nov 2014 16:13:33 -0000 1.94
+++ llvm-9999.ebuild 31 Dec 2014 02:04:45 -0000 1.95
@@ -1,6 +1,6 @@
# 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.94 2014/11/26 16:13:33 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.95 2014/12/31 02:04:45 vapier Exp $
EAPI=5
@@ -193,6 +193,7 @@
--enable-keep-symbols
--enable-shared
--with-optimize-option=
+ $(tc-is-static-only && echo --disable-shared)
$(use_enable !debug optimized)
$(use_enable debug assertions)
$(use_enable debug expensive-checks)
1.9 sys-devel/llvm/llvm-3.5.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.5.0.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.5.0.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-3.5.0.ebuild?r1=1.8&r2=1.9
Index: llvm-3.5.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.5.0.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- llvm-3.5.0.ebuild 28 Dec 2014 12:06:22 -0000 1.8
+++ llvm-3.5.0.ebuild 31 Dec 2014 02:04:45 -0000 1.9
@@ -1,6 +1,6 @@
# 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.5.0.ebuild,v 1.8 2014/12/28 12:06:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.5.0.ebuild,v 1.9 2014/12/31 02:04:45 vapier Exp $
EAPI=5
@@ -75,7 +75,6 @@
CMAKE_MAKEFILE_GENERATOR=emake
pkg_pretend() {
- $(tc-is-static-only && echo --disable-shared) \
# in megs
# !clang !debug !multitarget -O2 400
# !clang !debug multitarget -O2 550
@@ -203,6 +202,7 @@
--enable-keep-symbols
--enable-shared
--with-optimize-option=
+ $(tc-is-static-only && echo --disable-shared)
$(use_enable !debug optimized)
$(use_enable debug assertions)
$(use_enable debug expensive-checks)
1.214 sys-devel/llvm/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?rev=1.214&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?rev=1.214&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?r1=1.213&r2=1.214
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -r1.213 -r1.214
--- ChangeLog 28 Dec 2014 12:06:22 -0000 1.213
+++ ChangeLog 31 Dec 2014 02:04:45 -0000 1.214
@@ -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.213 2014/12/28 12:06:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.214 2014/12/31 02:04:45 vapier Exp $
+
+ 31 Dec 2014; Mike Frysinger <vapier@gentoo.org> llvm-3.5.0.ebuild,
+ llvm-9999.ebuild:
+ Fix typo with location of --disable-shared.
28 Dec 2014; Agostino Sarubbo <ago@gentoo.org> llvm-3.5.0.ebuild:
Stable for x86, wrt bug #530882
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-12-31 2:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-07 11:12 [gentoo-commits] gentoo-x86 commit in sys-devel/llvm: llvm-9999.ebuild llvm-3.5.0.ebuild ChangeLog Michal Gorny (mgorny)
-- strict thread matches above, loose matches on Subject: below --
2014-09-29 16:03 Michal Gorny (mgorny)
2014-12-31 2:04 Mike Frysinger (vapier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox