diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-20 22:02:16 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-20 22:02:16 +0000 |
| commit | 3604ae8031682dc51a4bf8b3ede33f98f93265dc (patch) | |
| tree | e35ff3deaac53cf9c61ed52253835209a830e61e /printing | |
| parent | aae0e47537d42ba33bf2d869004c378ce1fd801c (diff) | |
| download | chromium_src-3604ae8031682dc51a4bf8b3ede33f98f93265dc.zip chromium_src-3604ae8031682dc51a4bf8b3ede33f98f93265dc.tar.gz chromium_src-3604ae8031682dc51a4bf8b3ede33f98f93265dc.tar.bz2 | |
mac: Build printing with -Wno-deprecated-declarations with the 10.9 SDK.
httpConnectEncrypt() is deprecated in the 10.9 SDK (cups 1.7), but the
replacement (httpConnect2) doesn't exist on current OS X versions. Rather than
dlsym()ing the symbol, just don't warn on deprecated declarations in this
target for now -- that matches how deprecations in cups 1.6 are handled too.
BUG=249803
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/17198004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207598 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing')
| -rw-r--r-- | printing/printing.gyp | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/printing/printing.gyp b/printing/printing.gyp index f8bbb7b..4f87add5 100644 --- a/printing/printing.gyp +++ b/printing/printing.gyp @@ -177,14 +177,29 @@ '../build/linux/system.gyp:libgcrypt', ], }], - ['cups_version=="1.6"', { + ['cups_version in ["1.6", "1.7"]', { 'cflags': [ # CUPS 1.6 deprecated the PPD APIs, but we will stay with this # API for now as supported Linux and Mac OS'es are still using # older versions of CUPS. More info: crbug.com/226176 '-Wno-deprecated-declarations', + # CUPS 1.7 deprecates httpConnectEncrypt(), see the mac section + # below. ], }], + ['OS=="mac" and mac_sdk=="10.9"', { + # The 10.9 SDK includes cups 1.7, which deprecates + # httpConnectEncrypt() in favor of httpConnect2(). hhttpConnect2() + # is new in 1.7, so it doesn't exist on OS X 10.6-10.8 and we + # can't use it until 10.9 is our minimum system version. + # (cups_version isn't reliable on OS X, so key the check off of + # mac_sdk). + 'xcode_settings': { + 'WARNING_CFLAGS': [ + '-Wno-deprecated-declarations', + ], + }, + }], ], 'defines': [ # PRINT_BACKEND_AVAILABLE disables the default dummy implementation |