* [gentoo-commits] dev/mgorny:master commit in: sys-devel/llvm/
@ 2013-07-10 9:58 Michał Górny
0 siblings, 0 replies; 16+ messages in thread
From: Michał Górny @ 2013-07-10 9:58 UTC (permalink / raw
To: gentoo-commits
commit: 39cb220980fdea595e878788c1eaffeac030d8c9
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 10 09:58:17 2013 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jul 10 09:58:17 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=39cb2209
LLVM: -r1 the new ebuild.
---
sys-devel/llvm/{llvm-9999.ebuild => llvm-9999-r1.ebuild} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999-r1.ebuild
similarity index 100%
rename from sys-devel/llvm/llvm-9999.ebuild
rename to sys-devel/llvm/llvm-9999-r1.ebuild
^ permalink raw reply [flat|nested] 16+ messages in thread
* [gentoo-commits] dev/mgorny:master commit in: sys-devel/llvm/
@ 2013-07-12 16:46 Michał Górny
0 siblings, 0 replies; 16+ messages in thread
From: Michał Górny @ 2013-07-12 16:46 UTC (permalink / raw
To: gentoo-commits
commit: ab766db3fd6ad20316eca1c6c9ce55762d335542
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 12 16:46:38 2013 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jul 12 16:46:38 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=ab766db3
sys-devel/llvm: convert to multilib and clean up.
---
sys-devel/llvm/llvm-9999-r1.ebuild | 148 +++++++++++++++++++++++++------------
1 file changed, 102 insertions(+), 46 deletions(-)
diff --git a/sys-devel/llvm/llvm-9999-r1.ebuild b/sys-devel/llvm/llvm-9999-r1.ebuild
index 18e1a20..1e48dcc 100644
--- a/sys-devel/llvm/llvm-9999-r1.ebuild
+++ b/sys-devel/llvm/llvm-9999-r1.ebuild
@@ -6,7 +6,8 @@ EAPI=5
PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
-inherit subversion eutils flag-o-matic multilib python-r1 toolchain-funcs pax-utils
+inherit subversion eutils flag-o-matic multilib multilib-minimal \
+ python-r1 toolchain-funcs pax-utils
DESCRIPTION="Low Level Virtual Machine"
HOMEPAGE="http://llvm.org/"
@@ -16,7 +17,8 @@ ESVN_REPO_URI="http://llvm.org/svn/llvm-project/llvm/trunk"
LICENSE="UoI-NCSA"
SLOT="0"
KEYWORDS=""
-IUSE="clang debug doc gold +libffi multitarget ocaml python +static-analyzer test udis86 vim-syntax video_cards_radeon"
+IUSE="clang debug doc gold +libffi multitarget ocaml python
+ +static-analyzer test udis86 vim-syntax video_cards_radeon"
DEPEND="dev-lang/perl
dev-python/sphinx
@@ -30,11 +32,12 @@ DEPEND="dev-lang/perl
libffi? ( virtual/pkgconfig
virtual/libffi )
ocaml? ( dev-lang/ocaml )
- udis86? ( dev-libs/udis86[pic(+)] )
+ udis86? ( dev-libs/udis86[pic(+),${MULTILIB_USEDEP}] )
${PYTHON_DEPS}"
RDEPEND="dev-lang/perl
libffi? ( virtual/libffi )
python? ( ${PYTHON_DEPS} )
+ udis86? ( dev-libs/udis86[pic(+),${MULTILIB_USEDEP}] )
vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
!<=sys-devel/clang-9999-r99"
@@ -91,20 +94,30 @@ src_unpack() {
}
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 "/ActiveLibDir = ActivePrefix/s/lib/$(get_libdir)\/${PN}/" \
- -i tools/llvm-config/llvm-config.cpp || 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"
+ multilib_src_prepare() {
+ cd "${BUILD_DIR}" || die
+
+ # 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 "/ActiveLibDir = ActivePrefix/s/lib/$(get_libdir)\/${PN}/" \
+ -i tools/llvm-config/llvm-config.cpp || 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"
+
+ # Set correct path for the coverage lib
+ sed -e "s#lib\(/libprofile_rt.a\)#$(get_libdir)/llvm\1#" \
+ -i tools/clang/lib/Driver/Tools.cpp \
+ || die "driver tools paths sed failed"
+ }
+
if use gold; then
sed -e 's,\$(SharedLibDir),'"${EPREFIX}"/usr/$(get_libdir)/${PN}, \
-i tools/gold/Makefile || die "gold rpath sed failed"
@@ -115,16 +128,6 @@ src_prepare() {
|| die "FileCheck Makefile sed failed"
if use clang; then
- # multilib-strict
- sed -e "/PROJ_headers\|HeaderDir/s#lib/clang#$(get_libdir)/clang#" \
- -i tools/clang/lib/Headers/Makefile \
- || die "clang Makefile sed failed"
- sed -e "/PROJ_resources\|ResourceDir/s#lib/clang#$(get_libdir)/clang#" \
- -i tools/clang/runtime/compiler-rt/Makefile \
- || die "compiler-rt Makefile sed failed"
- sed -e "s#/lib/#/lib{{(32|64)?}}/#" \
- -i tools/clang/test/Preprocessor/iwithprefix.c \
- || die "clang test sed failed"
# fix the static analyzer for in-tree install
sed -e 's/import ScanView/from clang \0/' \
-i tools/clang/tools/scan-view/scan-view \
@@ -132,9 +135,8 @@ src_prepare() {
sed -e "/scanview.css\|sorttable.js/s#\$RealBin#${EPREFIX}/usr/share/${PN}#" \
-i tools/clang/tools/scan-build/scan-build \
|| die "scan-build sed failed"
- # Set correct path for gold plugin and coverage lib
+ # Set correct path for gold plugin
sed -e "/LLVMgold.so/s#lib/#$(get_libdir)/llvm/#" \
- -e "s#lib\(/libprofile_rt.a\)#$(get_libdir)/llvm\1#" \
-i tools/clang/lib/Driver/Tools.cpp \
|| die "driver tools paths sed failed"
fi
@@ -143,9 +145,12 @@ src_prepare() {
# User patches
epatch_user
+
+ multilib_copy_sources
+ multilib_foreach_abi multilib_src_prepare
}
-src_configure() {
+multilib_src_configure() {
local CONF_FLAGS="--enable-shared
--with-optimize-option=
$(use_enable !debug optimized)
@@ -166,14 +171,14 @@ src_configure() {
fi
fi
- if use amd64; then
+ if [[ ${ABI} == amd64 ]]; then
CONF_FLAGS="${CONF_FLAGS} --enable-pic"
fi
- if use gold; then
+ if multilib_is_native_abi && use gold; then
CONF_FLAGS="${CONF_FLAGS} --with-binutils-include=${EPREFIX}/usr/include/"
fi
- if use ocaml; then
+ if multilib_is_native_abi && use ocaml; then
CONF_FLAGS="${CONF_FLAGS} --enable-bindings=ocaml"
else
CONF_FLAGS="${CONF_FLAGS} --enable-bindings=none"
@@ -196,11 +201,28 @@ src_configure() {
econf ${CONF_FLAGS}
}
-src_compile() {
- emake VERBOSE=1 KEEP_SYMBOLS=1 REQUIRES_RTTI=1
+multilib_src_compile() {
+ local mymakeopts=(
+ VERBOSE=1
+ KEEP_SYMBOLS=1
+ REQUIRES_RTTI=1
+ )
+
+ # Tests need all the LLVM built.
+ if multilib_is_native_abi || use test; then
+ emake "${mymakeopts[@]}"
+ else
+ # we need to build libs for llvm, then whole clang,
+ # since libs-only omits clang dir
+ # and clang fails to sub-compile with libs-only.
+ emake "${mymakeopts[@]}" libs-only
+ emake -C tools/clang "${mymakeopts[@]}"
+ fi
- emake -C docs -f Makefile.sphinx man
- use doc && emake -C docs -f Makefile.sphinx html
+ if multilib_is_native_abi; then
+ emake -C docs -f Makefile.sphinx man
+ use doc && emake -C docs -f Makefile.sphinx html
+ fi
if use debug; then
pax-mark m Debug+Asserts+Checks/bin/lli
@@ -214,24 +236,51 @@ src_compile() {
fi
}
-src_test() {
+multilib_src_test() {
default
emake -C tools/clang test
}
-src_install() {
- emake KEEP_SYMBOLS=1 DESTDIR="${D}" install
+MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/llvm/Config/config.h
+ /usr/include/llvm/Config/llvm-config.h
+ /usr/include/clang/Config/config.h
+)
- doman docs/_build/man/*.1
- use doc && dohtml -r docs/_build/html/
+multilib_src_install() {
+ local mymakeopts=(
+ KEEP_SYMBOLS=1
+ DESTDIR="${D}"
+ )
- if use vim-syntax; then
- insinto /usr/share/vim/vimfiles/syntax
- doins utils/vim/*.vim
+ if multilib_is_native_abi; then
+ emake "${mymakeopts[@]}" install
+
+ # Move files back.
+ mv "${ED}"/tmp/llvm-config.* "${ED}"/usr/bin || die
+ else
+ # we need to install libs for llvm, then whole clang
+ # since libs-only omits clang dir
+ # and clang install-libs doesn't install headers and stuff
+ # (we build it anyway, so install is not a problem)
+ emake "${mymakeopts[@]}" install-libs
+ emake -C tools/clang "${mymakeopts[@]}" install
+
+ # Preserve ABI-variant of llvm-config,
+ # then drop all the executables since LLVM doesn't like to
+ # clobber when installing.
+ mkdir -p "${ED}"/tmp || die
+ mv "${ED}"/usr/bin/llvm-config "${ED}"/tmp/llvm-config.${ABI} || die
+ rm -r "${ED}"/usr/bin || die
fi
- if use clang; then
+ if multilib_is_native_abi; then
+ doman docs/_build/man/*.1
+ use doc && dohtml -r docs/_build/html/
+ fi
+
+ if multilib_is_native_abi && use clang; then
cd tools/clang || die
if use static-analyzer ; then
@@ -307,3 +356,10 @@ src_install() {
done
fi
}
+
+multilib_src_install_all() {
+ if use vim-syntax; then
+ insinto /usr/share/vim/vimfiles/syntax
+ doins utils/vim/*.vim
+ fi
+}
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] dev/mgorny:master commit in: sys-devel/llvm/
@ 2013-07-13 22:03 Michał Górny
0 siblings, 0 replies; 16+ messages in thread
From: Michał Górny @ 2013-07-13 22:03 UTC (permalink / raw
To: gentoo-commits
commit: bb189b1e6ca0f5bd304de2b9404e1e5360013be3
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 13 22:03:35 2013 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jul 13 22:03:35 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=bb189b1e
Correct --with-clang-resource-dir.
---
sys-devel/llvm/llvm-9999-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-devel/llvm/llvm-9999-r1.ebuild b/sys-devel/llvm/llvm-9999-r1.ebuild
index 1e48dcc..8c445d6 100644
--- a/sys-devel/llvm/llvm-9999-r1.ebuild
+++ b/sys-devel/llvm/llvm-9999-r1.ebuild
@@ -159,7 +159,7 @@ multilib_src_configure() {
if use clang; then
CONF_FLAGS+="
- --with-clang-resource-dir=../$(get_libdir)/clang/3.4"
+ --with-clang-resource-dir=../lib/clang/3.4"
fi
if use multitarget; then
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] dev/mgorny:master commit in: sys-devel/llvm/
@ 2013-07-14 11:14 Michał Górny
0 siblings, 0 replies; 16+ messages in thread
From: Michał Górny @ 2013-07-14 11:14 UTC (permalink / raw
To: gentoo-commits
commit: 4a0042e7704d495a6e5accd7a02bbe7921af42ea
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 14 11:14:04 2013 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jul 14 11:14:04 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=4a0042e7
Fix svn checkout & set keep-symbols via configure.
---
sys-devel/llvm/llvm-9999-r1.ebuild | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/sys-devel/llvm/llvm-9999-r1.ebuild b/sys-devel/llvm/llvm-9999-r1.ebuild
index 8c445d6..59c7350 100644
--- a/sys-devel/llvm/llvm-9999-r1.ebuild
+++ b/sys-devel/llvm/llvm-9999-r1.ebuild
@@ -84,6 +84,8 @@ src_unpack() {
ESVN_PROJECT=compiler-rt S="${S}"/projects/compiler-rt subversion_fetch "http://llvm.org/svn/llvm-project/compiler-rt/trunk"
# Force version match between LLVM, compiler-rt & clang
+ # but first work-around subversion.eclass smartness, bug #282486.
+ subversion_wc_info "http://llvm.org/svn/llvm-project/compiler-rt/trunk"
local ESVN_REVISION=${ESVN_WC_REVISION}
ESVN_PROJECT=clang S="${S}"/tools/clang subversion_fetch "http://llvm.org/svn/llvm-project/cfe/trunk"
@@ -151,7 +153,8 @@ src_prepare() {
}
multilib_src_configure() {
- local CONF_FLAGS="--enable-shared
+ local CONF_FLAGS="--enable-keep-symbols
+ --enable-shared
--with-optimize-option=
$(use_enable !debug optimized)
$(use_enable debug assertions)
@@ -204,7 +207,6 @@ multilib_src_configure() {
multilib_src_compile() {
local mymakeopts=(
VERBOSE=1
- KEEP_SYMBOLS=1
REQUIRES_RTTI=1
)
@@ -250,7 +252,6 @@ MULTILIB_WRAPPED_HEADERS=(
multilib_src_install() {
local mymakeopts=(
- KEEP_SYMBOLS=1
DESTDIR="${D}"
)
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] dev/mgorny:master commit in: sys-devel/llvm/
@ 2013-07-14 20:04 Michał Górny
0 siblings, 0 replies; 16+ messages in thread
From: Michał Górny @ 2013-07-14 20:04 UTC (permalink / raw
To: gentoo-commits
commit: e2de41bcd417a893ea7680399383b8596404733f
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 14 20:04:04 2013 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jul 14 20:04:04 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=e2de41bc
Fix build issues reported by Nikoli.
PaX issues + unnecessary non-multilib llvm-config move.
---
sys-devel/llvm/llvm-9999-r1.ebuild | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/sys-devel/llvm/llvm-9999-r1.ebuild b/sys-devel/llvm/llvm-9999-r1.ebuild
index 59c7350..dd3c24c 100644
--- a/sys-devel/llvm/llvm-9999-r1.ebuild
+++ b/sys-devel/llvm/llvm-9999-r1.ebuild
@@ -227,8 +227,10 @@ multilib_src_compile() {
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
if use test; then
@@ -259,7 +261,9 @@ multilib_src_install() {
emake "${mymakeopts[@]}" install
# Move files back.
- mv "${ED}"/tmp/llvm-config.* "${ED}"/usr/bin || die
+ if path_exists -o "${ED}"/tmp/llvm-config.*; then
+ mv "${ED}"/tmp/llvm-config.* "${ED}"/usr/bin || die
+ fi
else
# we need to install libs for llvm, then whole clang
# since libs-only omits clang dir
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] dev/mgorny:master commit in: sys-devel/llvm/
@ 2013-07-14 21:11 Michał Górny
0 siblings, 0 replies; 16+ messages in thread
From: Michał Górny @ 2013-07-14 21:11 UTC (permalink / raw
To: gentoo-commits
commit: 16376a1a29e1a7a8d66b0a067b5ebe6c7bc36755
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 14 21:10:54 2013 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jul 14 21:10:54 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=16376a1a
Fix missing conditional for clang sed.
Reported by hasufell.
---
sys-devel/llvm/llvm-9999-r1.ebuild | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/sys-devel/llvm/llvm-9999-r1.ebuild b/sys-devel/llvm/llvm-9999-r1.ebuild
index dd3c24c..04924ea 100644
--- a/sys-devel/llvm/llvm-9999-r1.ebuild
+++ b/sys-devel/llvm/llvm-9999-r1.ebuild
@@ -114,10 +114,12 @@ src_prepare() {
-e '/OmitFramePointer/s/-fomit-frame-pointer//' \
-i Makefile.rules || die "rpath sed failed"
- # Set correct path for the coverage lib
- sed -e "s#lib\(/libprofile_rt.a\)#$(get_libdir)/llvm\1#" \
- -i tools/clang/lib/Driver/Tools.cpp \
- || die "driver tools paths sed failed"
+ if use clang; then
+ # Set correct path for the coverage lib
+ sed -e "s#lib\(/libprofile_rt.a\)#$(get_libdir)/llvm\1#" \
+ -i tools/clang/lib/Driver/Tools.cpp \
+ || die "driver tools paths sed failed"
+ fi
}
if use gold; then
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] dev/mgorny:master commit in: sys-devel/llvm/
@ 2013-07-14 21:18 Michał Górny
0 siblings, 0 replies; 16+ messages in thread
From: Michał Górny @ 2013-07-14 21:18 UTC (permalink / raw
To: gentoo-commits
commit: b39a7c6cc27ebe00df71862cff962bab2c00712c
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 14 21:18:40 2013 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jul 14 21:18:40 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=b39a7c6c
Fix more of missing 'use clang'.
---
sys-devel/llvm/llvm-9999-r1.ebuild | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/sys-devel/llvm/llvm-9999-r1.ebuild b/sys-devel/llvm/llvm-9999-r1.ebuild
index 04924ea..c17f814 100644
--- a/sys-devel/llvm/llvm-9999-r1.ebuild
+++ b/sys-devel/llvm/llvm-9999-r1.ebuild
@@ -220,7 +220,7 @@ multilib_src_compile() {
# since libs-only omits clang dir
# and clang fails to sub-compile with libs-only.
emake "${mymakeopts[@]}" libs-only
- emake -C tools/clang "${mymakeopts[@]}"
+ use clang && emake -C tools/clang "${mymakeopts[@]}"
fi
if multilib_is_native_abi; then
@@ -245,14 +245,21 @@ multilib_src_compile() {
multilib_src_test() {
default
- emake -C tools/clang test
+ use clang && emake -C tools/clang test
}
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/llvm/Config/config.h
- /usr/include/llvm/Config/llvm-config.h
- /usr/include/clang/Config/config.h
-)
+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
+}
multilib_src_install() {
local mymakeopts=(
@@ -272,7 +279,7 @@ multilib_src_install() {
# and clang install-libs doesn't install headers and stuff
# (we build it anyway, so install is not a problem)
emake "${mymakeopts[@]}" install-libs
- emake -C tools/clang "${mymakeopts[@]}" install
+ use clang && emake -C tools/clang "${mymakeopts[@]}" install
# Preserve ABI-variant of llvm-config,
# then drop all the executables since LLVM doesn't like to
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] dev/mgorny:master commit in: sys-devel/llvm/
@ 2013-07-14 21:38 Michał Górny
0 siblings, 0 replies; 16+ messages in thread
From: Michał Górny @ 2013-07-14 21:38 UTC (permalink / raw
To: gentoo-commits
commit: b2b2111049cda55cdb1656a4b00bb24e71f7771c
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 14 21:38:59 2013 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jul 14 21:38:59 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=b2b21110
sys-devel/llvm: Add emul-linux blocker for multilib.
Package-Manager: portage-2.2.0_alpha188
---
sys-devel/llvm/llvm-9999-r1.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sys-devel/llvm/llvm-9999-r1.ebuild b/sys-devel/llvm/llvm-9999-r1.ebuild
index c17f814..c043821 100644
--- a/sys-devel/llvm/llvm-9999-r1.ebuild
+++ b/sys-devel/llvm/llvm-9999-r1.ebuild
@@ -39,7 +39,8 @@ RDEPEND="dev-lang/perl
python? ( ${PYTHON_DEPS} )
udis86? ( dev-libs/udis86[pic(+),${MULTILIB_USEDEP}] )
vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
- !<=sys-devel/clang-9999-r99"
+ !<=sys-devel/clang-9999-r99
+ abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224 )"
# pypy gives me around 1700 unresolved tests due to open file limit
# being exceeded. probably GC does not close them fast enough.
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] dev/mgorny:master commit in: sys-devel/llvm/
@ 2013-07-14 21:47 Michał Górny
0 siblings, 0 replies; 16+ messages in thread
From: Michał Górny @ 2013-07-14 21:47 UTC (permalink / raw
To: gentoo-commits
commit: 539f308827fdbbf25cab353b3887d32da9bc84ae
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 14 21:47:27 2013 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jul 14 21:47:27 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=539f3088
sys-devel/llvm: Improve Python deps and REQUIRED_USE.
Package-Manager: portage-2.2.0_alpha188
---
sys-devel/llvm/llvm-9999-r1.ebuild | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/sys-devel/llvm/llvm-9999-r1.ebuild b/sys-devel/llvm/llvm-9999-r1.ebuild
index c043821..8fcf90b 100644
--- a/sys-devel/llvm/llvm-9999-r1.ebuild
+++ b/sys-devel/llvm/llvm-9999-r1.ebuild
@@ -36,7 +36,7 @@ DEPEND="dev-lang/perl
${PYTHON_DEPS}"
RDEPEND="dev-lang/perl
libffi? ( virtual/libffi )
- python? ( ${PYTHON_DEPS} )
+ clang? ( python? ( ${PYTHON_DEPS} ) )
udis86? ( dev-libs/udis86[pic(+),${MULTILIB_USEDEP}] )
vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
!<=sys-devel/clang-9999-r99
@@ -44,7 +44,8 @@ RDEPEND="dev-lang/perl
# pypy gives me around 1700 unresolved tests due to open file limit
# being exceeded. probably GC does not close them fast enough.
-REQUIRED_USE="test? ( || ( $(python_gen_useflags 'python*') ) )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ test? ( || ( $(python_gen_useflags 'python*') ) )"
pkg_setup() {
# need to check if the active compiler is ok
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] dev/mgorny:master commit in: sys-devel/llvm/
@ 2013-07-15 16:15 Michał Górny
0 siblings, 0 replies; 16+ messages in thread
From: Michał Górny @ 2013-07-15 16:15 UTC (permalink / raw
To: gentoo-commits
commit: 910340e213e3e630530df508d7543580799d5b96
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 15 16:15:09 2013 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jul 15 16:15:09 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=910340e2
Update multilib blocker and libffi dep.
---
sys-devel/llvm/llvm-9999-r1.ebuild | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/sys-devel/llvm/llvm-9999-r1.ebuild b/sys-devel/llvm/llvm-9999-r1.ebuild
index 8fcf90b..a06bd23 100644
--- a/sys-devel/llvm/llvm-9999-r1.ebuild
+++ b/sys-devel/llvm/llvm-9999-r1.ebuild
@@ -30,17 +30,18 @@ DEPEND="dev-lang/perl
sys-libs/zlib
gold? ( >=sys-devel/binutils-2.22[cxx] )
libffi? ( virtual/pkgconfig
- virtual/libffi )
+ virtual/libffi[${MULTILIB_USEDEP}] )
ocaml? ( dev-lang/ocaml )
udis86? ( dev-libs/udis86[pic(+),${MULTILIB_USEDEP}] )
${PYTHON_DEPS}"
RDEPEND="dev-lang/perl
- libffi? ( virtual/libffi )
+ libffi? ( virtual/libffi[${MULTILIB_USEDEP}] )
clang? ( python? ( ${PYTHON_DEPS} ) )
udis86? ( dev-libs/udis86[pic(+),${MULTILIB_USEDEP}] )
vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
!<=sys-devel/clang-9999-r99
- abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224 )"
+ abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
# pypy gives me around 1700 unresolved tests due to open file limit
# being exceeded. probably GC does not close them fast enough.
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] dev/mgorny:master commit in: sys-devel/llvm/
@ 2013-07-19 13:11 Michał Górny
0 siblings, 0 replies; 16+ messages in thread
From: Michał Górny @ 2013-07-19 13:11 UTC (permalink / raw
To: gentoo-commits
commit: 0733296358efb5920443525f432bec8588b916f5
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 19 13:11:26 2013 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jul 19 13:11:26 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=07332963
Fix building llvm-3.3 without clang.
---
sys-devel/llvm/llvm-3.3-r1.ebuild | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/sys-devel/llvm/llvm-3.3-r1.ebuild b/sys-devel/llvm/llvm-3.3-r1.ebuild
index a6b057d..e422c32 100644
--- a/sys-devel/llvm/llvm-3.3-r1.ebuild
+++ b/sys-devel/llvm/llvm-3.3-r1.ebuild
@@ -112,12 +112,13 @@ src_prepare() {
rm -f "${S}"/tools/clang "${S}"/projects/compiler-rt \
|| die "symlinks removal failed"
- 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"
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"
+
# Automatically select active system GCC's libraries, bugs #406163 and #417913
epatch "${FILESDIR}"/clang-3.1-gentoo-runtime-gcc-detection-v3.patch
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] dev/mgorny:master commit in: sys-devel/llvm/
@ 2013-07-19 21:24 Michał Górny
0 siblings, 0 replies; 16+ messages in thread
From: Michał Górny @ 2013-07-19 21:24 UTC (permalink / raw
To: gentoo-commits
commit: 57c5e0febd43071c8dad2d6024b411fc06692f68
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 19 19:33:37 2013 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jul 19 21:21:12 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=57c5e0fe
sys-devel/llvm: block clang only with USE=clang.
---
sys-devel/llvm/llvm-3.3-r1.ebuild | 4 ++--
sys-devel/llvm/llvm-9999-r1.ebuild | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/sys-devel/llvm/llvm-3.3-r1.ebuild b/sys-devel/llvm/llvm-3.3-r1.ebuild
index 7f12be2..daef29f 100644
--- a/sys-devel/llvm/llvm-3.3-r1.ebuild
+++ b/sys-devel/llvm/llvm-3.3-r1.ebuild
@@ -41,8 +41,8 @@ RDEPEND="dev-lang/perl
clang? ( python? ( ${PYTHON_DEPS} ) )
udis86? ( dev-libs/udis86[pic(+),${MULTILIB_USEDEP}] )
vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
- !<=sys-devel/clang-3.3-r99
- !>=sys-devel/clang-9999
+ clang? ( !<=sys-devel/clang-3.3-r99
+ !>=sys-devel/clang-9999 )
abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
diff --git a/sys-devel/llvm/llvm-9999-r1.ebuild b/sys-devel/llvm/llvm-9999-r1.ebuild
index e3d56dc..a4435f0 100644
--- a/sys-devel/llvm/llvm-9999-r1.ebuild
+++ b/sys-devel/llvm/llvm-9999-r1.ebuild
@@ -39,7 +39,7 @@ RDEPEND="dev-lang/perl
clang? ( python? ( ${PYTHON_DEPS} ) )
udis86? ( dev-libs/udis86[pic(+),${MULTILIB_USEDEP}] )
vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
- !<=sys-devel/clang-9999-r99
+ clang? ( !<=sys-devel/clang-9999-r99 )
abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] dev/mgorny:master commit in: sys-devel/llvm/
@ 2013-07-19 21:24 Michał Górny
0 siblings, 0 replies; 16+ messages in thread
From: Michał Górny @ 2013-07-19 21:24 UTC (permalink / raw
To: gentoo-commits
commit: 7a424d0b6ef660829352024d5ce9f7ee8e2af02b
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 19 19:21:23 2013 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jul 19 19:21:23 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=7a424d0b
llvm-3.3: move clang moves to src_unpack().
This will ensure that we get the 'final' unpatched tree layout at end of
src_unpack() and we can use that to rewrite the patches.
---
sys-devel/llvm/llvm-3.3-r1.ebuild | 22 ++++++++++++++--------
1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/sys-devel/llvm/llvm-3.3-r1.ebuild b/sys-devel/llvm/llvm-3.3-r1.ebuild
index e422c32..7f12be2 100644
--- a/sys-devel/llvm/llvm-3.3-r1.ebuild
+++ b/sys-devel/llvm/llvm-3.3-r1.ebuild
@@ -87,6 +87,20 @@ pkg_setup() {
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-${PV}.src "${S}"/projects/compiler-rt \
+ || die "compiler-rt source directory move failed"
+ fi
+}
+
src_prepare() {
multilib_src_prepare() {
cd "${BUILD_DIR}" || die
@@ -110,15 +124,7 @@ src_prepare() {
|| die "install paths sed failed"
}
- 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"
-
# Automatically select active system GCC's libraries, bugs #406163 and #417913
epatch "${FILESDIR}"/clang-3.1-gentoo-runtime-gcc-detection-v3.patch
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] dev/mgorny:master commit in: sys-devel/llvm/
@ 2013-07-20 6:28 Michał Górny
0 siblings, 0 replies; 16+ messages in thread
From: Michał Górny @ 2013-07-20 6:28 UTC (permalink / raw
To: gentoo-commits
commit: 9937a73282d280e3a042b041cdf73891d872c807
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 19 22:10:18 2013 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jul 19 22:10:18 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=9937a732
sys-devel/llvm: use proper LD_LIBRARY_PATH.
---
sys-devel/llvm/llvm-3.3-r1.ebuild | 17 ++++++++++++++---
sys-devel/llvm/llvm-9999-r1.ebuild | 17 ++++++++++++++---
2 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/sys-devel/llvm/llvm-3.3-r1.ebuild b/sys-devel/llvm/llvm-3.3-r1.ebuild
index 123564f..92e19fc 100644
--- a/sys-devel/llvm/llvm-3.3-r1.ebuild
+++ b/sys-devel/llvm/llvm-3.3-r1.ebuild
@@ -148,17 +148,19 @@ src_prepare() {
multilib_copy_sources
multilib_foreach_abi multilib_src_prepare
+}
+llvm_add_ldpath() {
# Add LLVM built libraries to LD_LIBRARY_PATH.
# This way we don't have to hack RPATHs of executables.
local libpath
if use debug; then
- libpath=Debug+Asserts+Checks/lib
+ libpath=${BUILD_DIR}/Debug+Asserts+Checks/lib
else
- libpath=Release/lib
+ libpath=${BUILD_DIR}/Release/lib
fi
- export LD_LIBRARY_PATH=${libpath}${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}
+ export LD_LIBRARY_PATH=${libpath}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
}
multilib_src_configure() {
@@ -221,6 +223,9 @@ multilib_src_compile() {
REQUIRES_RTTI=1
)
+ local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
+ llvm_add_ldpath
+
# Tests need all the LLVM built.
if multilib_is_native_abi || use test; then
emake "${mymakeopts[@]}"
@@ -252,6 +257,9 @@ multilib_src_compile() {
}
multilib_src_test() {
+ local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
+ llvm_add_ldpath
+
default
use clang && emake -C tools/clang test
@@ -278,6 +286,9 @@ multilib_src_install() {
DESTDIR="${D}"
)
+ local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
+ llvm_add_ldpath
+
if multilib_is_native_abi; then
emake "${mymakeopts[@]}" install
diff --git a/sys-devel/llvm/llvm-9999-r1.ebuild b/sys-devel/llvm/llvm-9999-r1.ebuild
index a4435f0..0e67943 100644
--- a/sys-devel/llvm/llvm-9999-r1.ebuild
+++ b/sys-devel/llvm/llvm-9999-r1.ebuild
@@ -131,17 +131,19 @@ src_prepare() {
multilib_copy_sources
multilib_foreach_abi multilib_src_prepare
+}
+llvm_add_ldpath() {
# Add LLVM built libraries to LD_LIBRARY_PATH.
# This way we don't have to hack RPATHs of executables.
local libpath
if use debug; then
- libpath=Debug+Asserts+Checks/lib
+ libpath=${BUILD_DIR}/Debug+Asserts+Checks/lib
else
- libpath=Release/lib
+ libpath=${BUILD_DIR}/Release/lib
fi
- export LD_LIBRARY_PATH=${libpath}${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}
+ export LD_LIBRARY_PATH=${libpath}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
}
multilib_src_configure() {
@@ -202,6 +204,9 @@ multilib_src_compile() {
REQUIRES_RTTI=1
)
+ local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
+ llvm_add_ldpath
+
# Tests need all the LLVM built.
if multilib_is_native_abi || use test; then
emake "${mymakeopts[@]}"
@@ -233,6 +238,9 @@ multilib_src_compile() {
}
multilib_src_test() {
+ local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
+ llvm_add_ldpath
+
default
use clang && emake -C tools/clang test
@@ -256,6 +264,9 @@ multilib_src_install() {
DESTDIR="${D}"
)
+ local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
+ llvm_add_ldpath
+
if multilib_is_native_abi; then
emake "${mymakeopts[@]}" install
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] dev/mgorny:master commit in: sys-devel/llvm/
@ 2013-07-20 7:15 Michał Górny
0 siblings, 0 replies; 16+ messages in thread
From: Michał Górny @ 2013-07-20 7:15 UTC (permalink / raw
To: gentoo-commits
commit: 8f128baf03a35295c7af29f9fff6e7455cf7c9a5
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 20 07:15:38 2013 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jul 20 07:15:38 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=8f128baf
Install vim-syntax files unconditionally.
Bug #477250.
---
sys-devel/llvm/llvm-3.3-r1.ebuild | 8 +++-----
sys-devel/llvm/llvm-9999-r1.ebuild | 8 +++-----
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/sys-devel/llvm/llvm-3.3-r1.ebuild b/sys-devel/llvm/llvm-3.3-r1.ebuild
index 92e19fc..61e8193 100644
--- a/sys-devel/llvm/llvm-3.3-r1.ebuild
+++ b/sys-devel/llvm/llvm-3.3-r1.ebuild
@@ -20,7 +20,7 @@ LICENSE="UoI-NCSA"
SLOT="0"
KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="clang debug doc gold kernel_FreeBSD +libffi multitarget ocaml python
- +static-analyzer test udis86 vim-syntax video_cards_radeon"
+ +static-analyzer test udis86 video_cards_radeon"
DEPEND="dev-lang/perl
>=sys-devel/make-3.79
@@ -398,8 +398,6 @@ multilib_src_install() {
multilib_src_install_all() {
use doc || doman "${WORKDIR}"/${P}-manpages/*.1
- if use vim-syntax; then
- insinto /usr/share/vim/vimfiles/syntax
- doins utils/vim/*.vim
- fi
+ insinto /usr/share/vim/vimfiles/syntax
+ doins utils/vim/*.vim
}
diff --git a/sys-devel/llvm/llvm-9999-r1.ebuild b/sys-devel/llvm/llvm-9999-r1.ebuild
index 0e67943..4475340 100644
--- a/sys-devel/llvm/llvm-9999-r1.ebuild
+++ b/sys-devel/llvm/llvm-9999-r1.ebuild
@@ -18,7 +18,7 @@ LICENSE="UoI-NCSA"
SLOT="0"
KEYWORDS=""
IUSE="clang debug doc gold +libffi multitarget ocaml python
- +static-analyzer test udis86 vim-syntax video_cards_radeon"
+ +static-analyzer test udis86 video_cards_radeon"
DEPEND="dev-lang/perl
dev-python/sphinx
@@ -373,8 +373,6 @@ multilib_src_install() {
}
multilib_src_install_all() {
- if use vim-syntax; then
- insinto /usr/share/vim/vimfiles/syntax
- doins utils/vim/*.vim
- fi
+ insinto /usr/share/vim/vimfiles/syntax
+ doins utils/vim/*.vim
}
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] dev/mgorny:master commit in: sys-devel/llvm/
@ 2013-07-20 10:28 Michał Górny
0 siblings, 0 replies; 16+ messages in thread
From: Michał Górny @ 2013-07-20 10:28 UTC (permalink / raw
To: gentoo-commits
commit: 3b9bd83b687b2c003ff849743555a1464b7f3bc9
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 20 10:27:32 2013 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jul 20 10:27:32 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=3b9bd83b
sys-devel/llvm: Kill remaining references to USE=vim-syntax.
---
sys-devel/llvm/llvm-3.3-r1.ebuild | 1 -
sys-devel/llvm/llvm-9999-r1.ebuild | 1 -
2 files changed, 2 deletions(-)
diff --git a/sys-devel/llvm/llvm-3.3-r1.ebuild b/sys-devel/llvm/llvm-3.3-r1.ebuild
index 61e8193..515b006 100644
--- a/sys-devel/llvm/llvm-3.3-r1.ebuild
+++ b/sys-devel/llvm/llvm-3.3-r1.ebuild
@@ -40,7 +40,6 @@ RDEPEND="dev-lang/perl
libffi? ( virtual/libffi[${MULTILIB_USEDEP}] )
clang? ( python? ( ${PYTHON_DEPS} ) )
udis86? ( dev-libs/udis86[pic(+),${MULTILIB_USEDEP}] )
- vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
clang? ( !<=sys-devel/clang-3.3-r99
!>=sys-devel/clang-9999 )
abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224
diff --git a/sys-devel/llvm/llvm-9999-r1.ebuild b/sys-devel/llvm/llvm-9999-r1.ebuild
index 4475340..ec5baeb 100644
--- a/sys-devel/llvm/llvm-9999-r1.ebuild
+++ b/sys-devel/llvm/llvm-9999-r1.ebuild
@@ -38,7 +38,6 @@ RDEPEND="dev-lang/perl
libffi? ( virtual/libffi[${MULTILIB_USEDEP}] )
clang? ( python? ( ${PYTHON_DEPS} ) )
udis86? ( dev-libs/udis86[pic(+),${MULTILIB_USEDEP}] )
- vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
clang? ( !<=sys-devel/clang-9999-r99 )
abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
^ permalink raw reply related [flat|nested] 16+ messages in thread
end of thread, other threads:[~2013-07-20 10:28 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-20 10:28 [gentoo-commits] dev/mgorny:master commit in: sys-devel/llvm/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2013-07-20 7:15 Michał Górny
2013-07-20 6:28 Michał Górny
2013-07-19 21:24 Michał Górny
2013-07-19 21:24 Michał Górny
2013-07-19 13:11 Michał Górny
2013-07-15 16:15 Michał Górny
2013-07-14 21:47 Michał Górny
2013-07-14 21:38 Michał Górny
2013-07-14 21:18 Michał Górny
2013-07-14 21:11 Michał Górny
2013-07-14 20:04 Michał Górny
2013-07-14 11:14 Michał Górny
2013-07-13 22:03 Michał Górny
2013-07-12 16:46 Michał Górny
2013-07-10 9:58 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox