From 48d7a1edc1bb5c004a0458c021e097050238edc9 Mon Sep 17 00:00:00 2001
From: Ryan Dahl <ry@tinyclouds.org>
Date: Sat, 2 Oct 2010 15:07:54 -0700
Subject: [PATCH] libev, libeio config.h files don't depend on arch

---
 deps/libeio/{darwin-x86_64 => darwin}/config.h | 0
 deps/libeio/{freebsd-x86 => freebsd}/config.h  | 0
 deps/libeio/{linux-x86 => linux}/config.h      | 0
 deps/libeio/{sunos-x86 => sunos}/config.h      | 0
 deps/libeio/wscript                            | 2 +-
 deps/libev/{darwin-x86_64 => darwin}/config.h  | 0
 deps/libev/{freebsd-x86 => freebsd}/config.h   | 0
 deps/libev/{linux-x86 => linux}/config.h       | 0
 deps/libev/{sunos-x86 => sunos}/config.h       | 0
 deps/libev/wscript                             | 2 +-
 10 files changed, 2 insertions(+), 2 deletions(-)
 rename deps/libeio/{darwin-x86_64 => darwin}/config.h (100%)
 rename deps/libeio/{freebsd-x86 => freebsd}/config.h (100%)
 rename deps/libeio/{linux-x86 => linux}/config.h (100%)
 rename deps/libeio/{sunos-x86 => sunos}/config.h (100%)
 rename deps/libev/{darwin-x86_64 => darwin}/config.h (100%)
 rename deps/libev/{freebsd-x86 => freebsd}/config.h (100%)
 rename deps/libev/{linux-x86 => linux}/config.h (100%)
 rename deps/libev/{sunos-x86 => sunos}/config.h (100%)

diff --git a/deps/libeio/darwin-x86_64/config.h b/deps/libeio/darwin/config.h
similarity index 100%
rename from deps/libeio/darwin-x86_64/config.h
rename to deps/libeio/darwin/config.h
diff --git a/deps/libeio/freebsd-x86/config.h b/deps/libeio/freebsd/config.h
similarity index 100%
rename from deps/libeio/freebsd-x86/config.h
rename to deps/libeio/freebsd/config.h
diff --git a/deps/libeio/linux-x86/config.h b/deps/libeio/linux/config.h
similarity index 100%
rename from deps/libeio/linux-x86/config.h
rename to deps/libeio/linux/config.h
diff --git a/deps/libeio/sunos-x86/config.h b/deps/libeio/sunos/config.h
similarity index 100%
rename from deps/libeio/sunos-x86/config.h
rename to deps/libeio/sunos/config.h
diff --git a/deps/libeio/wscript b/deps/libeio/wscript
index 47fc39455ee..7de405c476f 100644
--- a/deps/libeio/wscript
+++ b/deps/libeio/wscript
@@ -12,7 +12,7 @@ def build(bld):
   cares.source = "eio.c"
   cares.target = 'eio'
   cares.name = 'eio'
-  cares.includes = '. ./' + bld.env['DEST_OS'] + '-' + bld.env['DEST_CPU']
+  cares.includes = '. ./' + bld.env['DEST_OS']
   cares.install_path = None
   if bld.env["USE_DEBUG"]:
     cares.clone("debug");
diff --git a/deps/libev/darwin-x86_64/config.h b/deps/libev/darwin/config.h
similarity index 100%
rename from deps/libev/darwin-x86_64/config.h
rename to deps/libev/darwin/config.h
diff --git a/deps/libev/freebsd-x86/config.h b/deps/libev/freebsd/config.h
similarity index 100%
rename from deps/libev/freebsd-x86/config.h
rename to deps/libev/freebsd/config.h
diff --git a/deps/libev/linux-x86/config.h b/deps/libev/linux/config.h
similarity index 100%
rename from deps/libev/linux-x86/config.h
rename to deps/libev/linux/config.h
diff --git a/deps/libev/sunos-x86/config.h b/deps/libev/sunos/config.h
similarity index 100%
rename from deps/libev/sunos-x86/config.h
rename to deps/libev/sunos/config.h
diff --git a/deps/libev/wscript b/deps/libev/wscript
index 122e79b2569..ed607564e77 100644
--- a/deps/libev/wscript
+++ b/deps/libev/wscript
@@ -12,7 +12,7 @@ def build(bld):
   cares.source = "ev.c"
   cares.target = 'ev'
   cares.name = 'ev'
-  cares.includes = '. ./' + bld.env['DEST_OS'] + '-' + bld.env['DEST_CPU']
+  cares.includes = '. ./' + bld.env['DEST_OS']
   cares.install_path = None
   if bld.env["USE_DEBUG"]:
     cares.clone("debug");