Simpler libev and libeio config

4 files changed, 252 insertions, 117 deletions

diff --git a/deps/libeio/darwin-x86_64/config.h b/deps/libeio/darwin-x86_64/config.h
new file mode 100644
index 0000000000..99bd552ae0
--- /dev/null
+++ b/deps/libeio/darwin-x86_64/config.h
@@ -0,0 +1,81 @@
+/* config.h.  Generated from config.h.in by configure.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* fdatasync(2) is available */
+#define HAVE_FDATASYNC 1
+
+/* futimes(2) is available */
+#define HAVE_FUTIMES 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* pread(2) and pwrite(2) are available */
+#define HAVE_PREADWRITE 1
+
+/* readahead(2) is available (linux) */
+/* #undef HAVE_READAHEAD */
+
+/* sendfile(2) is available and supported */
+#define HAVE_SENDFILE 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* sync_file_range(2) is available */
+/* #undef HAVE_SYNC_FILE_RANGE */
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#define LT_OBJDIR ".libs/"
+
+/* Name of package */
+#define PACKAGE "libeio"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT ""
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME ""
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING ""
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME ""
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION ""
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Version number of package */
+#define VERSION "1.0"
diff --git a/deps/libeio/linux-x86/config.h b/deps/libeio/linux-x86/config.h
new file mode 100644
index 0000000000..0936e7f3ea
--- /dev/null
+++ b/deps/libeio/linux-x86/config.h
@@ -0,0 +1,81 @@
+/* config.h.  Generated from config.h.in by configure.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* fdatasync(2) is available */
+#define HAVE_FDATASYNC 1
+
+/* futimes(2) is available */
+#define HAVE_FUTIMES 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* pread(2) and pwrite(2) are available */
+#define HAVE_PREADWRITE 1
+
+/* readahead(2) is available (linux) */
+#define HAVE_READAHEAD 1
+
+/* sendfile(2) is available and supported */
+#define HAVE_SENDFILE 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* sync_file_range(2) is available */
+#define HAVE_SYNC_FILE_RANGE 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#define LT_OBJDIR ".libs/"
+
+/* Name of package */
+#define PACKAGE "libeio"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT ""
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME ""
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING ""
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME ""
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION ""
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Version number of package */
+#define VERSION "1.0"
diff --git a/deps/libeio/sunos-x86/config.h b/deps/libeio/sunos-x86/config.h
new file mode 100644
index 0000000000..8f878efd95
--- /dev/null
+++ b/deps/libeio/sunos-x86/config.h
@@ -0,0 +1,81 @@
+/* config.h.  Generated from config.h.in by configure.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* fdatasync(2) is available */
+#define HAVE_FDATASYNC 1
+
+/* futimes(2) is available */
+/* #undef HAVE_FUTIMES */
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* pread(2) and pwrite(2) are available */
+#define HAVE_PREADWRITE 1
+
+/* readahead(2) is available (linux) */
+/* #undef HAVE_READAHEAD */
+
+/* sendfile(2) is available and supported */
+/* #undef HAVE_SENDFILE */
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* sync_file_range(2) is available */
+/* #undef HAVE_SYNC_FILE_RANGE */
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#define LT_OBJDIR ".libs/"
+
+/* Name of package */
+#define PACKAGE "libeio"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT ""
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME ""
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING ""
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME ""
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION ""
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Version number of package */
+#define VERSION "1.0"
diff --git a/deps/libeio/wscript b/deps/libeio/wscript
index 8b60e54425..47fc39455e 100644
--- a/deps/libeio/wscript
+++ b/deps/libeio/wscript
@@ -1,127 +1,19 @@
 import Options
-import sys
+import platform
 
 def set_options(opt):
   pass
-  #opt.tool_options('compiler_cc')
 
 def configure(conf):
-  print "--- libeio ---"
-  #conf.check_tool('compiler_cc')
-
-  conf.check(lib='pthread', uselib_store='PTHREAD')
-  conf.check_cc(lib="pthread", header_name="pthread.h", function_name="pthread_create", mandatory=True)
-  if not sys.platform.startswith("cygwin"):
-    conf.check_cc(lib="pthread", header_name="pthread.h", function_name="pthread_atfork", mandatory=True)
-  else:
-    conf.check_cc(lib="pthread", header_name="unistd.h", function_name="pthread_atfork", mandatory=True)
-
-  conf.check_cc(msg="Checking for futimes(2)", define_name="HAVE_FUTIMES", fragment="""
-    #include <sys/types.h>
-    #include <sys/time.h>
-    #include <utime.h>
-    struct timeval tv[2];
-    int res;
-    int fd;
-    int main(void)
-    {
-       res = futimes (fd, tv);
-       return 0;
-    }
-  """)
-
-  conf.check_cc(msg="Checking for readahead(2)", define_name="HAVE_READAHEAD", fragment="""
-    #include <fcntl.h>
-    int main(void)
-    {
-       int fd = 0;
-       size_t count = 2;
-       ssize_t res;
-       res = readahead (fd, 0, count);
-       return 0;
-    }
-  """)
-
-  conf.check_cc(msg="Checking for fdatasync(2)", define_name="HAVE_FDATASYNC", fragment="""
-    #include <unistd.h>
-    int main(void)
-    {
-       int fd = 0;
-       fdatasync (fd);
-       return 0;
-    }
-  """)
-
-  conf.check_cc(msg="Checking for pread(2) and pwrite(2)", define_name="HAVE_PREADWRITE", fragment="""
-    #include <unistd.h>
-    int main(void)
-    {
-       int fd = 0;
-       size_t count = 1;
-       char buf;
-       off_t offset = 1;
-       ssize_t res;
-       res = pread (fd, &buf, count, offset);
-       res = pwrite (fd, &buf, count, offset);
-       return 0;
-    }
-  """)
-
-  conf.check_cc(msg="Checking for sendfile(2)" , define_name="HAVE_SENDFILE" , fragment=""" 
-    # include <sys/types.h>
-    #if __linux
-    # include <sys/sendfile.h>
-    #elif __FreeBSD__ || defined(__APPLE__)
-    # include <sys/socket.h>
-    # include <sys/uio.h>
-    #elif __hpux
-    # include <sys/socket.h>
-    #else
-    # error unsupported architecture
-    #endif
-    int main(void)
-    {
-       int fd = 0;
-       off_t offset = 1;
-       size_t count = 2;
-       ssize_t res;
-    #if __linux
-       res = sendfile (fd, fd, offset, count);
-    #elif __FreeBSD__
-       res = sendfile (fd, fd, offset, count, 0, &offset, 0);
-    #elif __APPLE__
-       res = sendfile (fd, fd, offset, &offset, 0, 0);
-    #elif __hpux
-       res = sendfile (fd, fd, offset, count, 0, 0);
-    #endif
-       return 0;
-    }
-  """)
-
-  conf.env.append_value("CCFLAGS", "-D_GNU_SOURCE")
-  conf.check_cc(msg="Checking for sync_file_range(2) ", fragment="""
-    #include <fcntl.h>
-    int main(void)
-    {
-       int fd = 0;
-       off64_t offset = 1;
-       off64_t nbytes = 1;
-       unsigned int flags = SYNC_FILE_RANGE_WAIT_BEFORE|SYNC_FILE_RANGE_WRITE|SYNC_FILE_RANGE_WAIT_AFTER;
-       ssize_t res;
-       res = sync_file_range (fd, offset, nbytes, flags);
-       return 0;
-    }
-  """, define_name="HAVE_SYNC_FILE_RANGE")
+  conf.env.append_value('CCFLAGS', ['-DHAVE_CONFIG_H=1', '-D_GNU_SOURCE'])
 
 def build(bld):
-  libeio = bld.new_task_gen("cc")
-  libeio.source = "eio.c"
-  libeio.target = 'eio'
-  libeio.name = 'eio'
-  libeio.includes = '. ../..'
-  libeio.uselib = "PTHREAD"
-  libeio.install_path = None
+  cares = bld.new_task_gen("cc")
+  cares.source = "eio.c"
+  cares.target = 'eio'
+  cares.name = 'eio'
+  cares.includes = '. ./' + bld.env['DEST_OS'] + '-' + bld.env['DEST_CPU']
+  cares.install_path = None
   if bld.env["USE_DEBUG"]:
-    libeio.clone("debug");
-  bld.install_files('${PREFIX}/include/node/', 'eio.h');
+    cares.clone("debug");