Dessa/gentoo
1
0
Fork 0
Code Issues Pull Requests Wiki Activity

[dev-libs/Ice] mono tests still fail to build, fix mono4, remove python_export_best

Browse Source
This commit is contained in:
Robert Förster
2016-01-03 11:52:27 +01:00
parent f73f805c97
commit 7cfb19c5b6
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
dev-libs/Ice/Ice-3.6.1.ebuild
View File

@@ -95,6 +95,11 @@ src_prepare() {
-e 's|-f -root|-f -gacdir $(GAC_DIR) -root|' \ -e 's|-f -root|-f -gacdir $(GAC_DIR) -root|' \
csharp/config/Make.rules.cs || die "sed failed" csharp/config/Make.rules.cs || die "sed failed"
# skip mono tests, bug #498484
sed -i \
-e 's|^\(SUBDIRS.*\)test|\1|' \
csharp/Makefile || die "sed failed"
if ! use test ; then if ! use test ; then
sed -i \ sed -i \
-e 's|^\(SUBDIRS.*\)test|\1|' \ -e 's|^\(SUBDIRS.*\)test|\1|' \
@@ -150,10 +155,12 @@ src_configure() {
fi fi
MAKE_RULES_CS="GACINSTALL=yes GAC_ROOT=\"${ED}/usr/$(get_libdir)\" GAC_DIR=${EPREFIX}/usr/$(get_libdir)" MAKE_RULES_CS="GACINSTALL=yes GAC_ROOT=\"${ED}/usr/$(get_libdir)\" GAC_DIR=${EPREFIX}/usr/$(get_libdir)"
if has_version ">dev-lang/mono-4"; then
MAKE_RULES_CS="${MAKE_RULES_CS} MCS=mcs"
fi
MAKE_RULES_PHP="USE_NAMESPACES=yes" MAKE_RULES_PHP="USE_NAMESPACES=yes"
use test && python_export_best use test && python_setup
} }
src_compile() { src_compile() {
@@ -280,6 +287,8 @@ src_test() {
fi fi
if use mono ; then if use mono ; then
run_tests csharp || die "emake csharp test failed" # skip mono tests, bug #498484
ewarn "Tests for C# are currently disabled."
# run_tests csharp || die "emake csharp test failed"
fi fi
} }