* [Buildroot] [PATCH] ntp: fix build for no-MMU
@ 2018-10-12 9:17 Baruch Siach
2018-10-12 9:25 ` Peter Korsgaard
2018-10-23 23:06 ` Peter Korsgaard
0 siblings, 2 replies; 3+ messages in thread
From: Baruch Siach @ 2018-10-12 9:17 UTC (permalink / raw)
To: buildroot
Code rearrange in the latest ntp version exposed code that used to be
hidden behind HAVE_WORKING_FORK. Put this code back where it belongs.
Fixes:
http://autobuild.buildroot.net/results/9f4/9f4710b451df1a60f95ab6503cfb7788ad998a65/
http://autobuild.buildroot.net/results/d0b/d0b20a6c0f37a8b06841afc2764c8aab6ffd27d2/
http://autobuild.buildroot.net/results/85c/85c89f5e9d36915567b8d14b9c99e3720c866577/
Cc: Artem Panfilov <apanfilov@spectracom.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
package/ntp/0003-fix-nommu.patch | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 package/ntp/0003-fix-nommu.patch
diff --git a/package/ntp/0003-fix-nommu.patch b/package/ntp/0003-fix-nommu.patch
new file mode 100644
index 000000000000..53bf4dfcf38b
--- /dev/null
+++ b/package/ntp/0003-fix-nommu.patch
@@ -0,0 +1,22 @@
+Fix no-MMU build
+
+The detach_from_terminal() is unused for no-MMU, but it depends on symbols
+that are not defined for no-MMU. Don't define detach_from_terminal() when
+HAVE_WORKING_FORK is not defined.
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+Upstream status: http://bugs.ntp.org/show_bug.cgi?id=3538
+
+diff -Nuar ntp-4.2.8p12.orig/ntpd/ntpd.c ntp-4.2.8p12/ntpd/ntpd.c
+--- ntp-4.2.8p12.orig/ntpd/ntpd.c 2018-08-14 14:51:30.000000000 +0300
++++ ntp-4.2.8p12/ntpd/ntpd.c 2018-10-12 08:19:01.291781773 +0300
+@@ -529,7 +529,7 @@
+ }
+ #endif /* !SIM */
+
+-#if !defined(SIM) && !defined(SYS_WINNT)
++#if !defined(SIM) && !defined(SYS_WINNT) && defined(HAVE_WORKING_FORK)
+ /*
+ * Detach from terminal (much like daemon())
+ * Nothe that this function calls exit()
--
2.19.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH] ntp: fix build for no-MMU
2018-10-12 9:17 [Buildroot] [PATCH] ntp: fix build for no-MMU Baruch Siach
@ 2018-10-12 9:25 ` Peter Korsgaard
2018-10-23 23:06 ` Peter Korsgaard
1 sibling, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2018-10-12 9:25 UTC (permalink / raw)
To: buildroot
>>>>> "Baruch" == Baruch Siach <baruch@tkos.co.il> writes:
> Code rearrange in the latest ntp version exposed code that used to be
> hidden behind HAVE_WORKING_FORK. Put this code back where it belongs.
> Fixes:
> http://autobuild.buildroot.net/results/9f4/9f4710b451df1a60f95ab6503cfb7788ad998a65/
> http://autobuild.buildroot.net/results/d0b/d0b20a6c0f37a8b06841afc2764c8aab6ffd27d2/
> http://autobuild.buildroot.net/results/85c/85c89f5e9d36915567b8d14b9c99e3720c866577/
> Cc: Artem Panfilov <apanfilov@spectracom.com>
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH] ntp: fix build for no-MMU
2018-10-12 9:17 [Buildroot] [PATCH] ntp: fix build for no-MMU Baruch Siach
2018-10-12 9:25 ` Peter Korsgaard
@ 2018-10-23 23:06 ` Peter Korsgaard
1 sibling, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2018-10-23 23:06 UTC (permalink / raw)
To: buildroot
>>>>> "Baruch" == Baruch Siach <baruch@tkos.co.il> writes:
> Code rearrange in the latest ntp version exposed code that used to be
> hidden behind HAVE_WORKING_FORK. Put this code back where it belongs.
> Fixes:
> http://autobuild.buildroot.net/results/9f4/9f4710b451df1a60f95ab6503cfb7788ad998a65/
> http://autobuild.buildroot.net/results/d0b/d0b20a6c0f37a8b06841afc2764c8aab6ffd27d2/
> http://autobuild.buildroot.net/results/85c/85c89f5e9d36915567b8d14b9c99e3720c866577/
> Cc: Artem Panfilov <apanfilov@spectracom.com>
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Committed to 2018.02.x and 2018.08.x, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-10-23 23:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-10-12 9:17 [Buildroot] [PATCH] ntp: fix build for no-MMU Baruch Siach
2018-10-12 9:25 ` Peter Korsgaard
2018-10-23 23:06 ` Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox