[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-196-g43b8fbca7

[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  43b8fbca7e7939e6ec5b0cf569b724af797128bd (commit)
      from  4fac84f2e35ae652aeef446fab23eae27fde1360 (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 43b8fbca7e7939e6ec5b0cf569b724af797128bd
Author: Julien BOIBESSOT <jul...@ar...>
Date:   Mon Jun 8 17:38:10 2020 +0200

    [BUILDROOT] 2020.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/2020.02/046-armadeus-package-gpsd-fix-python-tools-build-and-install.patch b/patches/buildroot/2020.02/046-armadeus-package-gpsd-fix-python-tools-build-and-install.patch
index fe5570166..f351414bf 100644
--- a/patches/buildroot/2020.02/046-armadeus-package-gpsd-fix-python-tools-build-and-install.patch
+++ b/patches/buildroot/2020.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
 +++ buildroot/package/gpsd/gpsd.mk
-@@ -24,10 +24,17 @@ GPSD_SCONS_OPTS = \
+@@ -24,10 +24,23 @@ GPSD_SCONS_OPTS = \
  	sysroot=$(STAGING_DIR) \
  	strip=no \
  	python=no \
@@ -15,12 +15,18 @@ Index: buildroot/package/gpsd/gpsd.mk
  	systemd=$(if $(BR2_INIT_SYSTEMD),yes,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