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

[dev-libs/Ice] less python hackery, switch to ruby22 in release ebuild instead, more test fixes

Browse Source
This commit is contained in:
Robert Förster
2016-10-13 20:35:05 +02:00
parent 8f23c0edab
commit c25e034592
2 changed files with 27 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
dev-libs/Ice/Ice-3.6.9999.ebuild
View File

@@ -108,11 +108,12 @@ src_prepare() {
-e '/SUBDIRS/s|\ test||' \
csharp/Makefile || die "sed failed"
# IceUtil/stacktrace fails with USE=debug
# skip udp test due to multicast
# skip IceSSL tests due to requirement of internet connection
# IceUtil/stacktrace fails
# IceStorm/stress fails without USE=debug
sed -i \
-e 's|allTests.py|allTests.py --rfilter=IceUtil\/stacktrace --rfilter=udp --rfilter=IceSSL|' \
-e 's|allTests.py|allTests.py --rfilter=udp --rfilter=IceSSL --rfilter=IceStorm\/stress|' \
cpp/Makefile || die "sed failed"
# mainly broken .ice files
@@ -163,9 +164,6 @@ src_configure() {
if use python ; then
S=${S}/python python_copy_sources
# make a place for the build hackery
rm -r "${WORKDIR}/${PN}"/python || die
fi
if use ruby ; then
@@ -225,12 +223,9 @@ src_compile() {
if use python ; then
building() {
# build requires that the directory is named 'python'
mv "${BUILD_DIR}" "${S}"/python || die
emake -C python ${MAKE_RULES} PYTHON=${EPYTHON} || die "emake python-${EPYTHON} failed"
mv "${S}"/python "${BUILD_DIR}"
emake -C ${BUILD_DIR} ${MAKE_RULES} PYTHON=${EPYTHON} || die "emake python-${EPYTHON} failed"
}
BUILD_DIR=python python_foreach_impl building
S=${S}/python python_foreach_impl building
fi
if use ruby ; then
@@ -250,14 +245,12 @@ src_test() {
if use python ; then
testing() {
mv "${BUILD_DIR}" "${S}"/python || die
emake -C python ${MAKE_RULES} PYTHON=${EPYTHON} \
emake -C ${BUILD_DIR} ${MAKE_RULES} PYTHON=${EPYTHON} \
install_pythondir="\"${D}/$(python_get_sitedir)\"" \
install_libdir="\"${D}/$(python_get_sitedir)\"" \
test || die "emake python-${EPYTHON} test failed"
mv "${S}"/python "${BUILD_DIR}"
}
BUILD_DIR=python python_foreach_impl testing
S=${S}/python python_foreach_impl testing
fi
if use ruby ; then
@@ -307,14 +300,12 @@ src_install() {
installation() {
mkdir -p "${D}/$(python_get_sitedir)" || die
mv "${BUILD_DIR}" "${S}"/python || die
emake -C python ${MAKE_RULES} \
emake -C ${BUILD_DIR} ${MAKE_RULES} \
install_pythondir="\"${D}/$(python_get_sitedir)\"" \
install_libdir="\"${D}/$(python_get_sitedir)\"" \
install || die "emake python-${EPYTHON} install failed"
mv "${S}"/python "${BUILD_DIR}"
}
BUILD_DIR=python python_foreach_impl installation
S=${S}/python python_foreach_impl installation
fi
if use ruby ; then