From 912317fbb9cdbb949f80b4fc29aa661d43003def Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Fri, 17 Jan 2020 19:34:54 +0100
Subject: [PATCH] [wip/py-libnabo] fix Boost::Python detection
---
py-libnabo/Makefile | 6 ++++++
py-libnabo/distinfo | 1 +
py-libnabo/patches/patch-ab | 13 +++++++++++++
3 files changed, 20 insertions(+)
create mode 100644 py-libnabo/patches/patch-ab
diff --git a/py-libnabo/Makefile b/py-libnabo/Makefile
index 072eaee5..31e8d96f 100644
--- a/py-libnabo/Makefile
+++ b/py-libnabo/Makefile
@@ -5,6 +5,7 @@
ORG= ethz-asl
NAME= libnabo
VERSION= 1.0.7
+PKGREVISION= 1
DISTNAME= ${VERSION}
PKGNAME= ${PKGTAG.python-}${NAME}-${VERSION}
@@ -24,9 +25,13 @@ USE_BOOST_LIBS= python
PYTHON_MINOR= $(word 2,$(subst ., ,${PYTHON_VERSION}))
+Boost_PYTHON_LIBRARY= $(filter %.so,${SYSTEM_FILES.boost-lib-python})
CMAKE_ARGS+= -DSHARED_LIBS=true
CMAKE_ARGS+= -DPYTHON_VERSION_MAJOR=${PYTHON_MAJOR}
CMAKE_ARGS+= -DPYTHON_VERSION_MINOR=${PYTHON_MINOR}
+CMAKE_ARGS+= -DBoost_PYTHON_LIBRARY=${Boost_PYTHON_LIBRARY}
+CMAKE_ARGS+= -DBoost_PYTHON_LIBRARY_RELEASE=${Boost_PYTHON_LIBRARY}
+CMAKE_ARGS+= -DBoost_PYTHON_LIBRARY_DEBUG=${Boost_PYTHON_LIBRARY}
include ../../devel/boost-headers/depend.mk
include ../../devel/boost-libs/depend.mk
@@ -36,6 +41,7 @@ include ../../mk/sysdep/cmake.mk
include ../../mk/sysdep/doxygen.mk
include ../../mk/sysdep/pdflatex.mk
include ../../mk/sysdep/python.mk
+include ../../mk/sysdep/py-numpy.mk
include ../../mk/language/c.mk
include ../../mk/language/c++11.mk
include ../../mk/robotpkg.mk
diff --git a/py-libnabo/distinfo b/py-libnabo/distinfo
index 17cb5499..9504555d 100644
--- a/py-libnabo/distinfo
+++ b/py-libnabo/distinfo
@@ -2,3 +2,4 @@ SHA1 (1.0.7.tar.gz) = b966b712c55c93628089dc771067adfd7b16593d
RMD160 (1.0.7.tar.gz) = aa59ec3ea2c5a1391a31fe15af259be9995eff96
Size (1.0.7.tar.gz) = 974686 bytes
SHA1 (patch-aa) = b8468d9f53b7c9a5caa1a6dd32be53a861e152a6
+SHA1 (patch-ab) = 23ded35441c6268f94999cb4ab104f679680fb99
diff --git a/py-libnabo/patches/patch-ab b/py-libnabo/patches/patch-ab
new file mode 100644
index 00000000..2b6aa299
--- /dev/null
+++ b/py-libnabo/patches/patch-ab
@@ -0,0 +1,13 @@
+Fix Boost::Python lib detection
+
+--- python/CMakeLists.txt.orig 2019-02-08 06:31:26.000000000 +0100
++++ python/CMakeLists.txt 2020-01-17 19:32:56.868020743 +0100
+@@ -43,7 +43,7 @@
+ endif(PYTHON_VERSION_MAJOR GREATER 2)
+ endif (PYTHON_DEB_INSTALL_TARGET)
+
+- find_package(Boost COMPONENTS ${BOOST_PYTHON_COMPONENT})
++ find_package(Boost COMPONENTS python)
+ find_python_module(numpy)
+ find_package_handle_standard_args(numpy DEFAULT_MSG PY_NUMPY)
+ if (Boost_FOUND AND NUMPY_FOUND)
--
GitLab