Blob Blame History Raw
From d3f8039429df599fcb7576f918c9eb1df6a063fc Mon Sep 17 00:00:00 2001
From: Jamie Nguyen <j@jamielinux.com>
Date: Fri, 18 Apr 2014 19:49:43 +0100
Subject: [PATCH] Use system expat

---
 binding.gyp                |  4 ++--
 deps/libexpat/libexpat.gyp | 22 +++-------------------
 2 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/binding.gyp b/binding.gyp
index 2073fe3..ae7ee9f 100644
--- a/binding.gyp
+++ b/binding.gyp
@@ -6,8 +6,8 @@
       'include_dirs': [
         '<!(node -e "require(\'nan\')")'
       ],
-      'dependencies': [
-        'deps/libexpat/libexpat.gyp:expat'
+      'libraries': [
+        '-lexpat',
       ]
     }
   ]
diff --git a/deps/libexpat/libexpat.gyp b/deps/libexpat/libexpat.gyp
index 331c1d0..14c00a3 100644
--- a/deps/libexpat/libexpat.gyp
+++ b/deps/libexpat/libexpat.gyp
@@ -47,31 +47,15 @@
       'product_prefix': 'lib',
       'type': 'static_library',
       'sources': [
-        'lib/xmlparse.c',
-        'lib/xmltok.c',
-        'lib/xmlrole.c',
+      '../node-expat.cc'
       ],
       'defines': [
         'PIC',
         'HAVE_EXPAT_CONFIG_H'
       ],
-      'include_dirs': [
-        '.',
-        'lib',
+      'libraries': [
+        '-lexpat',
       ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '.',
-          'lib',
-        ],
-        'conditions': [
-          ['OS=="win"', {
-            'defines': [
-              'XML_STATIC'
-            ]
-          }]
-        ],
-      },
     },
 
     {
-- 
1.9.0