| 1 |
commit: 145ee70a148757886ab09e7da42b1eff5439e354 |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 23 18:31:08 2016 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 23 18:31:08 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=145ee70a |
| 7 |
|
| 8 |
dev-python/python_orocos_kdl: set prefix=None instead of "" to let autodetection of python libdir work. |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.27 |
| 11 |
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-python/python_orocos_kdl/files/libdir.patch | 13 +++++++++++++ |
| 14 |
dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0.ebuild | 2 +- |
| 15 |
dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild | 1 + |
| 16 |
3 files changed, 15 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
diff --git a/dev-python/python_orocos_kdl/files/libdir.patch b/dev-python/python_orocos_kdl/files/libdir.patch |
| 19 |
new file mode 100644 |
| 20 |
index 0000000..8235649 |
| 21 |
--- /dev/null |
| 22 |
+++ b/dev-python/python_orocos_kdl/files/libdir.patch |
| 23 |
@@ -0,0 +1,13 @@ |
| 24 |
+Index: python_orocos_kdl/CMakeLists.txt |
| 25 |
+=================================================================== |
| 26 |
+--- python_orocos_kdl.orig/CMakeLists.txt |
| 27 |
++++ python_orocos_kdl/CMakeLists.txt |
| 28 |
+@@ -8,7 +8,7 @@ link_directories(${orocos_kdl_LIBRARY_DI |
| 29 |
+ |
| 30 |
+ find_package(PythonInterp REQUIRED) |
| 31 |
+ find_package(PythonLibs ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} REQUIRED) |
| 32 |
+-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) |
| 33 |
++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) |
| 34 |
+ list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) |
| 35 |
+ find_package(SIP REQUIRED) |
| 36 |
+ include(SIPMacros) |
| 37 |
|
| 38 |
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 |
| 39 |
index 726cf37..5938f3f 100644 |
| 40 |
--- a/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0.ebuild |
| 41 |
+++ b/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0.ebuild |
| 42 |
@@ -32,7 +32,7 @@ RDEPEND=" |
| 43 |
dev-python/sip[${PYTHON_USEDEP}] |
| 44 |
" |
| 45 |
DEPEND="${RDEPEND}" |
| 46 |
-PATCHES=( "${FILESDIR}/py3.patch" ) |
| 47 |
+PATCHES=( "${FILESDIR}/py3.patch" "${FILESDIR}/libdir.patch" ) |
| 48 |
|
| 49 |
if [ "${PV#9999}" != "${PV}" ] ; then |
| 50 |
S=${WORKDIR}/${P}/python_orocos_kdl |
| 51 |
|
| 52 |
diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild |
| 53 |
index bd767bc..1ddb1df 100644 |
| 54 |
--- a/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild |
| 55 |
+++ b/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild |
| 56 |
@@ -32,6 +32,7 @@ RDEPEND=" |
| 57 |
dev-python/sip[${PYTHON_USEDEP}] |
| 58 |
" |
| 59 |
DEPEND="${RDEPEND}" |
| 60 |
+PATCHES=( "${FILESDIR}/libdir.patch" ) |
| 61 |
|
| 62 |
if [ "${PV#9999}" != "${PV}" ] ; then |
| 63 |
S=${WORKDIR}/${P}/python_orocos_kdl |
Archives