22310617 ntp doesn't build on s12-88 on sparc
authorBrian Utterback <brian.utterback@oracle.com>
Mon, 21 Dec 2015 18:48:54 -0800
changeset 5221 e63c8f63ac44
parent 5220 0f3235cb9d2c
child 5222 8298df727253
22310617 ntp doesn't build on s12-88 on sparc
components/ntp/patches/20-nozs.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ntp/patches/20-nozs.patch	Mon Dec 21 18:48:54 2015 -0800
@@ -0,0 +1,66 @@
+The zs serial port driver has been removed from Solaris. The zs specific code
+in the parsolaris.c and parsestreams.c file now fails to compile. This patch
+simply replaces the "ifdef sun" sections of code with a fictious define to
+prevent the zs code from being compiled. The removal of all driver specific
+code has been reported to the community as bug 2988
+(http://bugs.ntp.org/show_bug.cgi?id=2988) This patch may be removed when NTP
+is upgraded to a version that has that bug resolved.
+
+--- libparse/parsesolaris.c
++++ libparse/parsesolaris.c
[email protected]@ -804,7 +804,7 @@ init_linemon(
+ 
+ 		pprintf(DD_INSTALL, "init_linemon: driver is \"%s\"\n", dname);
+ 
+-#ifdef sun
++#ifdef no_zs_sun
+ 		if (dname && !strcmp(dname, "zs"))
+ 		{
+ 			return init_zs_linemon(dq, q);
[email protected]@ -833,7 +833,7 @@ close_linemon(
+ 	{
+ 		register char *dname = q->q_qinfo->qi_minfo->mi_idname;
+ 
+-#ifdef sun
++#ifdef no_zs_sun
+ 		if (dname && !strcmp(dname, "zs"))
+ 		{
+ 			close_zs_linemon(q, my_q);
[email protected]@ -845,7 +845,7 @@ close_linemon(
+ 	pprintf(DD_INSTALL, "close_linemon: cannot find driver name\n");
+ }
+ 
+-#ifdef sun
++#ifdef no_zs_sun
+ #include <sys/tty.h>
+ #include <sys/zsdev.h>
+ #include <sys/ser_async.h>
+--- libparse/parsestreams.c
++++ libparse/parsestreams.c
[email protected]@ -954,7 +954,7 @@ init_linemon(
+ 
+ 		parseprintf(DD_INSTALL, ("init_linemon: driver is \"%s\"\n", dname));
+ 
+-#ifdef sun
++#ifdef no_zs_sun
+ 		if (dname && !Strcmp(dname, "zs"))
+ 		{
+ 			return init_zs_linemon(dq, q);
[email protected]@ -983,7 +983,7 @@ close_linemon(
+ 	{
+ 		register char *dname = q->q_qinfo->qi_minfo->mi_idname;
+ 
+-#ifdef sun
++#ifdef no_zs_sun
+ 		if (dname && !Strcmp(dname, "zs"))
+ 		{
+ 			close_zs_linemon(q, my_q);
[email protected]@ -995,7 +995,7 @@ close_linemon(
+ 	parseprintf(DD_INSTALL, ("close_linemon: cannot find driver name\n"));
+ }
+ 
+-#ifdef sun
++#ifdef no_zs_sun
+ 
+ #include <sundev/zsreg.h>
+ #include <sundev/zscom.h>