Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(150)

Unified Diff: third_party/libxslt/libxslt.gyp

Issue 53076: Add support for -Duse_system_{libxml,libxslt,sqlite}=1 for... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/libxslt/libxslt.gyp
===================================================================
--- third_party/libxslt/libxslt.gyp (revision 12500)
+++ third_party/libxslt/libxslt.gyp (working copy)
@@ -9,6 +9,7 @@
['OS=="mac"', {'os_include': 'mac'}],
['OS=="win"', {'os_include': 'win32'}],
],
+ 'use_system_libxslt%': 0,
},
'includes': [
'../../build/common.gypi',
@@ -16,76 +17,92 @@
'targets': [
{
'target_name': 'libxslt',
- 'type': 'static_library',
- 'msvs_guid': 'F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7',
- 'sources': [
- 'libxslt/attributes.c',
- 'libxslt/attributes.h',
- 'libxslt/attrvt.c',
- 'libxslt/documents.c',
- 'libxslt/documents.h',
- 'libxslt/extensions.c',
- 'libxslt/extensions.h',
- 'libxslt/extra.c',
- 'libxslt/extra.h',
- 'libxslt/functions.c',
- 'libxslt/functions.h',
- 'libxslt/imports.c',
- 'libxslt/imports.h',
- 'libxslt/keys.c',
- 'libxslt/keys.h',
- 'libxslt/libxslt.h',
- 'libxslt/namespaces.c',
- 'libxslt/namespaces.h',
- 'libxslt/numbers.c',
- 'libxslt/numbersInternals.h',
- 'libxslt/pattern.c',
- 'libxslt/pattern.h',
- 'libxslt/preproc.c',
- 'libxslt/preproc.h',
- 'libxslt/security.c',
- 'libxslt/security.h',
- 'libxslt/templates.c',
- 'libxslt/templates.h',
- 'libxslt/transform.c',
- 'libxslt/transform.h',
- 'libxslt/trio.h',
- 'libxslt/triodef.h',
- 'libxslt/variables.c',
- 'libxslt/variables.h',
- 'libxslt/win32config.h',
- 'libxslt/xslt.c',
- 'libxslt/xslt.h',
- 'libxslt/xsltconfig.h',
- 'libxslt/xsltexports.h',
- 'libxslt/xsltInternals.h',
- 'libxslt/xsltutils.c',
- 'libxslt/xsltutils.h',
- 'libxslt/xsltwin32config.h',
- 'linux/config.h',
- 'mac/config.h',
- # TODO(port): Need a pregenerated win32/config.h?
- ],
- 'defines': [
- 'LIBXSLT_STATIC',
- ],
- 'include_dirs': [
- '<(os_include)',
- '.',
- ],
- 'dependencies': [
- '../libxml/libxml.gyp:libxml',
- ],
- 'direct_dependent_settings': {
- 'defines': [
- 'LIBXSLT_STATIC',
- ],
- 'include_dirs': [
- '.',
- ],
- },
'conditions': [
- ['OS!="win"', {'product_name': 'xslt'}],
+ ['OS=="linux" and use_system_libxslt', {
+ 'type': 'settings',
+ 'direct_dependent_settings': {
+ 'cflags': [
+ '<!@(python ../../build/linux/pkg_config_wrapper.py --cflags libxslt)',
+ ],
+ },
+ 'link_settings': {
+ 'libraries': [
+ '<!@(python ../../build/linux/pkg_config_wrapper.py --libs libxslt)',
+ ],
+ },
+ }, { # else: OS != "linux" or ! use_system_libxslt
+ 'type': 'static_library',
+ 'msvs_guid': 'F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7',
+ 'sources': [
+ 'libxslt/attributes.c',
+ 'libxslt/attributes.h',
+ 'libxslt/attrvt.c',
+ 'libxslt/documents.c',
+ 'libxslt/documents.h',
+ 'libxslt/extensions.c',
+ 'libxslt/extensions.h',
+ 'libxslt/extra.c',
+ 'libxslt/extra.h',
+ 'libxslt/functions.c',
+ 'libxslt/functions.h',
+ 'libxslt/imports.c',
+ 'libxslt/imports.h',
+ 'libxslt/keys.c',
+ 'libxslt/keys.h',
+ 'libxslt/libxslt.h',
+ 'libxslt/namespaces.c',
+ 'libxslt/namespaces.h',
+ 'libxslt/numbers.c',
+ 'libxslt/numbersInternals.h',
+ 'libxslt/pattern.c',
+ 'libxslt/pattern.h',
+ 'libxslt/preproc.c',
+ 'libxslt/preproc.h',
+ 'libxslt/security.c',
+ 'libxslt/security.h',
+ 'libxslt/templates.c',
+ 'libxslt/templates.h',
+ 'libxslt/transform.c',
+ 'libxslt/transform.h',
+ 'libxslt/trio.h',
+ 'libxslt/triodef.h',
+ 'libxslt/variables.c',
+ 'libxslt/variables.h',
+ 'libxslt/win32config.h',
+ 'libxslt/xslt.c',
+ 'libxslt/xslt.h',
+ 'libxslt/xsltconfig.h',
+ 'libxslt/xsltexports.h',
+ 'libxslt/xsltInternals.h',
+ 'libxslt/xsltutils.c',
+ 'libxslt/xsltutils.h',
+ 'libxslt/xsltwin32config.h',
+ 'linux/config.h',
+ 'mac/config.h',
+ # TODO(port): Need a pregenerated win32/config.h?
+ ],
+ 'defines': [
+ 'LIBXSLT_STATIC',
+ ],
+ 'include_dirs': [
+ '<(os_include)',
+ '.',
+ ],
+ 'dependencies': [
+ '../libxml/libxml.gyp:libxml',
+ ],
+ 'direct_dependent_settings': {
+ 'defines': [
+ 'LIBXSLT_STATIC',
+ ],
+ 'include_dirs': [
+ '.',
+ ],
+ },
+ 'conditions': [
+ ['OS!="win"', {'product_name': 'xslt'}],
+ ],
+ }],
],
},
],

Powered by Google App Engine
This is Rietveld 408576698