OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 21-Sep-2005 11:12:52
Branch: HEAD Handle: 2005092110125200
Modified files:
openpkg-src/ntp ntp.patch ntp.spec
Log:
workaround a nasty build problem with GCC 4.0: the includes are partly
recursive in their dependencies but gcc 4.0 insists on correct
declarations, so disable the declarations in the header and provide
them in the source (they occur just once anyway)
Summary:
Revision Changes Path
1.7 +38 -0 openpkg-src/ntp/ntp.patch
1.77 +1 -1 openpkg-src/ntp/ntp.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/ntp/ntp.patch
============================================================================
$ cvs diff -u -r1.6 -r1.7 ntp.patch
--- openpkg-src/ntp/ntp.patch 3 Jun 2004 13:35:15 -0000 1.6
+++ openpkg-src/ntp/ntp.patch 21 Sep 2005 09:12:52 -0000 1.7
@@ -103,3 +103,41 @@
/* Define to 1 if you have the </sys/sync/queue.h> header file. */
#undef HAVE__SYS_SYNC_QUEUE_H
+Index: include/ntp_stdlib.h
+--- include/ntp_stdlib.h.orig 2003-07-17 12:27:16 +0200
++++ include/ntp_stdlib.h 2005-09-21 11:03:19 +0200
+@@ -135,7 +135,9 @@
+
+ /* clocktypes.c */
+ struct clktype;
++#if 0
+ extern struct clktype clktypes[];
++#endif
+
+ /* getopt.c */
+ extern char * ntp_optarg; /* global argument pointer */
+Index: include/ntpd.h
+--- include/ntpd.h.orig 2003-09-13 05:08:04 +0200
++++ include/ntpd.h 2005-09-21 11:03:32 +0200
+@@ -227,7 +227,9 @@
+
+ /* ntp_control.c */
+ struct ctl_trap;
++#if 0
+ extern struct ctl_trap ctl_trap[];
++#endif
+ extern int num_ctl_traps;
+ extern keyid_t ctl_auth_keyid; /* keyid used for
authenticating write requests */
+
+Index: ntpdc/ntpdc_ops.c
+--- ntpdc/ntpdc_ops.c.orig 2003-10-07 23:10:39 +0200
++++ ntpdc/ntpdc_ops.c 2005-09-21 11:04:43 +0200
+@@ -25,6 +25,8 @@
+
+ #include <arpa/inet.h>
+
++extern struct clktype clktypes[];
++
+ /*
+ * Declarations for command handlers in here
+ */
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ntp/ntp.spec
============================================================================
$ cvs diff -u -r1.76 -r1.77 ntp.spec
--- openpkg-src/ntp/ntp.spec 30 Aug 2005 11:51:01 -0000 1.76
+++ openpkg-src/ntp/ntp.spec 21 Sep 2005 09:12:52 -0000 1.77
@@ -33,7 +33,7 @@
Group: Network
License: BSD-style
Version: 4.2.0
-Release: 20050830
+Release: 20050921
# package options
%option with_fsl yes
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
