diff options
| author | Alexander Stein <alexander.stein@systec-electronic.com> | 2010-01-05 13:29:41 +0100 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-01-07 11:51:43 +0100 |
| commit | 9d3ca35fe53bb17fef4658de94443c733a3ea08b (patch) | |
| tree | 52a98702b3697774a36e32d025b8df97b8a31a49 | |
| parent | a55bb7afd9308a2c5cded03d51cf284e94c35f24 (diff) | |
| download | ptxdist-9d3ca35fe53bb17fef4658de94443c733a3ea08b.tar.gz ptxdist-9d3ca35fe53bb17fef4658de94443c733a3ea08b.tar.xz | |
[ntp] Add patch for fixing a undefined MOD_NANO
Signed-off-by: Alexander Stein <alexander.stein@systec-electronic.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
| -rw-r--r-- | patches/ntp-4.2.4p7/Fix-undefined-MOD_NANO.patch | 48 | ||||
| -rw-r--r-- | patches/ntp-4.2.4p7/series | 1 |
2 files changed, 49 insertions, 0 deletions
diff --git a/patches/ntp-4.2.4p7/Fix-undefined-MOD_NANO.patch b/patches/ntp-4.2.4p7/Fix-undefined-MOD_NANO.patch new file mode 100644 index 000000000..89cd8c3a1 --- /dev/null +++ b/patches/ntp-4.2.4p7/Fix-undefined-MOD_NANO.patch @@ -0,0 +1,48 @@ +From 4ccca7260da74d8f9a238a79c03da440831bd33e Mon Sep 17 00:00:00 2001 +From: Alexander Stein <alexander.stein@systec-electronic.com> +Date: Tue, 5 Jan 2010 13:13:02 +0100 +Subject: [PATCH] Fix undefined MOD_NANO + +With gcc version 4.4.1 (Sourcery G++ Lite 2009q3-67) I get this error: + +ntp_loopfilter.c: In function 'local_clock': +ntp_loopfilter.c:571: error: 'MOD_NANO' undeclared (first use in this function) +ntp_loopfilter.c:571: error: (Each undeclared identifier is reported only once +ntp_loopfilter.c:571: error: for each function it appears in.) +ntp_loopfilter.c: In function 'loop_config': +ntp_loopfilter.c:896: error: 'MOD_NANO' undeclared (first use in this function) +make[4]: *** [ntp_loopfilter.o] Error 1 + +Fix it by changing MOD_NANO to STA_NANO. + +This may be related to some specific toolchains, due to some defines. I use the +Codesourcery Sourcery G++ Lite 2009q3-67 toolchain. + +Signed-off-by: Alexander Stein <alexander.stein@systec-electronic.com> +Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> +--- + ntpd/ntp_loopfilter.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +Index: ntp-4.2.4p7/ntpd/ntp_loopfilter.c +=================================================================== +--- ntp-4.2.4p7/ntpd/ntp_loopfilter.c ++++ ntp-4.2.4p7/ntpd/ntp_loopfilter.c +@@ -568,7 +568,7 @@ + time_t tstamp; + + #ifdef STA_NANO +- ntv.modes = MOD_BITS | MOD_NANO; ++ ntv.modes = MOD_BITS | STA_NANO; + #else /* STA_NANO */ + ntv.modes = MOD_BITS; + #endif /* STA_NANO */ +@@ -893,7 +893,7 @@ + pll_control = 1; + memset(&ntv, 0, sizeof(ntv)); + #ifdef STA_NANO +- ntv.modes = MOD_BITS | MOD_NANO; ++ ntv.modes = MOD_BITS | STA_NANO; + #else /* STA_NANO */ + ntv.modes = MOD_BITS; + #endif /* STA_NANO */ diff --git a/patches/ntp-4.2.4p7/series b/patches/ntp-4.2.4p7/series new file mode 100644 index 000000000..6a7679cc7 --- /dev/null +++ b/patches/ntp-4.2.4p7/series @@ -0,0 +1 @@ +Fix-undefined-MOD_NANO.patch |