diff --git a/py-crocoddyl/Makefile b/py-crocoddyl/Makefile index d68dc973c1e8bc7452bb88ca5c4fafb4f3de4f61..17ad865caa94c4bcc326727a315b85375ace5971 100644 --- a/py-crocoddyl/Makefile +++ b/py-crocoddyl/Makefile @@ -5,7 +5,7 @@ ORG= loco-3d NAME= crocoddyl VERSION= 0.9.0 -PKGREVISION= 2 +PKGREVISION= 3 DISTNAME= ${NAME}-${VERSION} PKGNAME= ${PKGTAG.python-}${DISTNAME} @@ -22,7 +22,6 @@ MAINTAINER= gepetto-soft@laas.fr CONFLICTS+= py[0-9][0-9]-crocoddyl CMAKE_ARGS+= -DCMAKE_INSTALL_LIBDIR=lib -CMAKE_ARGS+= -DPYTHON_PACKAGES_DIR=site-packages DYNAMIC_PLIST_DIRS+= share/doc/${NAME} diff --git a/py-crocoddyl/distinfo b/py-crocoddyl/distinfo index b114b653557ba594e965119ba807923a3b53ae6e..f1d977dce5774448bf2a5f8b96dbfdfa625bd1e6 100644 --- a/py-crocoddyl/distinfo +++ b/py-crocoddyl/distinfo @@ -1,3 +1,4 @@ SHA1 (crocoddyl-0.9.0.tar.gz) = 07709cdd8b984c80ea8ba89192242071aa3f72f9 RMD160 (crocoddyl-0.9.0.tar.gz) = dcd3982f7e07d52208d3cf398c1532a326c0391d Size (crocoddyl-0.9.0.tar.gz) = 2129419 bytes +SHA1 (patch-aa) = ed6dc24b8dbe6064193963ba585b3e86023cd985 diff --git a/py-crocoddyl/patches/patch-aa b/py-crocoddyl/patches/patch-aa new file mode 100644 index 0000000000000000000000000000000000000000..6989c619a666680339ac7197042c2fd2a36d4bd2 --- /dev/null +++ b/py-crocoddyl/patches/patch-aa @@ -0,0 +1,14 @@ +revert https://github.com/jrl-umi3218/jrl-cmakemodules/pull/214 +to comply with robotpkg PYTHON_SITELIB instead of Debian /Â Ubuntu + +--- cmake/python.cmake.orig 2019-07-28 11:15:53.000000000 +0200 ++++ cmake/python.cmake 2019-08-31 18:28:52.847614739 +0200 +@@ -84,7 +84,7 @@ + + EXECUTE_PROCESS( + COMMAND "${PYTHON_EXECUTABLE}" "-c" +- "from distutils import sysconfig; print(sysconfig.get_python_lib(prefix='', plat_specific=False))" ++ "import sys, os; print(os.sep.join(['lib', 'python' + sys.version[:3], 'site-packages']))" + OUTPUT_VARIABLE PYTHON_SITELIB + OUTPUT_STRIP_TRAILING_WHITESPACE + ERROR_QUIET)