]> git.pld-linux.org Git - packages/nodejs.git/blame - nodejs-shared.patch
use sed to fixup shebangs, not carry around huge patch for that
[packages/nodejs.git] / nodejs-shared.patch
CommitLineData
9dc0bdad
A
1--- node-v0.10.3-o/Makefile 2013-04-03 11:30:57.000000000 -0600
2+++ node-v0.10.3/Makefile 2013-04-03 19:30:22.000000000 -0600
3@@ -54,11 +54,13 @@
1ed21df5
A
4 config.gypi: configure
5 $(PYTHON) ./configure
be06d6d0
AS
6
7-install: all
8- $(PYTHON) tools/install.py $@ $(DESTDIR)
9+install: all justinstall
10+
11+justinstall:
12+ $(PYTHON) tools/install.py install $(DESTDIR) $(LIBDIR)
13
14 uninstall:
15- $(PYTHON) tools/install.py $@ $(DESTDIR)
16+ $(PYTHON) tools/install.py $@ $(DESTDIR) $(LIBDIR)
17
18 clean:
19 -rm -rf out/Makefile node node_g out/$(BUILDTYPE)/node blog.html email.md
9dc0bdad
A
20--- node-v0.10.3-o/node.gyp 2013-04-03 11:30:57.000000000 -0600
21+++ node-v0.10.3/node.gyp 2013-04-03 19:30:22.000000000 -0600
1ed21df5 22@@ -67,17 +67,35 @@
be06d6d0
AS
23 'type': 'executable',
24
25 'dependencies': [
1ed21df5
A
26- 'node_js2c#host',
27+ 'libnode'
28 ],
29
30- 'include_dirs': [
31- 'src',
32- 'tools/msvs/genfiles',
33- 'deps/uv/src/ares',
34- '<(SHARED_INTERMEDIATE_DIR)' # for node_natives.h
35+ 'conditions': [
36+ [ 'node_shared_libuv=="false"', {
37+ 'dependencies': [ 'deps/uv/uv.gyp:libuv' ],
38+ }],
39 ],
40
41 'sources': [
be06d6d0
AS
42+ 'src/node_main.cc',
43+ # node.gyp is added to the project by default.
44+ 'common.gypi',
45+ ],
46+
47+ 'defines': [
48+ 'NODE_WANT_INTERNALS=1',
49+ 'ARCH="<(target_arch)"',
50+ 'PLATFORM="<(OS)"',
51+ ],
52+ },
53+ {
54+ 'target_name': 'libnode',
55+ 'type': 'shared_library',
9dc0bdad
A
56+ 'product_extension': 'so.10.3.0',
57+ 'soname_version': '10.3.0',
1ed21df5 58+ 'cflags': ['-fPIC'],
be06d6d0 59+
1ed21df5
A
60+ 'sources': [
61 'src/fs_event_wrap.cc',
62 'src/cares_wrap.cc',
63 'src/handle_wrap.cc',
64@@ -88,7 +106,6 @@
be06d6d0
AS
65 'src/node_file.cc',
66 'src/node_http_parser.cc',
67 'src/node_javascript.cc',
68- 'src/node_main.cc',
69 'src/node_os.cc',
70 'src/node_script.cc',
71 'src/node_stat_watcher.cc',
1ed21df5
A
72@@ -137,6 +154,17 @@
73 'common.gypi',
74 ],
75
76+ 'include_dirs': [
77+ 'src',
78+ 'tools/msvs/genfiles',
79+ 'deps/uv/src/ares',
80+ '<(SHARED_INTERMEDIATE_DIR)' # for node_natives.h
81+ ],
82+
83+ 'dependencies': [
84+ 'node_js2c#host',
85+ ],
86+
87 'defines': [
88 'NODE_WANT_INTERNALS=1',
89 'ARCH="<(target_arch)"',
9dc0bdad
A
90--- node-v0.10.3-o/tools/install.py 2013-04-03 11:30:57.000000000 -0600
91+++ node-v0.10.3/tools/install.py 2013-04-03 19:31:32.000000000 -0600
9dc0bdad 92@@ -119,7 +119,9 @@
be06d6d0
AS
93 assert(0) # unhandled action type
94
95 def files(action):
96+ global lib_dir
be06d6d0 97 action(['out/Release/node'], 'bin/node')
9dc0bdad 98+ action(['out/Release/lib.target/libnode.so.10.3.0'], lib_dir + '/libnode.so.10.3.0')
be06d6d0
AS
99
100 # install unconditionally, checking if the platform supports dtrace doesn't
101 # work when cross-compiling and besides, there's at least one linux flavor
9dc0bdad 102@@ -134,7 +136,7 @@
be06d6d0
AS
103 if 'true' == variables.get('node_install_npm'): npm_files(action)
104
105 def run(args):
106- global dst_dir, node_prefix, target_defaults, variables
107+ global dst_dir, node_prefix, target_defaults, variables, lib_dir
108
109 # chdir to the project's top-level directory
110 os.chdir(abspath(os.path.dirname(__file__), '..'))
9dc0bdad 111@@ -147,6 +149,9 @@
be06d6d0
AS
112 dst_dir = node_prefix = variables.get('node_prefix') or '/usr/local'
113 if len(args) > 2: dst_dir = abspath(args[2] + '/' + dst_dir)
be06d6d0 114
1ed21df5
A
115+ lib_dir = 'lib'
116+ if len(args) > 3: lib_dir = args[3]
117+
be06d6d0
AS
118 cmd = args[1] if len(args) > 1 else 'install'
119 if cmd == 'install': return files(install)
1ed21df5 120 if cmd == 'uninstall': return files(uninstall)
This page took 0.097237 seconds and 4 git commands to generate.