Cody Schafer avatar Cody Schafer committed bb6f138

fix all the patches, build works again.

Comments (0)

Files changed (5)

 	patch -d "$SRC/gccdist" -p1 < wrs_headers-regsPpc.patch || exit
 	patch -d "$SRC/gccdist" -p1 < wrs_headers-unistd.patch || exit
 	patch -d "$SRC/gccdist" -p1 < wrs_headers-ioLib.patch  || exit
-	patch -d "$SRC/gccdist" -p1 < wrs_headers-ioLib-protos.patch  || exit
+	patch -d "$SRC/gccdist" -p1 < wrs_headers-uio.patch  || exit
+	patch -d "$SRC/gccdist" -p1 < wrs_headers-cdefs.patch  || exit
 }
 run wrs_headers
 

wrs_headers-cdefs.patch

-diff -durp gccdist.orig/WindRiver/vxworks-6.3/target/h/wrn/coreip/sys/cdefs.h gccdist/WindRiver/vxworks-6.3/target/h/wrn/coreip/sys/cdefs.h
---- gccdist.orig/WindRiver/vxworks-6.3/target/h/wrn/coreip/sys/cdefs.h	2007-07-24 18:15:48.000000000 -0400
-+++ gccdist/WindRiver/vxworks-6.3/target/h/wrn/coreip/sys/cdefs.h	2012-03-13 11:40:39.415318347 -0400
+diff -durpN -x '*~' -x uio.h gccdist.orig/WindRiver/vxworks-6.3/target/h/wrn/coreip/sys/cdefs.h gccdist/WindRiver/vxworks-6.3/target/h/wrn/coreip/sys/cdefs.h
+--- gccdist.orig/WindRiver/vxworks-6.3/target/h/wrn/coreip/sys/cdefs.h	2012-03-14 23:18:35.904643107 -0500
++++ gccdist/WindRiver/vxworks-6.3/target/h/wrn/coreip/sys/cdefs.h	2012-03-14 23:24:45.223618185 -0500
 @@ -65,7 +65,7 @@ modification history
