summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2015-11-12 11:48:21 +0100
committerBernard Cafarelli <voyageur@gentoo.org>2015-11-12 11:48:33 +0100
commitce0a93f16b2dbab1a635ef41a6178e0590bf028c (patch)
tree3fa9fe52b79858ff5693db51cb8a23da3f6ed193
parentapp-i18n/libguess: ppc stable wrt bug #561242 (diff)
downloadgentoo-ce0a93f16b2dbab1a635ef41a6178e0590bf028c.tar.gz
gentoo-ce0a93f16b2dbab1a635ef41a6178e0590bf028c.tar.bz2
gentoo-ce0a93f16b2dbab1a635ef41a6178e0590bf028c.zip
sys-devel/llvm: fix libxml2 detection for USE=-xml, bug #564804
libxml2 search is now correctly disabled for USE=-xml lldb requires libxml2 Port some fixes to live ebuild Package-Manager: portage-2.2.24
-rw-r--r--sys-devel/llvm/llvm-3.7.0-r2.ebuild8
-rw-r--r--sys-devel/llvm/llvm-9999.ebuild11
2 files changed, 16 insertions, 3 deletions
diff --git a/sys-devel/llvm/llvm-3.7.0-r2.ebuild b/sys-devel/llvm/llvm-3.7.0-r2.ebuild
index 8856b56b9cb..bc2726d7f97 100644
--- a/sys-devel/llvm/llvm-3.7.0-r2.ebuild
+++ b/sys-devel/llvm/llvm-3.7.0-r2.ebuild
@@ -72,7 +72,7 @@ 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}
- lldb? ( clang )
+ lldb? ( clang xml )
test? ( || ( $(python_gen_useflags 'python*') ) )"
S=${WORKDIR}/${P/_}.src
@@ -262,6 +262,12 @@ multilib_src_configure() {
-DHAVE_HISTEDIT_H=$(usex libedit)
)
+ if use clang; then
+ mycmakeargs+=(
+ -DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex !xml)
+ )
+ fi
+
if use lldb; then
mycmakeargs+=(
-DLLDB_DISABLE_LIBEDIT=$(usex !libedit)
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index 1d0a6e61a79..7150aa89d74 100644
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-9999.ebuild
@@ -37,7 +37,7 @@ COMMON_DEPEND="
libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
ocaml? (
- dev-lang/ocaml:0=
+ >=dev-lang/ocaml-4.00.0:0=
dev-ml/findlib
dev-ml/ocaml-ctypes )"
# configparser-3.2 breaks the build (3.3 or none at all are fine)
@@ -53,6 +53,7 @@ DEPEND="${COMMON_DEPEND}
kernel_Darwin? ( sys-libs/libcxx )
clang? ( xml? ( virtual/pkgconfig ) )
doc? ( dev-python/sphinx )
+ gold? ( sys-libs/binutils-libs )
libffi? ( virtual/pkgconfig )
lldb? ( dev-lang/swig )
!!<dev-python/configparser-3.3.0.2
@@ -67,7 +68,7 @@ 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}
- lldb? ( clang )
+ lldb? ( clang xml )
test? ( || ( $(python_gen_useflags 'python*') ) )"
pkg_pretend() {
@@ -255,6 +256,12 @@ multilib_src_configure() {
-DHAVE_HISTEDIT_H=$(usex libedit)
)
+ if use clang; then
+ mycmakeargs+=(
+ -DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex !xml)
+ )
+ fi
+
if use lldb; then
mycmakeargs+=(
-DLLDB_DISABLE_LIBEDIT=$(usex !libedit)