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

[dev-libs/Ice] do away with the symlink tries in tests, just use mv, which actually works.

This commit is contained in:
Robert Förster 2016-04-02 20:02:02 +02:00
parent 7bacc55c56
commit ca710b9029
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -175,8 +175,8 @@ src_configure() {
if use python ; then if use python ; then
S=${S}/python python_copy_sources S=${S}/python python_copy_sources
# make a place for the symlink # make a place for the build hackery
rm -r python/python || die rm -r "${WORKDIR}/${PN}"/python || die
fi fi
if use ruby ; then if use ruby ; then
@ -240,9 +240,12 @@ src_compile() {
if use python ; then if use python ; then
building() { building() {
emake -C "${BUILD_DIR}" ${MAKE_RULES} || die "emake python-${EPYTHON} failed" # build requires that the directory is named 'python'
mv "${BUILD_DIR}" "${S}"/python || die
emake -C python ${MAKE_RULES} || die "emake python-${EPYTHON} failed"
mv "${S}"/python "${BUILD_DIR}"
} }
python_foreach_impl building BUILD_DIR=python python_foreach_impl building
fi fi
if use ruby ; then if use ruby ; then
@ -262,15 +265,14 @@ src_test() {
if use python ; then if use python ; then
testing() { testing() {
# tests require that the directory is named 'python' mv "${BUILD_DIR}" "${S}"/python || die
ln -s "${BUILD_DIR}" python || die
emake -C python ${MAKE_RULES} \ emake -C python ${MAKE_RULES} \
install_pythondir="\"${D}/$(python_get_sitedir)\"" \ install_pythondir="\"${D}/$(python_get_sitedir)\"" \
install_libdir="\"${D}/$(python_get_sitedir)\"" \ install_libdir="\"${D}/$(python_get_sitedir)\"" \
test || die "emake python-${EPYTHON} test failed" test || die "emake python-${EPYTHON} test failed"
rm python mv "${S}"/python "${BUILD_DIR}"
} }
python_foreach_impl testing BUILD_DIR=python python_foreach_impl testing
fi fi
if use ruby ; then if use ruby ; then
@ -325,10 +327,12 @@ src_install() {
installation() { installation() {
mkdir -p "${D}/$(python_get_sitedir)" || die mkdir -p "${D}/$(python_get_sitedir)" || die
emake -C "${BUILD_DIR}" ${MAKE_RULES} \ mv "${BUILD_DIR}" "${S}"/python || die
emake -C python ${MAKE_RULES} \
install_pythondir="\"${D}/$(python_get_sitedir)\"" \ install_pythondir="\"${D}/$(python_get_sitedir)\"" \
install_libdir="\"${D}/$(python_get_sitedir)\"" \ install_libdir="\"${D}/$(python_get_sitedir)\"" \
install || die "emake python-${EPYTHON} install failed" install || die "emake python-${EPYTHON} install failed"
mv "${S}"/python "${BUILD_DIR}"
} }
BUILD_DIR=python python_foreach_impl installation BUILD_DIR=python python_foreach_impl installation
fi fi