[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-159-g247754b9e

[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  247754b9ea2bf41217a9b544995a0a993d15e3d5 (commit)
      from  20f0dea56739f151ced8b0b2993358c35813abdf (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 247754b9ea2bf41217a9b544995a0a993d15e3d5
Author: Julien BOIBESSOT <jul...@ar...>
Date:   Sat Jan 11 12:32:52 2020 +0100

    [BUILDROOT] 2019.02: fix gpsd python tools/module building and instalation

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

Summary of changes:
 ...e-gpsd-fix-python-tools-build-and-install.patch | 64 ++++++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 patches/buildroot/2019.02/046-armadeus-package-gpsd-fix-python-tools-build-and-install.patch

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
new file mode 100644
index 000000000..c52972a80
--- /dev/null
+++ b/patches/buildroot/2019.02/046-armadeus-package-gpsd-fix-python-tools-build-and-install.patch
@@ -0,0 +1,64 @@
+gpsd-3.19: allow and fix build of python modules and tool installation.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+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 @@
+ 	prefix=/usr\
+ 	sysroot=$(STAGING_DIR)\
+ 	strip=no\
+-	python=no \
+ 	qt=no
+ 
++ifeq ($(BR2_PACKAGE_GPSD_PYTHON),y)
++GPSD_SCONS_ENV += INCLUDEPY="$(STAGING_DIR)/usr/include/python2.7"
++GPSD_SCONS_OPTS += \
++	python_libdir=/lib/python2.7/
++else
++GPSD_SCONS_OPTS += python=no
++endif
++
+ ifeq ($(BR2_PACKAGE_NCURSES),y)
+ GPSD_DEPENDENCIES += ncurses
+ else
+Index: buildroot/package/gpsd/Config.in
+===================================================================
+--- buildroot.orig/package/gpsd/Config.in	2020-01-10 18:11:07.919396166 +0100
++++ buildroot/package/gpsd/Config.in	2020-01-10 23:10:06.506033813 +0100
+@@ -106,6 +106,9 @@
+ config BR2_PACKAGE_GPSD_SQUELCH
+ 	bool "squelch gpsd_report and gpsd_hexdump to save cpu"
+ 
++config BR2_PACKAGE_GPSD_PYTHON
++	bool "install python tools (ubxtool, python-gps, etc...)"
++
+ comment "Protocols"
+ 
+ config BR2_PACKAGE_GPSD_AIVDM
+Index: buildroot/package/gpsd/0002-SConstruct-python-gps-cross-build.patch
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/gpsd/0002-SConstruct-python-gps-cross-build.patch	2020-01-10 23:05:18.899876591 +0100
+@@ -0,0 +1,19 @@
++Do not use/overwrite some python_config[] values when cross-building modules,
++as these values are dynamically built using Host Python.
++
++Signed-off-by: Julien Boibessot <jul...@ar...>
++
++diff gpsd-3.19/SConstruct gpsd-3.19.mod/SConstruct
++--- gpsd-3.19/SConstruct	2020-01-10 18:42:13.743506998 +0100
+++++ gpsd-3.19.mod/SConstruct	2020-01-10 18:41:18.087219606 +0100
++@@ -1660,6 +1660,10 @@
++                              python_config['CXX'].split()[1:]))
++ 
++     ldshared = python_config['LDSHARED']
+++    python_config['CC'] = python_env['CC'] = os.environ['CC']
+++    python_config['INCLUDEPY'] = os.environ['INCLUDEPY']
+++
+++    ldshared = python_env['CC'] + ' -shared'
++     ldshared = ldshared.replace('-fPIE', '')
++     ldshared = ldshared.replace('-pie', '')
++     python_env.Replace(SHLINKFLAGS=[],


hooks/post-receive
-- 
armadeus