[plplot] 05/06: Fix python libraries for different python versions

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole pushed a commit to branch master
in repository plplot.

commit 042488014ca53321b7e870e661418a6478963ba9
Author: Ole Streicher <olebole at debian.org>
Date:   Sat Sep 23 21:52:56 2017 +0200

    Fix python libraries for different python versions
---
 .../Build-bindings-for-all-Python-versions.patch   | 26 ++++++++++++++--------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/debian/patches/Build-bindings-for-all-Python-versions.patch b/debian/patches/Build-bindings-for-all-Python-versions.patch
index 2c95507..e385ecb 100644
--- a/debian/patches/Build-bindings-for-all-Python-versions.patch
+++ b/debian/patches/Build-bindings-for-all-Python-versions.patch
@@ -4,13 +4,13 @@ Subject: Build bindings for all Python versions
 
 ---
  CMakeLists.txt                       | 19 +++++++++++++++++
- bindings/CMakeLists.txt              |  6 +++++-
+ bindings/CMakeLists.txt              | 10 ++++++++-
  bindings/python/CMakeLists.txt       | 40 +++++++++++++++++++++++-------------
- bindings/qt_gui/CMakeLists.txt       |  6 +++++-
+ bindings/qt_gui/CMakeLists.txt       | 10 ++++++++-
  bindings/qt_gui/pyqt5/CMakeLists.txt | 24 +++++++++++-----------
  examples/CMakeLists.txt              | 20 +++++++++---------
  examples/python/CMakeLists.txt       | 10 ++++-----
- 7 files changed, 82 insertions(+), 43 deletions(-)
+ 7 files changed, 90 insertions(+), 43 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 27f738d..403c1f3 100644
@@ -43,17 +43,21 @@ index 27f738d..403c1f3 100644
  add_subdirectory(lib)
  add_subdirectory(include)
 diff --git a/bindings/CMakeLists.txt b/bindings/CMakeLists.txt
-index 7e92da4..fe96bd2 100644
+index 7e92da4..28b601d 100644
 --- a/bindings/CMakeLists.txt
 +++ b/bindings/CMakeLists.txt
-@@ -31,7 +31,11 @@ endif(PL_DEPRECATED_fortran)
+@@ -31,7 +31,15 @@ endif(PL_DEPRECATED_fortran)
  add_subdirectory(${TCL_TK_SRC_PREFIX}tcl tcl)
  add_subdirectory(${TCL_TK_SRC_PREFIX}tk tk)
  add_subdirectory(${TCL_TK_SRC_PREFIX}tk-x-plat tk-x-plat)
 -add_subdirectory(python)
 +foreach(PY_VERSION ${PY_VERSIONS})
-+  set(PYTHON_INCLUDE_PATH /usr/include/python${PY_VERSION})
 +  set(PYTHON_INSTDIR /usr/lib/python${PY_VERSION}/dist-packages)
++  set(PYTHON_INCLUDE_PATH /usr/include/python${PY_VERSION})
++  execute_process(
++    COMMAND python${PY_VERSION}-config --libs
++    OUTPUT_STRIP_TRAILING_WHITESPACE
++    OUTPUT_VARIABLE PYTHON_LIBRARIES)
 +  add_subdirectory(python python${PY_VERSION})
 +endforeach()
  add_subdirectory(octave)
@@ -173,17 +177,21 @@ index 153b819..5c67bba 100644
      LIBRARY
      DESTINATION ${PYTHON_INSTDIR}
 diff --git a/bindings/qt_gui/CMakeLists.txt b/bindings/qt_gui/CMakeLists.txt
-index f97c456..32b99d6 100644
+index f97c456..e4c5787 100644
 --- a/bindings/qt_gui/CMakeLists.txt
 +++ b/bindings/qt_gui/CMakeLists.txt
-@@ -115,7 +115,11 @@ if(ENABLE_qt)
+@@ -115,7 +115,15 @@ if(ENABLE_qt)
      pkg_config_file("qt" "Qt" " Qt binding" "plplotqt" "${pc_qt_COMPILE_FLAGS}" "-lplplot;${pc_qt_LIBRARIES_LIST};${MATH_LIB}")
  
      add_subdirectory(pyqt4)
 -    add_subdirectory(pyqt5)
 +    foreach(PY_VERSION ${PY_VERSIONS})
-+      set(PYTHON_INCLUDE_PATH /usr/include/python${PY_VERSION})
 +      set(PYTHON_INSTDIR /usr/lib/python${PY_VERSION}/dist-packages)
++      set(PYTHON_INCLUDE_PATH /usr/include/python${PY_VERSION})
++      execute_process(
++	COMMAND python${PY_VERSION}-config --libs
++	OUTPUT_STRIP_TRAILING_WHITESPACE
++	OUTPUT_VARIABLE PYTHON_LIBRARIES)
 +      add_subdirectory(pyqt5 pyqt5_${PY_VERSION})
 +    endforeach()
      add_subdirectory(smoke)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/plplot.git