Merge branch 'org.openembedded.dev' into testing-nexttesting_2010-09-13

1 files changed, 22 insertions, 0 deletions

diff --git a/recipes/nodejs/files/node-dont-include-hosts-usr-include.patch b/recipes/nodejs/files/node-dont-include-hosts-usr-include.patch
new file mode 100644
index 0000000000..edbf7c4671
--- /dev/null
+++ b/recipes/nodejs/files/node-dont-include-hosts-usr-include.patch
@@ -0,0 +1,22 @@
+diff --git node-v0.2.0/wscript.orig node-v0.2.0/wscript
+index 3c5ebc5..905bd58 100644
+--- node-v0.2.0/wscript.orig
++++ node-v0.2.0/wscript
+@@ -162,11 +162,12 @@ def configure(conf):
+   if Options.options.efence:
+     conf.check(lib='efence', libpath=['/usr/lib', '/usr/local/lib'], uselib_store='EFENCE')
+ 
+-  if not conf.check(lib="execinfo", includes=['/usr/include', '/usr/local/include'], libpath=['/usr/lib', '/usr/local/lib'], uselib_store="EXECINFO"):
+-    # Note on Darwin/OS X: This will fail, but will still be used as the
+-    # execinfo stuff are part of the standard library.
+-    if sys.platform.startswith("freebsd"):
+-      conf.fatal("Install the libexecinfo port from /usr/ports/devel/libexecinfo.")
++  # OpenEmbedded doesn't like us checking here
++  #if not conf.check(lib="execinfo", includes=['/usr/include', '/usr/local/include'], libpath=['/usr/lib', '/usr/local/lib'], uselib_store="EXECINFO"):
++  #  # Note on Darwin/OS X: This will fail, but will still be used as the
++  #  # execinfo stuff are part of the standard library.
++  #  if sys.platform.startswith("freebsd"):
++  #    conf.fatal("Install the libexecinfo port from /usr/ports/devel/libexecinfo.")
+ 
+   if not Options.options.without_ssl:
+     if conf.check_cfg(package='openssl',