diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/libchrome_crypto/files/SConstruct b/sdk_container/src/third_party/coreos-overlay/coreos-base/libchrome_crypto/files/SConstruct deleted file mode 100755 index e229f47b6c..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/libchrome_crypto/files/SConstruct +++ /dev/null @@ -1,65 +0,0 @@ -# -*- python -*- -# Copyright (c) 2012 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. - -import os -import SCons.Util - -PKG_CONFIG = os.environ.get('PKG_CONFIG', 'pkg-config') -BASE_VER = os.environ['BASE_VER'] -libchrome = 'chrome-%s' % BASE_VER - -env = Environment() - -# Keep ebuild up to date with appropriate headers, or else figure -# out how to get scons to handle header installation as well. -sources = env.Split(""" - nss_util.cc - rsa_private_key.cc - rsa_private_key_nss.cc - signature_creator_nss.cc - signature_verifier_nss.cc - symmetric_key_nss.cc - """) - -env.Append( - CCFLAGS=['-g'] -) -for key in Split('CC CXX AR RANLIB LD NM CFLAGS CXXFLAGS CCFLAGS'): - value = os.environ.get(key) - if value: - env[key] = Split(value) - -if os.environ.has_key('CPPFLAGS'): - env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CPPFLAGS']) -if os.environ.has_key('LDFLAGS'): - env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS']) - -env['CCFLAGS'] += ['-fPIC', - '-fno-exceptions', - '-Wall', - '-Werror', - '-DOS_CHROMEOS', - '-DUSE_NSS', - '-DUSE_SYSTEM_LIBEVENT', - '-I..'] - -# Fix issue with scons not passing some vars through the environment. -for key in Split('PKG_CONFIG_LIBDIR PKG_CONFIG_PATH SYSROOT'): - if os.environ.has_key(key): - env['ENV'][key] = os.environ[key] - -# glib, nss environment -env.ParseConfig('%s --cflags --libs nss lib%s' % (PKG_CONFIG, libchrome)) - -env.StaticLibrary('chrome_crypto', sources) - -# We don't actually install the shared lib. The point of this is to verify -# all the necessary objects are compiled and the symbols used are available. -# Otherwise we might not find out until building something else against the -# static library. -env.Append( - LINKFLAGS = ['-Wl,--as-needed', '-Wl,-z,defs'], -) -env.SharedLibrary('chrome_crypto', sources) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/libchrome_crypto/files/memory_annotation.patch b/sdk_container/src/third_party/coreos-overlay/coreos-base/libchrome_crypto/files/memory_annotation.patch deleted file mode 100644 index d004cc282e..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/libchrome_crypto/files/memory_annotation.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur libchrome-55729-orig/files/base/crypto/rsa_private_key_nss.cc libchrome-55729-ann/files/base/crypto/rsa_private_key_nss.cc ---- libchrome-55729-orig/files/crypto/rsa_private_key_nss.cc 2010-08-11 13:51:24.000000000 -0700 -+++ libchrome-55729-ann/files/crypto/rsa_private_key_nss.cc 2010-08-11 15:46:36.000000000 -0700 -@@ -10,7 +10,7 @@ - - #include - --#include "base/debug/leak_annotations.h" -+#define ANNOTATE_SCOPED_MEMORY_LEAK ; - #include "base/logging.h" - #include "base/memory/scoped_ptr.h" - #include "base/string_util.h" diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/libchrome_crypto/libchrome_crypto-125070.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/libchrome_crypto/libchrome_crypto-125070.ebuild deleted file mode 100644 index aa1a178320..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/libchrome_crypto/libchrome_crypto-125070.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -# See logic for ${PV} behavior in the libchrome ebuild. - -# XXX: Yes, this hits svn rev 125110 instead of rev 125070, but -# that is correct. See above note. - -EAPI="4" -CROS_WORKON_COMMIT="dee4850a6eb7f90c236846ad9beebed23df76d4f" -CROS_WORKON_PROJECT="chromium/src/crypto" - -inherit cros-workon cros-debug toolchain-funcs scons-utils - -DESCRIPTION="Chrome crypto/ library extracted for use on Chrome OS" -HOMEPAGE="http://www.chromium.org/" -SRC_URI="" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 arm x86" -IUSE="" - -RDEPEND="chromeos-base/libchrome:${PV}[cros-debug=] - dev-libs/nss" -DEPEND="${RDEPEND} - dev-cpp/gtest" - -src_prepare() { - ln -s "${S}" "${WORKDIR}/crypto" &> /dev/null - cp -p "${FILESDIR}/SConstruct" "${S}" || die - epatch "${FILESDIR}/memory_annotation.patch" -} - -src_compile() { - tc-export AR CXX PKG_CONFIG RANLIB - cros-debug-add-NDEBUG - - BASE_VER=${PV} escons || die -} - -src_install() { - dolib.a libchrome_crypto.a - - insinto /usr/include/crypto - doins nss_util{,_internal}.h rsa_private_key.h \ - signature_{creator,verifier}.h crypto_export.h -} diff --git a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/libchrome_crypto-125070 b/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/libchrome_crypto-125070 deleted file mode 100644 index d272271d44..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/metadata/md5-cache/coreos-base/libchrome_crypto-125070 +++ /dev/null @@ -1,12 +0,0 @@ -DEFINED_PHASES=compile info install prepare unpack -DEPEND=chromeos-base/libchrome:125070[cros-debug=] dev-libs/nss dev-cpp/gtest >=dev-vcs/git-1.8.2.1 dev-util/scons -DESCRIPTION=Chrome crypto/ library extracted for use on Chrome OS -EAPI=4 -HOMEPAGE=http://www.chromium.org/ -IUSE=cros_workon_tree_* profiling cros-debug -KEYWORDS=amd64 arm x86 -LICENSE=BSD -RDEPEND=chromeos-base/libchrome:125070[cros-debug=] dev-libs/nss -SLOT=0 -_eclasses_=cros-debug deb4c0b1259db4d092692c4c46fe072b cros-workon 95ff57bae980ffcda8051a50f820179c eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 git-r3 ab80045e5d080584334f33013f4df21d multilib 62927b3db3a589b0806255f3a002d5d3 scons-utils 988e24b9e2e4642189b4e97c03e5ae71 toolchain-funcs 42408102d713fbad60ca21349865edb4 -_md5_=71908f23f801e649e498904c394c9173