Chromium Code Reviews

Side by Side Diff: third_party/instrumented_libraries/instrumented_libraries.gyp

Issue 614903003: Instrumented libraries: introduce release-specific patches. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff |
« no previous file with comments | « no previous file | third_party/instrumented_libraries/patches/libfontconfig.diff » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'verbose_libraries_build%': 0, 7 'verbose_libraries_build%': 0,
8 'instrumented_libraries_jobs%': 1, 8 'instrumented_libraries_jobs%': 1,
9 }, 9 },
10 10
11 'ubuntu_release': '<!(lsb_release -cs)',
12
11 'conditions': [ 13 'conditions': [
12 ['asan==1', { 14 ['asan==1', {
13 'sanitizer_type': 'asan', 15 'sanitizer_type': 'asan',
14 }], 16 }],
15 ['msan==1', { 17 ['msan==1', {
16 'sanitizer_type': 'msan', 18 'sanitizer_type': 'msan',
17 }], 19 }],
18 ['tsan==1', { 20 ['tsan==1', {
19 'sanitizer_type': 'tsan', 21 'sanitizer_type': 'tsan',
20 }], 22 }],
(...skipping 192 matching lines...)
213 }, 215 },
214 { 216 {
215 'package_name': 'libfontconfig1', 217 'package_name': 'libfontconfig1',
216 'dependencies=': [], 218 'dependencies=': [],
217 'extra_configure_flags': [ 219 'extra_configure_flags': [
218 '--disable-docs', 220 '--disable-docs',
219 '--sysconfdir=/etc/', 221 '--sysconfdir=/etc/',
220 # From debian/rules. 222 # From debian/rules.
221 '--with-add-fonts=/usr/X11R6/lib/X11/fonts,/usr/local/share/fonts', 223 '--with-add-fonts=/usr/X11R6/lib/X11/fonts,/usr/local/share/fonts',
222 ], 224 ],
223 'patch': 'patches/libfontconfig.diff', 225 'conditions': [
226 ['"<(_ubuntu_release)"=="precise"', {
227 'patch': 'patches/libfontconfig.precise.diff',
228 }, {
229 'patch': 'patches/libfontconfig.trusty.diff',
230 }],
231 ],
224 'includes': ['standard_instrumented_package_target.gypi'], 232 'includes': ['standard_instrumented_package_target.gypi'],
225 }, 233 },
226 { 234 {
227 'package_name': 'libgcrypt11', 235 'package_name': 'libgcrypt11',
228 'dependencies=': [], 236 'dependencies=': [],
229 'package_ldflags': ['-Wl,-z,muldefs'], 237 'package_ldflags': ['-Wl,-z,muldefs'],
230 'extra_configure_flags': [ 238 'extra_configure_flags': [
231 # From debian/rules. 239 # From debian/rules.
232 '--enable-noexecstack', 240 '--enable-noexecstack',
233 '--enable-ld-version-script', 241 '--enable-ld-version-script',
(...skipping 265 matching lines...)
499 'package_cflags': ['-Wno-return-type'], 507 'package_cflags': ['-Wno-return-type'],
500 'extra_configure_flags': [ 508 'extra_configure_flags': [
501 # From debian/rules. 509 # From debian/rules.
502 '--prefix=/usr', 510 '--prefix=/usr',
503 '--sysconfdir=/etc', 511 '--sysconfdir=/etc',
504 '--enable-test-print-backend', 512 '--enable-test-print-backend',
505 '--enable-introspection=no', 513 '--enable-introspection=no',
506 '--with-xinput=yes', 514 '--with-xinput=yes',
507 ], 515 ],
508 'dependencies=': [], 516 'dependencies=': [],
509 'patch': 'patches/libgtk2.0-0.diff', 517 'conditions': [
518 ['"<(_ubuntu_release)"=="precise"', {
519 'patch': 'patches/libgtk2.0-0.precise.diff',
520 }, {
521 'patch': 'patches/libgtk2.0-0.trusty.diff',
522 }],
523 ],
510 'run_before_build': 'scripts/libgtk2.0-0.sh', 524 'run_before_build': 'scripts/libgtk2.0-0.sh',
511 'includes': ['standard_instrumented_package_target.gypi'], 525 'includes': ['standard_instrumented_package_target.gypi'],
512 }, 526 },
513 { 527 {
514 'package_name': 'libgdk-pixbuf2.0-0', 528 'package_name': 'libgdk-pixbuf2.0-0',
515 'extra_configure_flags': [ 529 'extra_configure_flags': [
516 # From debian/rules. 530 # From debian/rules.
517 '--with-libjasper', 531 '--with-libjasper',
518 '--with-x11', 532 '--with-x11',
519 # Make the build less problematic. 533 # Make the build less problematic.
(...skipping 92 matching lines...)
612 'extra_configure_flags': [ 626 'extra_configure_flags': [
613 # See above. 627 # See above.
614 '--disable-introspection', 628 '--disable-introspection',
615 ], 629 ],
616 'dependencies=': [], 630 'dependencies=': [],
617 'run_before_build': 'scripts/autogen.sh', 631 'run_before_build': 'scripts/autogen.sh',
618 'includes': ['standard_instrumented_package_target.gypi'], 632 'includes': ['standard_instrumented_package_target.gypi'],
619 }, 633 },
620 ], 634 ],
621 } 635 }
OLDNEW
« no previous file with comments | « no previous file | third_party/instrumented_libraries/patches/libfontconfig.diff » ('j') | no next file with comments »

Powered by Google App Engine