← Back to branch summary

~yolanda.robla/ubuntu/trusty/nodejs/add_distribution

« back to all changes in this revision

Viewing changes to debian/patches/2006_use_system_libeio.patch

  • Committer: Package Import Robot
  • Author(s): Jérémy Lal
  • Date: 2013-08-14 00:16:46 UTC
  • mfrom: (7.1.40 sid)
  • Revision ID: package-import@ubuntu.com-20130814001646-bzlysfh8sd6mukbo
Tags: 0.10.15~dfsg1-4
* Update 2005 patch, adding a handful of tests that can fail on
  slow platforms.
* Add 1004 patch to fix test failures when writing NaN to buffer
  on mipsel.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/2006_use_system_libeio.patch
1
 
Description: Use system libeio
2
 
 Allows building against libeio package, ITP#629384
3
 
 THIS PATCH IS NOT APPLIED YET. It will be when libeio is uploaded.
4
 
Forwarded: no, unsure why would upstream need that kind of patch.
5
 
Author: Jérémy Lal <kapouer@melix.org>
6
 
Last-Update: 2011-06-26
7
 
--- a/wscript
8
 
+++ b/wscript
9
 
@@ -363,7 +363,9 @@
10
 
     if not conf.check(lib='kstat', uselib_store="KSTAT"):
11
 
       conf.fatal("Cannot find kstat library")
12
 
 
13
 
-  conf.sub_config('deps/libeio')
14
 
+  if not conf.check_cxx(lib='eio', header_name='eio.h',
15
 
+                      uselib_store='EIO'):
16
 
+    conf.fatal("Cannot find libeio")
17
 
 
18
 
   if conf.env['USE_SHARED_V8']:
19
 
     v8_includes = [];
20
 
@@ -635,7 +637,6 @@
21
 
   print "Parallel Jobs: " + str(Options.options.jobs)
22
 
   print "Product type: " + product_type
23
 
 
24
 
-  bld.add_subdirs('deps/libeio')
25
 
 
26
 
   if not bld.env['USE_SHARED_V8']: build_v8(bld)
27
 
   if not bld.env['USE_SHARED_LIBEV']: bld.add_subdirs('deps/libev')
28
 
@@ -797,8 +798,8 @@
29
 
   node = bld.new_task_gen("cxx", product_type)
30
 
   node.name         = "node"
31
 
   node.target       = "node"
32
 
-  node.uselib = 'RT EV OPENSSL CARES EXECINFO DL KVM SOCKET NSL KSTAT UTIL OPROFILE'
33
 
-  node.add_objects = 'eio http_parser'
34
 
+  node.uselib = 'RT EIO EV OPENSSL CARES EXECINFO DL KVM SOCKET NSL KSTAT UTIL OPROFILE'
35
 
+  node.add_objects = 'http_parser'
36
 
   if product_type_is_lib:
37
 
     node.install_path = '${LIBDIR}'
38
 
   else:
39
 
@@ -840,7 +841,6 @@
40
 
 
41
 
   node.includes = """
42
 
     src/
43
 
-    deps/libeio
44
 
     deps/http_parser
45
 
   """
46