From: Ladislav Michl <ladis@linux-mips.org>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH] gpsd: version bump 3.19 -> 3.20
Date: Sun, 19 Jan 2020 22:37:53 +0100 [thread overview]
Message-ID: <20200119213753.GB2030445@lenoch> (raw)
Quite a few options were removed, so remome them from Kconfig as well.
Buildsystem counts on gcc to be used for linking and setting LD makes
build fail, so set only those tools actually used.
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
.../0001-Search-for-ncursesw-pkgconfig.patch | 4 +-
...Fix-python-binding-cross-compilation.patch | 12 +++---
...sizeof-time_t-test-when-cross-compil.patch | 38 +++++++++++++++++++
patches/{gpsd-3.19 => gpsd-3.20}/series | 3 +-
rules/gpsd.in | 24 ------------
rules/gpsd.make | 23 ++++-------
6 files changed, 55 insertions(+), 49 deletions(-)
rename patches/{gpsd-3.19 => gpsd-3.20}/0001-Search-for-ncursesw-pkgconfig.patch (92%)
rename patches/{gpsd-3.19 => gpsd-3.20}/0002-Fix-python-binding-cross-compilation.patch (93%)
create mode 100644 patches/gpsd-3.20/0003-SConstruct-Skip-sizeof-time_t-test-when-cross-compil.patch
rename patches/{gpsd-3.19 => gpsd-3.20}/series (54%)
diff --git a/patches/gpsd-3.19/0001-Search-for-ncursesw-pkgconfig.patch b/patches/gpsd-3.20/0001-Search-for-ncursesw-pkgconfig.patch
similarity index 92%
rename from patches/gpsd-3.19/0001-Search-for-ncursesw-pkgconfig.patch
rename to patches/gpsd-3.20/0001-Search-for-ncursesw-pkgconfig.patch
index 235d5b36e..3030d2970 100644
--- a/patches/gpsd-3.19/0001-Search-for-ncursesw-pkgconfig.patch
+++ b/patches/gpsd-3.20/0001-Search-for-ncursesw-pkgconfig.patch
@@ -11,10 +11,10 @@ Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
1 file changed, 2 insertions(+)
diff --git a/SConstruct b/SConstruct
-index 5160481a7a7b..7bd5b08f2a46 100644
+index 33e0ff32665c..0fde205c7302 100644
--- a/SConstruct
+++ b/SConstruct
-@@ -826,6 +826,8 @@ else:
+@@ -872,6 +872,8 @@ else:
ncurseslibs = pkg_config('ncurses', rpath_hack=True)
if config.CheckPKG('tinfo'):
ncurseslibs += pkg_config('tinfo', rpath_hack=True)
diff --git a/patches/gpsd-3.19/0002-Fix-python-binding-cross-compilation.patch b/patches/gpsd-3.20/0002-Fix-python-binding-cross-compilation.patch
similarity index 93%
rename from patches/gpsd-3.19/0002-Fix-python-binding-cross-compilation.patch
rename to patches/gpsd-3.20/0002-Fix-python-binding-cross-compilation.patch
index 94a4810f6..4177eb27a 100644
--- a/patches/gpsd-3.19/0002-Fix-python-binding-cross-compilation.patch
+++ b/patches/gpsd-3.20/0002-Fix-python-binding-cross-compilation.patch
@@ -7,10 +7,10 @@ Subject: [PATCH] Fix python binding cross-compilation
1 file changed, 21 insertions(+), 27 deletions(-)
diff --git a/SConstruct b/SConstruct
-index 7bd5b08f2a46..4895b659ba49 100644
+index 0fde205c7302..344bf42f84ea 100644
--- a/SConstruct
+++ b/SConstruct
-@@ -440,6 +440,10 @@ def announce(msg):
+@@ -424,6 +424,10 @@ def announce(msg):
if not env.GetOption("silent"):
print(msg)
@@ -21,7 +21,7 @@ index 7bd5b08f2a46..4895b659ba49 100644
# DESTDIR environment variable means user prefix the installation root.
DESTDIR = os.environ.get('DESTDIR', '')
-@@ -454,12 +458,6 @@ def installdir(dir, add_destdir=True):
+@@ -438,12 +442,6 @@ def installdir(idir, add_destdir=True):
wrapped.replace("/usr/lib/systemd", "/lib/systemd")
return wrapped
@@ -34,7 +34,7 @@ index 7bd5b08f2a46..4895b659ba49 100644
# Give deheader a way to set compiler flags
if 'MORECFLAGS' in os.environ:
env.Append(CFLAGS=Split(os.environ['MORECFLAGS']))
-@@ -513,11 +511,6 @@ if env['target']:
+@@ -497,11 +495,6 @@ if env['target']:
for (name, toolname) in devenv:
env[name] = env['target'] + '-' + toolname
@@ -46,7 +46,7 @@ index 7bd5b08f2a46..4895b659ba49 100644
# Build help
def cmp(a, b):
return (a > b) - (a < b)
-@@ -1156,22 +1149,23 @@ if helping:
+@@ -1225,22 +1218,23 @@ if helping:
else:
@@ -85,7 +85,7 @@ index 7bd5b08f2a46..4895b659ba49 100644
if config.env['python_libdir']:
python_libdir = config.env['python_libdir']
else:
-@@ -1674,7 +1668,7 @@ else:
+@@ -1780,7 +1774,7 @@ else:
LINK=ldshared,
SHLIBPREFIX="",
SHLIBSUFFIX=python_config['SO'],
diff --git a/patches/gpsd-3.20/0003-SConstruct-Skip-sizeof-time_t-test-when-cross-compil.patch b/patches/gpsd-3.20/0003-SConstruct-Skip-sizeof-time_t-test-when-cross-compil.patch
new file mode 100644
index 000000000..d069f6f12
--- /dev/null
+++ b/patches/gpsd-3.20/0003-SConstruct-Skip-sizeof-time_t-test-when-cross-compil.patch
@@ -0,0 +1,38 @@
+From: Jeffery To <jeffery.to@gmail.com>
+Date: Fri, 17 Jan 2020 06:09:33 +0800
+Subject: [PATCH] SConstruct: Skip sizeof(time_t) test when cross-compiling
+
+Fixes #48.
+---
+ SConstruct | 18 +++++++++++++-----
+ 1 file changed, 13 insertions(+), 5 deletions(-)
+
+diff --git a/SConstruct b/SConstruct
+index 344bf42f84ea..10cb4f972f52 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -1038,11 +1038,19 @@ 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")
++ if not env['target']:
++ sizeof_time_t = config.CheckTypeSize('time_t',
++ includes='#include <time.h>\n')
++ if 0 < sizeof_time_t:
++ announce("sizeof(time_t) is %s" % sizeof_time_t)
++ if 4 >= sizeof_time_t:
++ announce("WARNING: time_t is too small. It will fail in 2038")
++ else:
++ announce("WARNING: could not get sizeof(time_t)")
++ sizeof_time_t = 8
++ else:
++ announce("Not checking sizeof(time_t) when cross-compiling")
++ sizeof_time_t = 8
+
+ # check function after libraries, because some function require libraries
+ # for example clock_gettime() require librt on Linux glibc < 2.17
diff --git a/patches/gpsd-3.19/series b/patches/gpsd-3.20/series
similarity index 54%
rename from patches/gpsd-3.19/series
rename to patches/gpsd-3.20/series
index 32349387e..d126d2445 100644
--- a/patches/gpsd-3.19/series
+++ b/patches/gpsd-3.20/series
@@ -2,4 +2,5 @@
#tag:base --start-number 1
0001-Search-for-ncursesw-pkgconfig.patch
0002-Fix-python-binding-cross-compilation.patch
-# a402ea49345e59dc5c9f5487c0ce65c6 - git-ptx-patches magic
+0003-SConstruct-Skip-sizeof-time_t-test-when-cross-compil.patch
+# 0a25b3a60da43320932e29415a6d365a - git-ptx-patches magic
diff --git a/rules/gpsd.in b/rules/gpsd.in
index 660088969..ba0edb7bc 100644
--- a/rules/gpsd.in
+++ b/rules/gpsd.in
@@ -29,23 +29,10 @@ config GPSD_NCURSES
comment "time service ---"
-config GPSD_NTP
- bool
- prompt "NTP time hinting support"
-
-config GPSD_NTPSHM
- bool
- depends on GPSD_NTP
- prompt "NTP time hinting via shared memory"
-
config GPSD_OSCILLATOR
bool
prompt "Disciplined oscillator support"
-config GPSD_PPS
- bool
- prompt "PPS time syncing support"
-
comment "export methods ---"
config GPSD_DBUS
@@ -111,14 +98,6 @@ config GPSD_USER
help
This user is used for privilege separation.
-config GPSD_FIXED_PORT_SPEED
- string
- prompt "fixed port speed"
-
-config GPSD_FIXED_PORT_BITS
- string
- prompt "fixed port bits"
-
config GPSD_MAX_CLIENTS
string
prompt "max clients"
@@ -207,7 +186,6 @@ menu "drivers"
config GPSD_DRIVER_UBX
bool
- select GPSD_NTPSHM
select GPSD_DRIVER_NMEA
prompt "ubx"
@@ -356,8 +334,6 @@ menu "install options"
config GPSD_NTPSHMMON
bool
- select GPSD_NTP
- select GPSD_PPS
select GPSD_SHM
prompt "ntpshmmon"
help
diff --git a/rules/gpsd.make b/rules/gpsd.make
index ae4e0628e..ac95b0af6 100644
--- a/rules/gpsd.make
+++ b/rules/gpsd.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_GPSD) += gpsd
#
# Paths and names
#
-GPSD_VERSION := 3.19
-GPSD_MD5 := b3bf88706794eb8e5f2c2543bf7ba87b
+GPSD_VERSION := 3.20
+GPSD_MD5 := cf7fdec7ce7221d20bee1a7246362b05
GPSD := gpsd-$(GPSD_VERSION)
GPSD_SUFFIX := tar.gz
GPSD_URL := http://download.savannah.gnu.org/releases/gpsd/$(GPSD).$(GPSD_SUFFIX)
@@ -52,6 +52,11 @@ GPSD_PROGS-$(PTXCONF_GPSD_UBXTOOL) += ubxtool
GPSD_PROGS-$(PTXCONF_GPSD_ZERK) += zerk
GPSD_CONF_TOOL := scons
+GPSD_CONF_ENV := \
+ $(CROSS_ENV_AR) \
+ $(CROSS_ENV_CC) \
+ LD=$(CROSS_CC) \
+ $(CROSS_ENV_RANLIB)
GPSD_CONF_OPT := \
aivdm=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_AIVDM) \
ashtech=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_ASHTECH) \
@@ -75,10 +80,8 @@ GPSD_CONF_OPT := \
gpsdclients=$(GPSD_BUILD_CLIENTS) \
greis=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_GREIS) \
implicit_link=yes \
- ipv6=$(call ptx/yesno, PTXCONF_GLOBAL_IPV6) \
isync=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_ISYNC) \
itrax=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_ITRAX) \
- leapfetch=yes \
libdir=/usr/$(CROSS_LIB_DIR) \
libgpsmm=no \
magic_hat=no \
@@ -90,16 +93,12 @@ GPSD_CONF_OPT := \
netfeed=yes \
nmea0183=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_NMEA) \
nmea2000=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_NMEA) \
- nofloats=no \
nostrip=yes \
- ntp=$(call ptx/yesno, PTXCONF_GPSD_NTP) \
- ntpshm=$(call ptx/yesno, PTXCONF_GPSD_SHM) \
ntrip=$(call ptx/yesno, GPSD_DRIVER_NTRIP) \
oceanserver=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_OCEANSERVER) \
oncore=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_ONCORE) \
oscillator=$(call ptx/yesno, PTXCONF_GPSD_OSCILLATOR) \
passthrough=no \
- pps=$(call ptx/yesno, PTXCONF_GPSD_PPS) \
prefix=/usr \
profiling=$(call ptx/yesno, PTXCONF_GPSD_PROFILING) \
python=$(call ptx/yesno, PTXCONF_GPSD_PYTHON) \
@@ -121,7 +120,6 @@ GPSD_CONF_OPT := \
target=$(PTXCONF_GNU_TARGET) \
target_python=$(CROSS_PYTHON3) \
timeservice=no \
- timing=no \
tnt=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_TNT) \
tripmate=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_TRIPMATE) \
tsip=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_TSIP) \
@@ -130,13 +128,6 @@ GPSD_CONF_OPT := \
usb=$(call ptx/yesno, PTXCONF_GPSD_USB) \
xgps=no
-ifneq ($(call remove_quotes,$(PTXCONF_GPSD_FIXED_PORT_SPEED)),)
-GPSD_CONF_OPT += fixed_port_speed=$(PTXCONF_GPSD_FIXED_PORT_SPEED)
-endif
-ifneq ($(call remove_quotes,$(PTXCONF_GPSD_FIXED_PORT_BITS)),)
-GPSD_CONF_OPT += fixed_port_bits=$(PTXCONF_GPSD_FIXED_PORT_BITS)
-endif
-
ifneq ($(call remove_quotes,$(PTXCONF_GPSD_GROUP)),)
GPSD_CONF_OPT += gpsd_group=$(PTXCONF_GPSD_GROUP)
endif
--
2.25.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
next reply other threads:[~2020-01-19 21:37 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-19 21:37 Ladislav Michl [this message]
2020-01-30 22:17 ` Ladislav Michl
2020-01-31 7:09 ` Michael Olbrich
2020-01-31 21:37 ` Ladislav Michl
2020-02-01 9:02 ` Michael Olbrich
2020-02-01 19:43 ` Ladislav Michl
2020-02-02 13:18 ` Ladislav Michl
2020-02-04 1:02 ` Ladislav Michl
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200119213753.GB2030445@lenoch \
--to=ladis@linux-mips.org \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox