commit: 145ee70a148757886ab09e7da42b1eff5439e354 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> AuthorDate: Tue Feb 23 18:31:08 2016 +0000 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> CommitDate: Tue Feb 23 18:31:08 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=145ee70a
dev-python/python_orocos_kdl: set prefix=None instead of "" to let autodetection of python libdir work. Package-Manager: portage-2.2.27 Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org> dev-python/python_orocos_kdl/files/libdir.patch | 13 +++++++++++++ dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0.ebuild | 2 +- dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild | 1 + 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dev-python/python_orocos_kdl/files/libdir.patch b/dev-python/python_orocos_kdl/files/libdir.patch new file mode 100644 index 0000000..8235649 --- /dev/null +++ b/dev-python/python_orocos_kdl/files/libdir.patch @@ -0,0 +1,13 @@ +Index: python_orocos_kdl/CMakeLists.txt +=================================================================== +--- python_orocos_kdl.orig/CMakeLists.txt ++++ python_orocos_kdl/CMakeLists.txt +@@ -8,7 +8,7 @@ link_directories(${orocos_kdl_LIBRARY_DI + + find_package(PythonInterp REQUIRED) + find_package(PythonLibs ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} REQUIRED) +-execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(plat_specific=True, prefix=''))" OUTPUT_VARIABLE PYTHON_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE) ++execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(plat_specific=True, prefix=None))" OUTPUT_VARIABLE PYTHON_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE) + list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) + find_package(SIP REQUIRED) + include(SIPMacros) diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0.ebuild index 726cf37..5938f3f 100644 --- a/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0.ebuild +++ b/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0.ebuild @@ -32,7 +32,7 @@ RDEPEND=" dev-python/sip[${PYTHON_USEDEP}] " DEPEND="${RDEPEND}" -PATCHES=( "${FILESDIR}/py3.patch" ) +PATCHES=( "${FILESDIR}/py3.patch" "${FILESDIR}/libdir.patch" ) if [ "${PV#9999}" != "${PV}" ] ; then S=${WORKDIR}/${P}/python_orocos_kdl diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild index bd767bc..1ddb1df 100644 --- a/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild +++ b/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild @@ -32,6 +32,7 @@ RDEPEND=" dev-python/sip[${PYTHON_USEDEP}] " DEPEND="${RDEPEND}" +PATCHES=( "${FILESDIR}/libdir.patch" ) if [ "${PV#9999}" != "${PV}" ] ; then S=${WORKDIR}/${P}/python_orocos_kdl