diff options
| author | Pavel Demin <pavel-demin@outlook.com> | 2018-10-20 00:07:32 +0000 |
|---|---|---|
| committer | Leonardo Arena <rnalrd@alpinelinux.org> | 2019-02-26 13:02:34 +0000 |
| commit | 9b2a016a25d2218fd7ea26a07f5b3ce0be4e77b9 (patch) | |
| tree | 96b2678aaec2d6b412281511b1df41ca9c885333 | |
| parent | cc8d915c6f5b5cddf8bd9eec30cba936f71a90d1 (diff) | |
| download | aports-9b2a016a25d2218fd7ea26a07f5b3ce0be4e77b9.tar.bz2 aports-9b2a016a25d2218fd7ea26a07f5b3ce0be4e77b9.tar.xz | |
main/gpsd fix PPS functionality
| -rw-r--r-- | main/gpsd/APKBUILD | 2 | ||||
| -rw-r--r-- | main/gpsd/gpsd-use-local-timepps-header.patch | 28 |
2 files changed, 12 insertions, 18 deletions
diff --git a/main/gpsd/APKBUILD b/main/gpsd/APKBUILD index 52b8196c42..92611feaea 100644 --- a/main/gpsd/APKBUILD +++ b/main/gpsd/APKBUILD @@ -74,7 +74,7 @@ _clients() { sha512sums="71085053f600730e0f2de269c59ce0a17ae106ef01403f02d78418b267c6adb9818d541fba59eb23bf71cdb67c5442c82b4948d262ef7e74bb993dcae677a1b1 gpsd-3.17.tar.gz eb11fc19243d1789016d88eb7645bfe67c46304547781489bf36eb1dd4c252d523681ff835a6488fa0ef62b6b9e2f781c672279f4439f5d5640a3f214a113048 timepps.h -ca534795df3033f15a2cd2f8cc6de5d71608f30418887f31df6dc1db1f283d5cf82920923a1a4adbcaa147e9e32458eee46aed3d64a9a83c950bb83d5e9d4f6e gpsd-use-local-timepps-header.patch +b6556bb16ea663ad1e4b5b43308b5e784472a7b2775ea9da4aa95ab03a3d88714455c346299cd0f98d0a204769b356ba1cf89da143b6f1a1b99b3e512f4035d2 gpsd-use-local-timepps-header.patch e2af8f52fc2d7e663882b6d12c5f4d709aa267b16eb9aeca2a70d8ecc681ae72359f3efcd1636cde576bc8579e008f242574bc0adfab7252d3e763f039e86135 ttydefaults.patch a0e7bf206ad51c31195f86f79ef92adca425d7f988534c0f70a2dd3053613f6fc46820d62d0330aaef7ca100b5f2ab781ce9643f25b4c99c844ae66e7eec5cbc gpsd.initd 55d4a51f82d445d3ac93b2855132ef4380908ed045feba6298ed1d0b607cd9054b5325c024dc52b370983ebd5d9b377537aee7d7128c97aa22e3075f4134d404 gpsd.confd" diff --git a/main/gpsd/gpsd-use-local-timepps-header.patch b/main/gpsd/gpsd-use-local-timepps-header.patch index ea27de7a3e..588dc4b69f 100644 --- a/main/gpsd/gpsd-use-local-timepps-header.patch +++ b/main/gpsd/gpsd-use-local-timepps-header.patch @@ -1,19 +1,13 @@ -diff --git a/ppsthread.c b/ppsthread.c -index 6819c6f..45002cb 100644 ---- a/ppsthread.c -+++ b/ppsthread.c -@@ -75,12 +75,11 @@ - */ - #define FAKE_PPS_NAME "ktimer" +diff --git a/SConstruct b/SConstruct +index 3318bb4..5c52d57 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -271,7 +271,7 @@ for var in import_env: + envs[var] = os.environ[var] + envs["GPSD_HOME"] = os.getcwd() --#if defined(HAVE_SYS_TIMEPPS_H) -+// We supply our own timepps.h for Linux - // include unistd.h here as it is missing on older pps-tools releases. - // 'close' is not defined otherwise. - #include <unistd.h> --#include <sys/timepps.h> --#endif -+#include "sys/timepps.h" +-env = Environment(tools=["default", "tar", "textfile"], options=opts, ENV=envs) ++env = Environment(tools=["default", "tar", "textfile"], options=opts, ENV=envs, CPPPATH=".") - #include "timespec.h" - #include "ppsthread.h" + # Minimal build turns off every option not set on the command line, + if ARGUMENTS.get('minimal'): |