Skip to content
Snippets Groups Projects
Commit d937aaad authored by Guilhem Saurel's avatar Guilhem Saurel
Browse files

[wip/py-crocoddyl] add patch-aa

revert https://github.com/jrl-umi3218/jrl-cmakemodules/pull/214
to fix PYTHON_SITELIB in Debian / Ubuntu on Python 3
parent 2b82140d
No related branches found
No related tags found
No related merge requests found
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
ORG= loco-3d ORG= loco-3d
NAME= crocoddyl NAME= crocoddyl
VERSION= 0.9.0 VERSION= 0.9.0
PKGREVISION= 2 PKGREVISION= 3
DISTNAME= ${NAME}-${VERSION} DISTNAME= ${NAME}-${VERSION}
PKGNAME= ${PKGTAG.python-}${DISTNAME} PKGNAME= ${PKGTAG.python-}${DISTNAME}
...@@ -22,7 +22,6 @@ MAINTAINER= gepetto-soft@laas.fr ...@@ -22,7 +22,6 @@ MAINTAINER= gepetto-soft@laas.fr
CONFLICTS+= py[0-9][0-9]-crocoddyl CONFLICTS+= py[0-9][0-9]-crocoddyl
CMAKE_ARGS+= -DCMAKE_INSTALL_LIBDIR=lib CMAKE_ARGS+= -DCMAKE_INSTALL_LIBDIR=lib
CMAKE_ARGS+= -DPYTHON_PACKAGES_DIR=site-packages
DYNAMIC_PLIST_DIRS+= share/doc/${NAME} DYNAMIC_PLIST_DIRS+= share/doc/${NAME}
......
SHA1 (crocoddyl-0.9.0.tar.gz) = 07709cdd8b984c80ea8ba89192242071aa3f72f9 SHA1 (crocoddyl-0.9.0.tar.gz) = 07709cdd8b984c80ea8ba89192242071aa3f72f9
RMD160 (crocoddyl-0.9.0.tar.gz) = dcd3982f7e07d52208d3cf398c1532a326c0391d RMD160 (crocoddyl-0.9.0.tar.gz) = dcd3982f7e07d52208d3cf398c1532a326c0391d
Size (crocoddyl-0.9.0.tar.gz) = 2129419 bytes Size (crocoddyl-0.9.0.tar.gz) = 2129419 bytes
SHA1 (patch-aa) = ed6dc24b8dbe6064193963ba585b3e86023cd985
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)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment