From a95045fda3faaa258b005300bc2ebf45dc756f39 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Fri, 1 Aug 2014 17:41:46 -0700 Subject: [PATCH] hard-host-depends: remove google-breakpad This package does not build in the SDK after removing multilib support. We don't actually need it, kill it. --- .../google-breakpad/files/chromeos-version.sh | 11 --- .../google-breakpad-1084-r52.ebuild | 93 ------------------- .../google-breakpad-9999.ebuild | 91 ------------------ ...ld => hard-host-depends-0.0.1-r166.ebuild} | 0 .../hard-host-depends-0.0.1.ebuild | 2 +- 5 files changed, 1 insertion(+), 196 deletions(-) delete mode 100755 sdk_container/src/third_party/coreos-overlay/coreos-base/google-breakpad/files/chromeos-version.sh delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/google-breakpad/google-breakpad-1084-r52.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/google-breakpad/google-breakpad-9999.ebuild rename sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/{hard-host-depends-0.0.1-r165.ebuild => hard-host-depends-0.0.1-r166.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/google-breakpad/files/chromeos-version.sh b/sdk_container/src/third_party/coreos-overlay/coreos-base/google-breakpad/files/chromeos-version.sh deleted file mode 100755 index fa970952bd..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/google-breakpad/files/chromeos-version.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2013 The Chromium OS Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. -# -# This script is given one argument: the base of the source directory of -# the package, and it prints a string on stdout with the numerical version -# number for said repo. - -"$1"/configure --version | awk '{print $NF; exit}' diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/google-breakpad/google-breakpad-1084-r52.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/google-breakpad/google-breakpad-1084-r52.ebuild deleted file mode 100644 index 533d53704f..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/google-breakpad/google-breakpad-1084-r52.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 -CROS_WORKON_COMMIT="232fb3ad52342305e55b3a1d51632a9bd52d18cc" -CROS_WORKON_TREE="cc72c3a2e2d1746bb31faf70937fc427ad6a57aa" -CROS_WORKON_PROJECT="chromiumos/platform/google-breakpad" - -inherit autotools cros-debug cros-workon toolchain-funcs - -DESCRIPTION="Google crash reporting" -HOMEPAGE="http://code.google.com/p/google-breakpad" -SRC_URI="" -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 x86 arm" -IUSE="" - -RDEPEND="net-misc/curl" -DEPEND="${RDEPEND}" - -src_prepare() { - eautoreconf - if ! tc-is-cross-compiler; then - einfo "Creating a separate 32b src directory" - mkdir ../work32 - cp -a . ../work32 - mv ../work32 . - fi -} - -src_configure() { - #TODO(raymes): Uprev breakpad so this isn't necessary. See - # (crosbug.com/14275). - [ "$ARCH" = "arm" ] && append-cflags "-marm" && append-cxxflags "-marm" - - # We purposefully disable optimizations due to optimizations causing - # src/processor code to crash (minidump_stackwalk) as well as tests - # to fail. See - # http://code.google.com/p/google-breakpad/issues/detail?id=400. - append-flags "-O0" - - tc-export CC CXX LD PKG_CONFIG - - econf - - if ! tc-is-cross-compiler; then - einfo "Running 32b configuration" - cd work32 || die "chdir failed" - append-flags "-m32" - econf - filter-flags "-m32" - fi -} - -src_compile() { - tc-export CC CXX PKG_CONFIG - emake - - if ! tc-is-cross-compiler; then - cd work32 || die "chdir failed" - einfo "Building dump_syms and minidump-2-core with -m32" - emake src/tools/linux/dump_syms/dump_syms \ - src/tools/linux/md2core/minidump-2-core - fi -} - -src_test() { - emake check -} - -src_install() { - tc-export CXX PKG_CONFIG - emake DESTDIR="${D}" install - insinto /usr/include/google-breakpad/client/linux/handler - doins src/client/linux/handler/*.h - insinto /usr/include/google-breakpad/client/linux/crash_generation - doins src/client/linux/crash_generation/*.h - insinto /usr/include/google-breakpad/common/linux - doins src/common/linux/*.h - insinto /usr/include/google-breakpad/processor - doins src/processor/*.h - dobin src/tools/linux/core2md/core2md \ - src/tools/linux/md2core/minidump-2-core \ - src/tools/linux/dump_syms/dump_syms \ - src/tools/linux/symupload/sym_upload \ - src/tools/linux/symupload/minidump_upload - if ! tc-is-cross-compiler; then - newbin work32/src/tools/linux/dump_syms/dump_syms dump_syms.32 - newbin work32/src/tools/linux/md2core/minidump-2-core \ - minidump-2-core.32 - fi -} diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/google-breakpad/google-breakpad-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/google-breakpad/google-breakpad-9999.ebuild deleted file mode 100644 index 67afc9f4ce..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/google-breakpad/google-breakpad-9999.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 -CROS_WORKON_PROJECT="chromiumos/platform/google-breakpad" - -inherit autotools cros-debug cros-workon toolchain-funcs - -DESCRIPTION="Google crash reporting" -HOMEPAGE="http://code.google.com/p/google-breakpad" -SRC_URI="" -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~arm" -IUSE="" - -RDEPEND="net-misc/curl" -DEPEND="${RDEPEND}" - -src_prepare() { - eautoreconf - if ! tc-is-cross-compiler; then - einfo "Creating a separate 32b src directory" - mkdir ../work32 - cp -a . ../work32 - mv ../work32 . - fi -} - -src_configure() { - #TODO(raymes): Uprev breakpad so this isn't necessary. See - # (crosbug.com/14275). - [ "$ARCH" = "arm" ] && append-cflags "-marm" && append-cxxflags "-marm" - - # We purposefully disable optimizations due to optimizations causing - # src/processor code to crash (minidump_stackwalk) as well as tests - # to fail. See - # http://code.google.com/p/google-breakpad/issues/detail?id=400. - append-flags "-O0" - - tc-export CC CXX LD PKG_CONFIG - - econf - - if ! tc-is-cross-compiler; then - einfo "Running 32b configuration" - cd work32 || die "chdir failed" - append-flags "-m32" - econf - filter-flags "-m32" - fi -} - -src_compile() { - tc-export CC CXX PKG_CONFIG - emake - - if ! tc-is-cross-compiler; then - cd work32 || die "chdir failed" - einfo "Building dump_syms and minidump-2-core with -m32" - emake src/tools/linux/dump_syms/dump_syms \ - src/tools/linux/md2core/minidump-2-core - fi -} - -src_test() { - emake check -} - -src_install() { - tc-export CXX PKG_CONFIG - emake DESTDIR="${D}" install - insinto /usr/include/google-breakpad/client/linux/handler - doins src/client/linux/handler/*.h - insinto /usr/include/google-breakpad/client/linux/crash_generation - doins src/client/linux/crash_generation/*.h - insinto /usr/include/google-breakpad/common/linux - doins src/common/linux/*.h - insinto /usr/include/google-breakpad/processor - doins src/processor/*.h - dobin src/tools/linux/core2md/core2md \ - src/tools/linux/md2core/minidump-2-core \ - src/tools/linux/dump_syms/dump_syms \ - src/tools/linux/symupload/sym_upload \ - src/tools/linux/symupload/minidump_upload - if ! tc-is-cross-compiler; then - newbin work32/src/tools/linux/dump_syms/dump_syms dump_syms.32 - newbin work32/src/tools/linux/md2core/minidump-2-core \ - minidump-2-core.32 - fi -} diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r165.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r166.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r165.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r166.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild index e8e51c1167..a2c10b924d 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild @@ -37,7 +37,6 @@ RDEPEND="${RDEPEND} app-arch/unzip app-emulation/qemu app-text/texi2html - coreos-base/google-breakpad coreos-base/cros-devutils[cros_host] coreos-base/cros-testutils coreos-base/vboot_reference @@ -187,4 +186,5 @@ RDEPEND="${RDEPEND} # Uninstall these packages. RDEPEND="${RDEPEND} !net-misc/dhcpcd + !coreos-base/google-breakpad "