Browse Source

Merge pull request #11040 from jefferyto/gpsd-3.20

gpsd: Update to 3.20, add/refresh patches
lilik-openwrt-22.03
Rosen Penev 5 years ago
committed by GitHub
parent
commit
40975c6c1e
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 48 additions and 9 deletions
  1. +4
    -4
      utils/gpsd/Makefile
  2. +26
    -0
      utils/gpsd/patches/0001-no-distutils-import.patch
  3. +3
    -5
      utils/gpsd/patches/0002-ncurses6_detection.patch
  4. +15
    -0
      utils/gpsd/patches/0003-no-sizeof_time_t-check.patch

+ 4
- 4
utils/gpsd/Makefile View File

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=gpsd
PKG_VERSION:=3.19
PKG_RELEASE:=2
PKG_VERSION:=3.20
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@SAVANNAH/$(PKG_NAME)
PKG_HASH:=27dd24d45b2ac69baab7933da2bf6ae5fb0be90130f67e753c110a3477155f39
PKG_HASH:=3998a5cbb728e97f896f46c3c83301b1e6c5d859393e58c2fad8c5426774d571
PKG_MAINTAINER:=Pushpal Sidhu <psidhu.devel@gmail.com>
PKG_LICENSE:=BSD-3-Clause


+ 26
- 0
utils/gpsd/patches/0001-no-distutils-import.patch View File

@ -0,0 +1,26 @@
--- a/SConstruct
+++ b/SConstruct
@@ -42,7 +42,6 @@ import re
import subprocess
import sys
import time
-from distutils import sysconfig
import SCons
@@ -669,6 +668,7 @@ def GetPythonValue(context, name, imp, e
context.Message('Obtaining Python %s... ' % name)
context.sconf.cached = 0 # Avoid bogus "(cached)"
if not env['target_python']:
+ from distutils import sysconfig
status, value = 0, str(eval(expr))
else:
command = [target_python_path, '-c', '%s; print(%s)' % (imp, expr)]
@@ -1218,6 +1218,7 @@ if helping:
# If helping just get usable config info from the local Python
target_python_path = ''
+ from distutils import sysconfig
py_config_text = str(eval(PYTHON_CONFIG_CALL))
python_libdir = str(eval(PYTHON_LIBDIR_CALL))

+ 3
- 5
utils/gpsd/patches/0002-ncurses6_detection.patch View File

@ -1,8 +1,6 @@
Index: gpsd-3.16/SConstruct
===================================================================
--- gpsd-3.16.orig/SConstruct
+++ gpsd-3.16/SConstruct
@@ -672,6 +672,10 @@ else:
--- a/SConstruct
+++ b/SConstruct
@@ -874,6 +874,10 @@ else:
ncurseslibs += pkg_config('tinfo', rpath_hack=True)
# It's not yet known whether rpath_hack is appropriate for
# ncurses5-config.


+ 15
- 0
utils/gpsd/patches/0003-no-sizeof_time_t-check.patch View File

@ -0,0 +1,15 @@
--- a/SConstruct
+++ b/SConstruct
@@ -1047,12 +1047,6 @@ else:
confdefs.append("/* #undef HAVE_%s_H */\n"
% hdr.replace("/", "_").upper())
- sizeof_time_t = config.CheckSizeOf("time_t")
- confdefs.append("#define SIZEOF_TIME_T %s\n" % sizeof_time_t)
- announce("sizeof(time_t) is %s" % sizeof_time_t)
- if 4 >= int(sizeof_time_t):
- announce("WARNING: time_t is too small. It will fail in 2038")
-
# check function after libraries, because some function require libraries
# for example clock_gettime() require librt on Linux glibc < 2.17
for f in ("cfmakeraw", "clock_gettime", "daemon", "fcntl", "fork",

Loading…
Cancel
Save