summaryrefslogtreecommitdiffstats
path: root/third_party/libxml/libxml.gyp
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-16 19:33:57 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-16 19:33:57 +0000
commita850e9592bb1a8c43275116ff565c91b4b1cb66b (patch)
treee2f9e64fbcfdb87a7693dcb9250e66082290cc5f /third_party/libxml/libxml.gyp
parentefa0151b9f7a4389a86334ef75fa0ce138c9778e (diff)
downloadchromium_src-a850e9592bb1a8c43275116ff565c91b4b1cb66b.zip
chromium_src-a850e9592bb1a8c43275116ff565c91b4b1cb66b.tar.gz
chromium_src-a850e9592bb1a8c43275116ff565c91b4b1cb66b.tar.bz2
Update libxml to 2.7.7.
In doing so, I recreated all the patches and organized them under a patches/ subdirectory. BUG=32197 Review URL: http://codereview.chromium.org/2951008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52725 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/libxml/libxml.gyp')
-rw-r--r--third_party/libxml/libxml.gyp11
1 files changed, 5 insertions, 6 deletions
diff --git a/third_party/libxml/libxml.gyp b/third_party/libxml/libxml.gyp
index 8445e1a..0311df1 100644
--- a/third_party/libxml/libxml.gyp
+++ b/third_party/libxml/libxml.gyp
@@ -148,9 +148,6 @@
'xpath.c',
'xpointer.c',
],
- 'defines': [
- 'LIBXML_STATIC',
- ],
'include_dirs': [
'<(os_include)',
'<(os_include)/include',
@@ -164,9 +161,6 @@
'../icu/icu.gyp:icuuc',
],
'direct_dependent_settings': {
- 'defines': [
- 'LIBXML_STATIC',
- ],
'include_dirs': [
'<(os_include)/include',
'include',
@@ -184,6 +178,11 @@
['OS=="mac"', {'defines': ['_REENTRANT']}],
['OS=="win"', {
'product_name': 'libxml2',
+ 'defines': [
+ # This symbol prevents libxml from marking its functions with
+ # __declspec(dllexport).
+ 'LIBXML_STATIC',
+ ],
}, { # else: OS!="win"
'product_name': 'xml2',
}],