From c47225dfe3d2a6e7dd2a7216d42b56e2da7d8186 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Wed, 25 Sep 2019 11:58:02 +0200
Subject: [PATCH] [wip/hpp-spline] allow python 3
---
hpp-spline/Makefile | 6 ++----
hpp-spline/PLIST | 2 +-
hpp-spline/depend.mk | 4 +++-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/hpp-spline/Makefile b/hpp-spline/Makefile
index be4274fd..da9face4 100644
--- a/hpp-spline/Makefile
+++ b/hpp-spline/Makefile
@@ -8,9 +8,8 @@ HPP_VERSION= 4.5.0
CATEGORIES= wip
-DEPEND_ABI.python+= python<3
-
USE_BOOST_LIBS= python
+USE_PYTHON= true
include ../../meta-pkgs/hpp/Makefile.common
@@ -20,7 +19,6 @@ include ../../math/eigen3/depend.mk
include ../../devel/boost-headers/depend.mk
include ../../devel/boost-libs/depend.mk
-include ../../mk/sysdep/python.mk
include ../../mk/language/c.mk
-include ../../mk/language/c++.mk
+include ../../mk/language/c++11.mk
include ../../mk/robotpkg.mk
diff --git a/hpp-spline/PLIST b/hpp-spline/PLIST
index ca47c74d..5b2b3529 100644
--- a/hpp-spline/PLIST
+++ b/hpp-spline/PLIST
@@ -16,4 +16,4 @@ include/hpp/spline/quintic_spline.h
include/hpp/spline/spline_deriv_constraint.h
include/hpp/spline/warning.hh
lib/pkgconfig/hpp-spline.pc
-${PYTHON_SITELIB}/hpp_spline${PYTHON_EXT_SUFFIX}
+${PYTHON_SITELIB}/hpp_spline.so
diff --git a/hpp-spline/depend.mk b/hpp-spline/depend.mk
index affcb715..db73e0e9 100644
--- a/hpp-spline/depend.mk
+++ b/hpp-spline/depend.mk
@@ -11,11 +11,13 @@ endif
ifeq (+,$(HPP_SPLINE_DEPEND_MK)) # --------------------------------------
+include ../../mk/sysdep/python.mk
+
PREFER.hpp-spline?= robotpkg
DEPEND_USE+= hpp-spline
-DEPEND_ABI.hpp-spline?= hpp-spline>=4.2.0
+DEPEND_ABI.hpp-spline?= ${PKGTAG.python-}hpp-spline>=4.5.0
DEPEND_DIR.hpp-spline?= ../../wip/hpp-spline
SYSTEM_SEARCH.hpp-spline=\
--
GitLab