Non-SFI Mode: Build libevent with PNaCl toolchain for nacl_helper_nonsfi.

third_party/libevent/nacl/config.h

Index: third_party/libevent/nacl/config.h
diff --git a/third_party/libevent/android/config.h b/third_party/libevent/nacl/config.h
similarity index 93%
copy from third_party/libevent/android/config.h
copy to third_party/libevent/nacl/config.h
index 91f4ddaf146995c16ffdaa5a4ed4af646323627f..1725b1afd966bc1ed5e2578f3158163c726f6cf0 100644
--- a/third_party/libevent/android/config.h
+++ b/third_party/libevent/nacl/config.h
@@ -1,4 +1,4 @@
-/* Copied from Linux version and changed the features according Android, which
+/* Copied from Linux version and changed the features according NaCl, which

[Mark Seaborn, 2014/10/13 16:02:01]

Please update the comment to reflect that this build *will* be running under
Linux, not just something 'close to Linux'. :-)

[hidehiko, 2014/10/14 09:07:13]

Done.

  * is close to Linux */
 
 /* Define if clock_gettime is available in libc */
@@ -14,13 +14,13 @@
 /* #undef HAVE_DEVPOLL */
 
 /* Define to 1 if you have the <dlfcn.h> header file. */
-#define HAVE_DLFCN_H 1
+/* #undef HAVE_DLFCN_H */
 
 /* Define if your system supports the epoll system calls */
-#define HAVE_EPOLL 1
+/* #undef HAVE_EPOLL */
 
 /* Define to 1 if you have the `epoll_ctl' function. */
-#define HAVE_EPOLL_CTL 1
+/* #undef HAVE_EPOLL_CTL */
 
 /* Define if your system supports event ports */
 /* #undef HAVE_EVENT_PORTS */
@@ -32,7 +32,7 @@
 #define HAVE_FCNTL_H 1
 
 /* Define to 1 if the system has the type `fd_mask'. */
-/* #undef HAVE_FD_MASK */
+#define HAVE_FD_MASK 1
 
 /* Define to 1 if you have the `getaddrinfo' function. */
 #define HAVE_GETADDRINFO 1
@@ -92,16 +92,16 @@
 /* #undef HAVE_PORT_H */
 
 /* Define to 1 if you have the `select' function. */
-#define HAVE_SELECT 1
+/* #undef HAVE_SELECT */
 
 /* Define if F_SETFD is defined in <fcntl.h> */
 #define HAVE_SETFD 1
 
 /* Define to 1 if you have the `sigaction' function. */
-#define HAVE_SIGACTION 1
+/* #undef HAVE_SIGACTION */

[Mark Seaborn, 2014/10/13 16:02:01]

We do have sigaction(), so presumably you are disabling this usage intentionally
(and manually) to prevent libevent interfering with signal handlers?  That might
be worth commenting.

[hidehiko, 2014/10/14 09:07:13]

newlib ABI sigaction is not provided (i.e. we only have linux_sigaction() for
nonsfi), right?
Added comments.

 
 /* Define to 1 if you have the `signal' function. */
-#define HAVE_SIGNAL 1
+/* #undef HAVE_SIGNAL */
 
 /* Define to 1 if you have the <signal.h> header file. */
 #define HAVE_SIGNAL_H 1
@@ -122,7 +122,7 @@
 #define HAVE_STRING_H 1
 
 /* Define to 1 if you have the `strlcpy' function. */
-#define HAVE_STRLCPY 1
+/* #undef HAVE_STRLCPY */
 
 /* Define to 1 if you have the `strsep' function. */
 #define HAVE_STRSEP 1
@@ -146,7 +146,7 @@
 /* #undef HAVE_SYS_EVENT_H */
 
 /* Define to 1 if you have the <sys/ioctl.h> header file. */
-#define HAVE_SYS_IOCTL_H 1
+/* #undef HAVE_SYS_IOCTL_H */
 
 /* Define to 1 if you have the <sys/param.h> header file. */
 #define HAVE_SYS_PARAM_H 1
@@ -155,7 +155,7 @@
 #define HAVE_SYS_QUEUE_H 1
 
 /* Define to 1 if you have the <sys/select.h> header file. */
-#define HAVE_SYS_SELECT_H 1
+/* #undef HAVE_SYS_SELECT_H */
 
 /* Define to 1 if you have the <sys/socket.h> header file. */
 #define HAVE_SYS_SOCKET_H 1
@@ -173,16 +173,16 @@
 #define HAVE_TAILQFOREACH 1
 
 /* Define if timeradd is defined in <sys/time.h> */
-#define HAVE_TIMERADD 1
+/* #undef HAVE_TIMERADD */
 
 /* Define if timerclear is defined in <sys/time.h> */
-#define HAVE_TIMERCLEAR 1
+/* #undef HAVE_TIMERCLEAR */
 
 /* Define if timercmp is defined in <sys/time.h> */
-#define HAVE_TIMERCMP 1
+/* #undef HAVE_TIMERCMP */
 
 /* Define if timerisset is defined in <sys/time.h> */
-#define HAVE_TIMERISSET 1
+/* #undef HAVE_TIMERISSET */
 
 /* Define to 1 if the system has the type `uint16_t'. */
 #define HAVE_UINT16_T 1
@@ -200,13 +200,13 @@
 #define HAVE_UNISTD_H 1
 
 /* Define to 1 if you have the `vasprintf' function. */
-#define HAVE_VASPRINTF 1
+/* #undef HAVE_VASPRINTF */
 
 /* Define if kqueue works correctly with pipes */
 /* #undef HAVE_WORKING_KQUEUE */
 
 /* Name of package */
-#define PACKAGE "libevent"
+#define PACKAGE "libevent_nacl"
 
 /* Define to the address where bug reports for this package should be sent. */
 #define PACKAGE_BUGREPORT ""