[Astlinux-commits] SF.net SVN: astlinux: [735] trunk

[<kr...@us...>]

Revision: 735
          http://svn.sourceforge.net/astlinux/?rev=735&view=rev
Author:   krisk84
Date:     2007-03-08 12:36:00 -0800 (Thu, 08 Mar 2007)

Log Message:
-----------
gcc 4.1.2 fixes - tested with 3.4.6 and 4.1.2

Modified Paths:
--------------
    trunk/package/acpid/acpid.mk

Added Paths:
-----------
    trunk/package/acpid/acpid-buildfix.patch
    trunk/toolchain/uClibc/uClibc-gcc412waitfix.patch

Added: trunk/package/acpid/acpid-buildfix.patch
===================================================================
--- trunk/package/acpid/acpid-buildfix.patch	                        (rev 0)
+++ trunk/package/acpid/acpid-buildfix.patch	2007-03-08 20:36:00 UTC (rev 735)
@@ -0,0 +1,35 @@
+diff -urN acpid-1.0.4.orig/acpid.c acpid-1.0.4/acpid.c
+--- acpid-1.0.4.orig/acpid.c	2006-05-16 14:13:13.963213500 -0500
++++ acpid-1.0.4/acpid.c	2006-05-16 14:14:10.678758000 -0500
+@@ -61,7 +61,7 @@
+ main(int argc, char **argv)
+ {
+ 	int event_fd;
+-	int sock_fd;
++	int sock_fd = -1;
+ 
+ 	/* learn who we really are */
+ 	progname = (const char *)strrchr(argv[0], '/');
+@@ -386,9 +386,7 @@
+ 	umask(0);
+ 
+ 	/* get outta the way */
+-	chdir("/");
+-
+-	return 0;
++	return chdir("/");
+ }
+ 
+ static int
+diff -urN acpid-1.0.4.orig/ud_socket.c acpid-1.0.4/ud_socket.c
+--- acpid-1.0.4.orig/ud_socket.c	2006-05-16 14:13:13.983214750 -0500
++++ acpid-1.0.4/ud_socket.c	2006-05-16 14:14:10.678758000 -0500
+@@ -58,7 +58,7 @@
+ 	while (1) {
+ 		int newsock = 0;
+ 		struct sockaddr_un cliaddr;
+-		int len = sizeof(struct sockaddr_un);
++		socklen_t len = sizeof(struct sockaddr_un);
+ 
+ 		newsock = accept(listenfd, (struct sockaddr *)&cliaddr, &len);
+ 		if (newsock < 0) {

Modified: trunk/package/acpid/acpid.mk
===================================================================
--- trunk/package/acpid/acpid.mk	2007-03-08 19:38:33 UTC (rev 734)
+++ trunk/package/acpid/acpid.mk	2007-03-08 20:36:00 UTC (rev 735)
@@ -13,6 +13,7 @@
 $(ACPID_DIR)/Makefile: $(DL_DIR)/$(ACPID_SOURCE)
 	zcat $(DL_DIR)/$(ACPID_SOURCE) | tar -C $(BUILD_DIR) -xvf -
 	$(SED) "s:ACPI_SOCKETFILE.*:ACPI_SOCKETFILE \"/tmp/acpid.socket\":" $(ACPID_DIR)/acpid.h
+	toolchain/patch-kernel.sh $(ACPID_DIR) package/acpid/ acpid\*.patch
 	touch -c $(ACPID_DIR)/Makefile
 
 $(ACPID_DIR)/acpid: $(ACPID_DIR)/Makefile

Added: trunk/toolchain/uClibc/uClibc-gcc412waitfix.patch
===================================================================
--- trunk/toolchain/uClibc/uClibc-gcc412waitfix.patch	                        (rev 0)
+++ trunk/toolchain/uClibc/uClibc-gcc412waitfix.patch	2007-03-08 20:36:00 UTC (rev 735)
@@ -0,0 +1,19 @@
+diff -ur uClibc-0.9.28.orig/include/sys/wait.h uClibc-0.9.28/include/sys/wait.h
+--- uClibc-0.9.28.orig/include/sys/wait.h	2005-08-17 18:49:41.000000000 -0400
++++ uClibc-0.9.28/include/sys/wait.h	2007-03-08 14:21:35.000000000 -0500
+@@ -42,11 +42,11 @@
+    as well as POSIX.1 use of `int' for the status word.  */
+ 
+ #  if defined __GNUC__ && !defined __cplusplus
+-#   define __WAIT_INT(status)						      \
+-  (__extension__ ({ union { __typeof(status) __in; int __i; } __u;	      \
+-		    __u.__in = (status); __u.__i; }))
++#   define __WAIT_INT(status) \
++  (__extension__ (((union { __typeof(status) __in; int __i; }) \
++                    { .__in = (status) }).__i))
+ #  else
+-#   define __WAIT_INT(status)	(*(int *) &(status))
++#   define __WAIT_INT(status)  (*(__const int *) &(status))
+ #  endif
+ 
+ /* This is the type of the argument to `wait'.  The funky union


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.