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

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

Issue 1008873004: Instrumented libraries: pass correct configure flags to dbus. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | 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
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 'dependencies=': [], 194 'dependencies=': [],
195 'extra_configure_flags': [ 195 'extra_configure_flags': [
196 '--disable-gtk-doc', 196 '--disable-gtk-doc',
197 '--disable-static', 197 '--disable-static',
198 ], 198 ],
199 'includes': ['standard_instrumented_package_target.gypi'], 199 'includes': ['standard_instrumented_package_target.gypi'],
200 }, 200 },
201 { 201 {
202 'package_name': 'libdbus-1-3', 202 'package_name': 'libdbus-1-3',
203 'dependencies=': [], 203 'dependencies=': [],
204 'extra_configure_flags': ['--disable-static'], 204 'extra_configure_flags': [
205 '--disable-static',
206 # From debian/rules.
207 '--disable-libaudit',
208 '--enable-apparmor',
209 '--enable-systemd',
210 '--libexecdir=/lib/dbus-1.0',
211 '--with-systemdsystemunitdir=/lib/systemd/system',
212 '--disable-tests',
213 '--exec-prefix=/',
214 # From dh_auto_configure.
215 '--prefix=/usr',
216 '--localstatedir=/var',
217 ],
205 'includes': ['standard_instrumented_package_target.gypi'], 218 'includes': ['standard_instrumented_package_target.gypi'],
206 }, 219 },
207 { 220 {
208 'package_name': 'libdbus-glib-1-2', 221 'package_name': 'libdbus-glib-1-2',
209 'dependencies=': [], 222 'dependencies=': [],
210 'extra_configure_flags': [ 223 'extra_configure_flags': [
211 # Use system dbus-binding-tool. The just-built one is instrumented but 224 # Use system dbus-binding-tool. The just-built one is instrumented but
212 # doesn't have the correct RPATH, and will crash. 225 # doesn't have the correct RPATH, and will crash.
213 '--with-dbus-binding-tool=dbus-binding-tool', 226 '--with-dbus-binding-tool=dbus-binding-tool',
214 '--disable-static', 227 '--disable-static',
(...skipping 567 matching lines...) Expand 10 before | Expand all | Expand 10 after
782 'extra_configure_flags': [ 795 'extra_configure_flags': [
783 '--disable-static', 796 '--disable-static',
784 # See above. 797 # See above.
785 '--disable-introspection', 798 '--disable-introspection',
786 ], 799 ],
787 'run_before_build': 'scripts/autoreconf.sh', 800 'run_before_build': 'scripts/autoreconf.sh',
788 'includes': ['standard_instrumented_package_target.gypi'], 801 'includes': ['standard_instrumented_package_target.gypi'],
789 }, 802 },
790 ], 803 ],
791 } 804 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698