diff options
Diffstat (limited to 'third_party/libxml')
| -rw-r--r-- | third_party/libxml/README.chromium | 1 | ||||
| -rw-r--r-- | third_party/libxml/build/libxml.vsprops | 2 | ||||
| -rw-r--r-- | third_party/libxml/libxml.gyp | 8 | ||||
| -rw-r--r-- | third_party/libxml/xmldummy_mac.cc | 2 |
4 files changed, 9 insertions, 4 deletions
diff --git a/third_party/libxml/README.chromium b/third_party/libxml/README.chromium index 659e650..8c7a407 100644 --- a/third_party/libxml/README.chromium +++ b/third_party/libxml/README.chromium @@ -17,6 +17,7 @@ includes the following modifications : (http://bugzilla.gnome.org/show_bug.cgi?id=502960 ) * Applied security patch located at https://bugzilla.redhat.com/show_bug.cgi?id=461015 * Applied v2.6.26 version of security patch located at https://bugzilla.redhat.com/show_bug.cgi?id=515195 +* Add an empty source file, xmldummy_mac.cc, to the tree to work around an Xcode bug. Current version: 2.6.32 diff --git a/third_party/libxml/build/libxml.vsprops b/third_party/libxml/build/libxml.vsprops index a8392e2c..0a35f12 100644 --- a/third_party/libxml/build/libxml.vsprops +++ b/third_party/libxml/build/libxml.vsprops @@ -3,7 +3,7 @@ ProjectType="Visual C++" Version="8.00" Name="libxml" - InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\third_party\libxml\build\using_libxml.vsprops;$(SolutionDir)..\third_party\zlib\using_zlib.vsprops;$(SolutionDir)..\third_party\icu38\build\using_icu.vsprops;$(SolutionDir)..\build\external_code.vsprops" + InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\third_party\libxml\build\using_libxml.vsprops;$(SolutionDir)..\third_party\zlib\using_zlib.vsprops;$(SolutionDir)..\third_party\icu\build\using_icu.vsprops;$(SolutionDir)..\build\external_code.vsprops" > <Tool Name="VCCLCompilerTool" diff --git a/third_party/libxml/libxml.gyp b/third_party/libxml/libxml.gyp index 848c857..16f49d8 100644 --- a/third_party/libxml/libxml.gyp +++ b/third_party/libxml/libxml.gyp @@ -158,11 +158,11 @@ 'include', ], 'dependencies': [ - '../icu38/icu38.gyp:icuuc', + '../icu/icu.gyp:icuuc', '../zlib/zlib.gyp:zlib', ], 'export_dependent_settings': [ - '../icu38/icu38.gyp:icuuc', + '../icu/icu.gyp:icuuc', ], 'direct_dependent_settings': { 'defines': [ @@ -189,6 +189,7 @@ 'type': 'executable', 'sources': [ 'xmlcatalog.c', + 'xmldummy_mac.cc', ], 'include_dirs': [ '<(os_include)', @@ -212,13 +213,14 @@ 'type': 'executable', 'sources': [ 'xmllint.c', + 'xmldummy_mac.cc', ], 'include_dirs': [ '<(os_include)', ], 'dependencies': [ 'libxml', - '../icu38/icu38.gyp:icuuc', + '../icu/icu.gyp:icuuc', ], 'conditions': [ ['OS=="linux"', { diff --git a/third_party/libxml/xmldummy_mac.cc b/third_party/libxml/xmldummy_mac.cc new file mode 100644 index 0000000..181fd34 --- /dev/null +++ b/third_party/libxml/xmldummy_mac.cc @@ -0,0 +1,2 @@ +// This is a dummy file to work around an Xcode bug and to force Xcode to use +// g++ instead of gcc when linking xmllint and xmlcatalog. |