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

Side by Side Diff: chromeos/config/make.conf.common-target

Issue 6298002: Mask the introspection USE flag at profile level. (Closed) Base URL: http://git.chromium.org/git/chromiumos-overlay.git@master
Patch Set: This time with fewer changes (avoiding the change to glib as well). Created 9 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « chromeos/config/make.conf.amd64-host ('k') | 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 (c) 2009 The Chromium OS Authors. All rights reserved. 1 # Copyright (c) 2009 The Chromium OS 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 # NOTE: This assumes that the following have already been defined: 5 # NOTE: This assumes that the following have already been defined:
6 # { ROOT, ARCH, CHOST, [BOARD_OVERLAY] } 6 # { ROOT, ARCH, CHOST, [BOARD_OVERLAY] }
7 7
8 # TODO: This will have to come from somewhere else when we support a 32-bit 8 # TODO: This will have to come from somewhere else when we support a 32-bit
9 # build host environment. 9 # build host environment.
10 CBUILD=x86_64-pc-linux-gnu 10 CBUILD=x86_64-pc-linux-gnu
11 HOSTCC=x86_64-pc-linux-gnu-gcc 11 HOSTCC=x86_64-pc-linux-gnu-gcc
12 12
13 ACCEPT_KEYWORDS="${ARCH}" 13 ACCEPT_KEYWORDS="${ARCH}"
14 USE="${ARCH} zlib bindist make-symlinks cros-debug" 14 USE="${ARCH} zlib bindist make-symlinks cros-debug -introspection"
15 15
16 # Be sure we don't overwrite pkgs from another sysroot. 16 # Be sure we don't overwrite pkgs from another sysroot.
17 PKGDIR=${ROOT}packages/ 17 PKGDIR=${ROOT}packages/
18 PORTAGE_TMPDIR=${ROOT}tmp/ 18 PORTAGE_TMPDIR=${ROOT}tmp/
19 19
20 FEATURES="buildpkg nodoc noinfo noman sandbox splitdebug -strict userfetch \ 20 FEATURES="buildpkg nodoc noinfo noman sandbox splitdebug -strict userfetch \
21 userpriv usersandbox" 21 userpriv usersandbox"
22 22
23 PORTAGE_WORKDIR_MODE="0755" 23 PORTAGE_WORKDIR_MODE="0755"
24 PKG_CONFIG_PATH="${ROOT}usr/lib/pkgconfig/:${ROOT}usr/share/pkgconfig/" 24 PKG_CONFIG_PATH="${ROOT}usr/lib/pkgconfig/:${ROOT}usr/share/pkgconfig/"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 SHARED_USER_HOME="/home/chronos/user" 57 SHARED_USER_HOME="/home/chronos/user"
58 58
59 # Packages that use python will run a small python script to find the 59 # Packages that use python will run a small python script to find the
60 # pythondir. Unfortunately, if the build chroot is 64-bit then that 60 # pythondir. Unfortunately, if the build chroot is 64-bit then that
61 # will output /usr/lib64/python2.6 rather than /usr/lib/python2.6. 61 # will output /usr/lib64/python2.6 rather than /usr/lib/python2.6.
62 # TODO(tedbo): Find a better place or fix for this "hack". 62 # TODO(tedbo): Find a better place or fix for this "hack".
63 am_cv_python_pythondir="\${prefix}/lib/python2.6/site-packages" 63 am_cv_python_pythondir="\${prefix}/lib/python2.6/site-packages"
64 64
65 # Allow the user to override or define additional settings. 65 # Allow the user to override or define additional settings.
66 source make.conf.user 66 source make.conf.user
OLDNEW
« no previous file with comments | « chromeos/config/make.conf.amd64-host ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698