Permalink
Browse files

use gyp to properly depend on libffi

  • Loading branch information...
TooTallNate committed Sep 10, 2012
1 parent 3f8efbe commit 3f563e0c6b4775ff7914a4b71fc5bdcf4c3675c6
Showing with 2 additions and 63 deletions.
  1. +0 −1 .gitignore
  2. +1 −35 binding.gyp
  3. +1 −1 deps/libffi/libffi.gyp
  4. +0 −5 libffi-build.sh
  5. +0 −21 libffi-config.sh
View
@@ -6,7 +6,6 @@
*.Makefile
*.target.gyp.mk
build
-out
Release
Debug
node_modules
View
@@ -7,25 +7,15 @@
, 'src/callback_info.cc'
, 'src/threaded_callback_invokation.cc'
],
- 'include_dirs': [
- 'deps/libffi/include'
- ],
'dependencies': [
- 'libffi'
+ 'deps/libffi/libffi.gyp:ffi'
],
'conditions': [
['OS=="win"', {
- 'libraries': [
- '<(module_root_dir)/deps/libffi/.libs/libffi.lib'
- ],
'dependencies': [
'deps/dlfcn-win32/dlfcn.gyp:dlfcn'
, 'deps/pthreads-win32/pthread.gyp:pthread'
]
- }, {
- 'libraries': [
- '<(module_root_dir)/deps/libffi/.libs/libffi.a'
- ],
}],
['OS=="mac"', {
'xcode_settings': {
@@ -40,30 +30,6 @@
],
}]
]
- },
- {
- 'target_name': 'libffi',
- 'type': 'none',
- 'actions': [
- {
- 'action_name': 'test',
- # a hack to run libffi ./configure during `node-gyp configure`
- 'inputs': ['<!@(sh libffi-config.sh)'],
- 'outputs': [''],
- 'conditions': [
- ['OS=="win"', {
- 'action': [
- 'echo', 'test'
- ]
- }, {
- 'action': [
- # run libffi `make`
- 'sh', 'libffi-build.sh'
- ]
- }]
- ]
- }
- ]
}
]
}
View
@@ -76,7 +76,7 @@
],
'direct_dependent_settings': {
'include_dirs': [
- 'include'
+ 'include',
# platform and arch-specific headers
'config/<(OS)/<(target_arch)'
],
View
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-cd deps/libffi
-make
-cd ../..
View
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-cd deps/libffi
-if [ "x$OSTYPE" = "xmsys" ]; then
- if [ "x$MOZILLABUILD" = "x" ]; then
- echo "FATAL: node-ffi must be installed from within a MozillaBuild window" >&2
- exit 1
- fi
- export CC="`pwd`/msvcc.sh"
- export LD="link"
- export CPP="cl -nologo -EP"
- export CFLAGS=""
-fi
-make clean distclean >node_ffi_configure.out 2>&1
-sh configure --enable-static --disable-shared --disable-builddir --with-pic >>node_ffi_configure.out 2>&1
-if [ "x$OSTYPE" = "xmsys" ]; then
- # need to invoke "make" immediately on windows (instead of during `build`)
- make >node_ffi_build.out 2>&1
- echo $? >>node_ffi_build.out
-fi
-cd ../..

0 comments on commit 3f563e0

Please sign in to comment.