diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2016-02-23 19:31:08 +0100 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2016-02-23 19:31:08 +0100 |
| commit | 145ee70a148757886ab09e7da42b1eff5439e354 (patch) | |
| tree | 4c01957f7a85a34d39c84957217fe3ac8ba9396f /dev-python/python_orocos_kdl | |
| parent | dev-python/python_orocos_kdl: add python 3.5 support (diff) | |
| download | gentoo-145ee70a148757886ab09e7da42b1eff5439e354.tar.gz gentoo-145ee70a148757886ab09e7da42b1eff5439e354.tar.bz2 gentoo-145ee70a148757886ab09e7da42b1eff5439e354.zip | |
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@gentoo.org>
Diffstat (limited to 'dev-python/python_orocos_kdl')
3 files changed, 15 insertions, 1 deletions
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 000000000000..8235649eaec9 --- /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 726cf372d563..5938f3f0811c 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 bd767bc93705..1ddb1dfa7873 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 |