From 7af661170d961231365ecae5345ec0e7051fb860 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Fri, 5 Jul 2013 15:12:42 -0400 Subject: [PATCH] fix(profiles): Apply the bindist flag to both the SDK and targets Previously only targets were being built with bindist but we should build the SDK with it as well. This avoids the re-compile of openssl, openssh, and freetype when creating a new chroot since the SDK tarballs are already built with the bindist flag. Also turn the bindist flag back on for freetype in the target profile, we don't need ClearType sub-pixel rendering on our systems. :) --- .../third_party/coreos-overlay/profiles/base/make.defaults | 3 +++ .../coreos-overlay/profiles/targets/coreos/make.defaults | 2 +- .../coreos-overlay/profiles/targets/coreos/package.use.mask | 5 ----- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/base/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/base/make.defaults index af9832a410..cac1c05562 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/base/make.defaults +++ b/sdk_container/src/third_party/coreos-overlay/profiles/base/make.defaults @@ -142,6 +142,9 @@ USE_EXPAND_HIDDEN="${USE_EXPAND_HIDDEN} CROS_WORKON_TREE" # Previously defined in make.conf USE="${USE} hardened cros_host pic pie expat -introspection -cups -openrc" +# Enable bindist for both SDK and targets +USE="${USE} bindist" + # Default licenses that are accepted for ChromiumOS builds. # If you want to accept more, use the --accept_licenses flag # when running setup_board. diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/make.defaults index 19221eb07a..288a5915c4 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/make.defaults +++ b/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/make.defaults @@ -1,7 +1,7 @@ # Copyright (c) 2012 The Chromium OS Authors. All rights reserved. # Distributed under the terms of the GNU General Public License v2 -USE="bindist cros-debug acpi usb pam" +USE="cros-debug acpi usb pam" USE="${USE} -cros_host -expat -pic -pie -cairo -X" USE="${USE} -acl -cracklib -gpm -ipv6 -openmp -python -sha512" USE="${USE} -fortran -abiword -perl -cups -poppler-data -nls" diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.use.mask b/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.use.mask index 3023e13059..1b9fce6201 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.use.mask +++ b/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.use.mask @@ -1,11 +1,6 @@ # Copyright (c) 2010 The Chromium OS Authors. All rights reserved. # Distributed under the terms of the GNU General Public License v2 -# Brian Stell (27 August 2010) -# For Chromium OS enable FreeType sub-pixel anti-aliasing and bytecode -# interpreter -media-libs/freetype bindist - # Jungshik Shin