- #define	__END_DECLS
- #endif
- 
--#include <netVersion.h>
-+#include <wrn/coreip/netVersion.h>
- 
- /*
-  * The __CONCAT macro is used to concatenate parts of symbol names, e.g.
+ #define	__END_DECLS
+ #endif
+ 
+-#include <netVersion.h>
++#include <wrn/coreip/netVersion.h>
+ 
+ /*
+  * The __CONCAT macro is used to concatenate parts of symbol names, e.g.

wrs_headers-ioLib.patch

-diff -durp gccdist.orig/WindRiver/vxworks-6.3/target/h/ioLib.h gccdist/WindRiver/vxworks-6.3/target/h/ioLib.h
---- gccdist.orig/WindRiver/vxworks-6.3/target/h/ioLib.h	2012-03-12 20:57:48.458969236 -0500
-+++ gccdist/WindRiver/vxworks-6.3/target/h/ioLib.h	2012-03-12 21:31:45.834498564 -0500
+diff -durp -x '*~' -x '*.rej' -x regsPpc.h -x '*.orig' gccdist.orig/WindRiver/vxworks-6.3/target/h/ioLib.h gccdist/WindRiver/vxworks-6.3/target/h/ioLib.h
+--- gccdist.orig/WindRiver/vxworks-6.3/target/h/ioLib.h	2012-03-14 22:46:43.283772182 -0500
++++ gccdist/WindRiver/vxworks-6.3/target/h/ioLib.h	2012-03-14 22:47:43.983768086 -0500
 @@ -136,7 +136,7 @@ extern "C" {
- 
- #include <vwModNum.h>
- #include <limits.h>
--#include <net/uio.h>
-+#include <wrn/coreip/net/uio.h>
- #include <fcntl.h>
- #include <unistd.h>
- #include <dllLib.h>
-@@ -391,8 +391,12 @@ extern char *	getwd (char * pathname);
- extern int	open (const char *, int, int);
- extern int	creat (const char *, int);
- extern int	read (int, char *, size_t);
-+#ifdef __cplusplus
--extern int	write (int, char *, size_t);
--extern int 	ioctl (int fd, int function, int arg);
-+extern int	write (int, const char *, size_t);
-+#else
-+extern int	write (int, char *, size_t);
-+#endif
-+extern int 	ioctl (int fd, int function, int arg);
- extern STATUS	close (int);
- extern STATUS	remove (const char *);
- extern BOOL	isatty (int fd);
-
+ 
+ #include <vwModNum.h>
+ #include <limits.h>
+-#include <net/uio.h>
++#include <wrn/coreip/net/uio.h>
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <dllLib.h>
+@@ -392,8 +392,8 @@ extern char *	getwd (char * pathname);
+ extern int	open (const char *, int, int);
+ extern int	creat (const char *, int);
+ extern int	read (int, char *, size_t);
+-extern int	write (int, char *, size_t);
+-extern int 	ioctl (int fd, int function, int arg);
++extern int	write (int, const char *, size_t);
++extern int 	ioctl (int fd, int function, void *arg);
+ extern STATUS	close (int);
+ extern STATUS	remove (const char *);
+ extern BOOL	isatty (int fd);

wrs_headers-uio.patch

-diff -durp gccdist.orig/WindRiver/vxworks-6.3/target/h/wrn/coreip/net/uio.h gccdist/WindRiver/vxworks-6.3/target/h/wrn/coreip/net/uio.h
---- gccdist.orig/WindRiver/vxworks-6.3/target/h/wrn/coreip/net/uio.h	2007-07-24 18:15:46.000000000 -0400
-+++ gccdist/WindRiver/vxworks-6.3/target/h/wrn/coreip/net/uio.h	2012-03-13 11:39:30.263316216 -0400
+diff -durpN -x '*~' gccdist.orig/WindRiver/vxworks-6.3/target/h/wrn/coreip/net/uio.h gccdist/WindRiver/vxworks-6.3/target/h/wrn/coreip/net/uio.h
+--- gccdist.orig/WindRiver/vxworks-6.3/target/h/wrn/coreip/net/uio.h	2012-03-14 23:18:34.975643172 -0500
++++ gccdist/WindRiver/vxworks-6.3/target/h/wrn/coreip/net/uio.h	2012-03-14 23:23:12.590624440 -0500
 @@ -82,7 +82,7 @@ struct iovec {
- #define UIO_SMALLIOV	8		/* 8 on stack, else malloc */
- 
- #ifdef _WRS_KERNEL
--#include <sys/cdefs.h>
-+#include <wrn/coreip/sys/cdefs.h>
- 
- enum	uio_rw { UIO_READ, UIO_WRITE };
- 
+ #define UIO_SMALLIOV	8		/* 8 on stack, else malloc */
+ 
+ #ifdef _WRS_KERNEL
+-#include <sys/cdefs.h>
++#include <wrn/coreip/sys/cdefs.h>
+ 
+ enum	uio_rw { UIO_READ, UIO_WRITE };
+ 

wrs_headers-unistd.patch

-diff -durpN gccdist.orig/WindRiver/vxworks-6.3/target/h/unistd.h gccdist/WindRiver/vxworks-6.3/target/h/unistd.h
---- gccdist.orig/WindRiver/vxworks-6.3/target/h/unistd.h	2012-03-12 20:57:48.772965311 -0500
-+++ gccdist/WindRiver/vxworks-6.3/target/h/unistd.h	2012-03-12 20:58:37.137360617 -0500
+diff -durp -x '*~' -x '*.rej' -x regsPpc.h -x '*.orig' gccdist.orig/WindRiver/vxworks-6.3/target/h/unistd.h gccdist/WindRiver/vxworks-6.3/target/h/unistd.h
+--- gccdist.orig/WindRiver/vxworks-6.3/target/h/unistd.h	2012-03-14 22:08:20.208927604 -0500
++++ gccdist/WindRiver/vxworks-6.3/target/h/unistd.h	2012-03-14 22:19:14.676883439 -0500
 @@ -46,6 +46,7 @@ extern "C" {
- #endif
- 
- #include <vxWorks.h>
-+#include <ioLib.h> /* for read/write */
- 
- #ifndef SEEK_SET
- #define SEEK_SET           0       /* absolute offset, was L_SET */
-
+ #endif
+ 
+ #include <vxWorks.h>
++#include <ioLib.h>  /* for read/write */
+ 
+ #ifndef SEEK_SET
+ #define SEEK_SET           0       /* absolute offset, was L_SET */
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.