Bug#327012: More info on FTBFS bug

[Christoph Berg]

Attached is the diff for the NMU.

diff -u ntp-4.2.0a+stable/debian/changelog ntp-4.2.0a+stable/debian/changelog
--- ntp-4.2.0a+stable/debian/changelog
+++ ntp-4.2.0a+stable/debian/changelog
@@ -1,3 +1,11 @@
+ntp (1:4.2.0a+stable-8.1) unstable; urgency=low
+
+  * 0-day BSP NMU.
+  * ntp_config.c: apply patch by Theppitak Karoonboonyanan to fix FTBFS
+(Closes: #327012).
+
+ -- Christoph Berg <[EMAIL PROTECTED]>  Fri, 28 Oct 2005 15:33:37 +0200
+
 ntp (1:4.2.0a+stable-8) unstable; urgency=medium
 
   * The "Well, I certainly could have done that better" version,
only in patch2:
unchanged:
--- ntp-4.2.0a+stable.orig/ntpd/ntp_config.c
+++ ntp-4.2.0a+stable/ntpd/ntp_config.c
@@ -5,21 +5,6 @@
 # include 
 #endif
 
-#ifdef HAVE_NETINFO
-# include 
-#endif
-
-#include 
-
-#include "ntpd.h"
-#include "ntp_io.h"
-#include "ntp_unixtime.h"
-#include "ntp_refclock.h"
-#include "ntp_filegen.h"
-#include "ntp_stdlib.h"
-#include "ntp_config.h"
-#include "ntp_cmdargs.h"
-
 #include 
 #include 
 #ifdef HAVE_SYS_PARAM_H
@@ -40,6 +25,21 @@
 extern HANDLE ResolverThreadHandle;
 #endif /* SYS_WINNT */
 
+#ifdef HAVE_NETINFO
+# include 
+#endif
+
+#include 
+
+#include "ntpd.h"
+#include "ntp_io.h"
+#include "ntp_unixtime.h"
+#include "ntp_refclock.h"
+#include "ntp_filegen.h"
+#include "ntp_stdlib.h"
+#include "ntp_config.h"
+#include "ntp_cmdargs.h"
+
 extern int priority_done;
 
 /*

Christoph
-- 
[EMAIL PROTECTED] | http://www.df7cb.de/


signature.asc
Description: Digital signature

Bug#327012: More info on FTBFS bug

[Theppitak Karoonboonyanan]

I also faces exactly the same problem when trying to build ntp 4.2.0a+stable-8.
After some investigation, I find the three macros were #undef-ed by a system
header .  The inclusion path was:

  ntpd/ntp_config.c ->  ->  -> 
  ->  -> 

So, with a quick hack by moving the local source headers down below the
system headers (as demonstrated in the patch below), it appears to compile.

I'm not sure if it's the right thing to do. But this may help a bit.

-Theppitak.

--- ntp-4.2.0a+stable.orig/ntpd/ntp_config.c
+++ ntp-4.2.0a+stable/ntpd/ntp_config.c
@@ -5,21 +5,6 @@
 # include 
 #endif

-#ifdef HAVE_NETINFO
-# include 
-#endif
-
-#include 
-
-#include "ntpd.h"
-#include "ntp_io.h"
-#include "ntp_unixtime.h"
-#include "ntp_refclock.h"
-#include "ntp_filegen.h"
-#include "ntp_stdlib.h"
-#include "ntp_config.h"
-#include "ntp_cmdargs.h"
-
 #include 
 #include 
 #ifdef HAVE_SYS_PARAM_H
@@ -40,6 +25,21 @@
 extern HANDLE ResolverThreadHandle;
 #endif /* SYS_WINNT */

+#ifdef HAVE_NETINFO
+# include 
+#endif
+
+#include 
+
+#include "ntpd.h"
+#include "ntp_io.h"
+#include "ntp_unixtime.h"
+#include "ntp_refclock.h"
+#include "ntp_filegen.h"
+#include "ntp_stdlib.h"
+#include "ntp_config.h"
+#include "ntp_cmdargs.h"
+
 extern int priority_done;

 /*