Browse Source

Merge pull request #11805 from neheb/ntp

ntpclient: fix compilation with newer kernels
lilik-openwrt-22.03
Rosen Penev 5 years ago
committed by GitHub
parent
commit
9d11866837
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 54 additions and 1 deletions
  1. +1
    -1
      net/ntpclient/Makefile
  2. +41
    -0
      net/ntpclient/patches/200-time.patch
  3. +12
    -0
      net/ntpclient/patches/300-siocgarp.patch

+ 1
- 1
net/ntpclient/Makefile View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=ntpclient PKG_NAME:=ntpclient
PKG_VERSION:=2015_365 PKG_VERSION:=2015_365
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://doolittle.icarus.com/ntpclient PKG_SOURCE_URL:=http://doolittle.icarus.com/ntpclient


+ 41
- 0
net/ntpclient/patches/200-time.patch View File

@ -0,0 +1,41 @@
--- a/adjtimex.c
+++ b/adjtimex.c
@@ -36,6 +36,7 @@
* gcc -Wall -O adjtimex_1.c -o adjtimex
*/
+#include <inttypes.h>
#include <stdio.h>
#include <sys/types.h>
#include <stdlib.h>
@@ -143,8 +144,8 @@ int main(int argc, char ** argv)
" precision: %ld\n"
" tolerance: %ld\n"
"-t tick: %ld\n"
- " time.tv_sec: %ld\n"
- " time.tv_usec: %ld\n"
+ " time.tv_sec: %" PRId64 "\n"
+ " time.tv_usec: %" PRId64 "\n"
" return value: %d (%s)\n",
txc.constant,
txc.precision, txc.tolerance, txc.tick,
--- a/ntpclient.c
+++ b/ntpclient.c
@@ -181,7 +181,7 @@ static void set_time(struct ntptime *new)
exit(1);
}
if (debug) {
- printf("set time to %lu.%.9lu\n", tv_set.tv_sec, tv_set.tv_nsec);
+ printf("set time to %" PRId64 ".%.9" PRId64 "\n", (int64_t)tv_set.tv_sec, (int64_t)tv_set.tv_nsec);
}
#else
/* Traditional Linux way to set the system clock
@@ -196,7 +196,7 @@ static void set_time(struct ntptime *new)
exit(1);
}
if (debug) {
- printf("set time to %lu.%.6lu\n", tv_set.tv_sec, tv_set.tv_usec);
+ printf("set time to %" PRId64 ".%.6" PRId64 "\n", (int64_t)tv_set.tv_sec, (int64_t)tv_set.tv_usec);
}
#endif
}

+ 12
- 0
net/ntpclient/patches/300-siocgarp.patch View File

@ -0,0 +1,12 @@
--- a/ntpclient.c
+++ b/ntpclient.c
@@ -42,6 +42,9 @@
#include <errno.h>
#ifdef PRECISION_SIOCGSTAMP
#include <sys/ioctl.h>
+#ifdef __GLIBC__
+#include <linux/sockios.h>
+#endif
#endif
#ifdef USE_OBSOLETE_GETTIMEOFDAY
#include <sys/time.h>

Loading…
Cancel
Save