[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-198-g244080675

[Julien B a. A. <ar...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  244080675e0d6696ac9b30db85b3c74564d8d72d (commit)
      from  0cdb23f1daeb371685c408327b1e93a62b34a20c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 244080675e0d6696ac9b30db85b3c74564d8d72d
Author: Julien BOIBESSOT <jul...@ar...>
Date:   Tue Jun 9 12:30:46 2020 +0200

    [BUILDROOT] 2019.02: fix gpsd python fix for python3

-----------------------------------------------------------------------

Summary of changes:
 ...eus-package-gpsd-fix-python-tools-build-and-install.patch | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/patches/buildroot/2019.02/046-armadeus-package-gpsd-fix-python-tools-build-and-install.patch b/patches/buildroot/2019.02/046-armadeus-package-gpsd-fix-python-tools-build-and-install.patch
index 125a9c2e1..ab09e339c 100644
--- a/patches/buildroot/2019.02/046-armadeus-package-gpsd-fix-python-tools-build-and-install.patch
+++ b/patches/buildroot/2019.02/046-armadeus-package-gpsd-fix-python-tools-build-and-install.patch
@@ -6,7 +6,7 @@ Index: buildroot/package/gpsd/gpsd.mk
 ===================================================================
 --- buildroot.orig/package/gpsd/gpsd.mk	2020-01-10 18:11:07.923396474 +0100
 +++ buildroot/package/gpsd/gpsd.mk	2020-01-10 23:01:18.320507779 +0100
-@@ -23,9 +23,16 @@
+@@ -23,9 +23,22 @@
  	prefix=/usr\
  	sysroot=$(STAGING_DIR)\
  	strip=no\
@@ -14,12 +14,18 @@ Index: buildroot/package/gpsd/gpsd.mk
  	qt=no
  
 +ifeq ($(BR2_PACKAGE_GPSD_PYTHON),y)
-+GPSD_SCONS_ENV += INCLUDEPY="$(STAGING_DIR)/usr/include/python2.7"
++ifeq ($(BR2_PACKAGE_PYTHON),y)
++GPSD_SCONS_ENV += INCLUDEPY="$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION)"
 +GPSD_SCONS_OPTS += \
-+	python_libdir=/usr/lib/python2.7/
++	python_libdir=/usr/lib/python$(PYTHON_VERSION)/
++else ifeq ($(BR2_PACKAGE_PYTHON3),y)
++GPSD_SCONS_ENV += INCLUDEPY="$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR)m"
++GPSD_SCONS_OPTS += \
++        python_libdir=/usr/lib/python$(PYTHON3_VERSION)/
 +else
 +GPSD_SCONS_OPTS += python=no
 +endif
++endif
 +
  ifeq ($(BR2_PACKAGE_NCURSES),y)
  GPSD_DEPENDENCIES += ncurses


hooks/post-receive
-- 
armadeus