diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/libchrome/files/SConstruct-180609 b/sdk_container/src/third_party/coreos-overlay/coreos-base/libchrome/files/SConstruct-180609 deleted file mode 100644 index 90e91cd24b..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/libchrome/files/SConstruct-180609 +++ /dev/null @@ -1,238 +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 - -# This block will most likely need updating whenever libchrome gets updated. -# The order of the libs below doesn't matter (as scons will take care of -# building things in the required order). The split between them is purely -# to reduce over linking of 3rd party libraries. i.e. 'core' should require -# only the C library (and glib), and all other 3rd party libraries should -# get a unique 'xxx' name. -base_name = 'base' -base_libs = [ - { - 'name' : 'core', - 'sources' : """ - allocator/type_profiler_control.cc - at_exit.cc - atomicops_internals_x86_gcc.cc - base_switches.cc - callback_internal.cc - chromeos/chromeos_version.cc - command_line.cc - debug/alias.cc - debug/debugger.cc - debug/debugger_posix.cc - debug/stack_trace.cc - debug/stack_trace_posix.cc - environment.cc - file_path.cc - file_util.cc - file_util_posix.cc - json/json_parser.cc - json/json_reader.cc - json/json_writer.cc - json/json_string_value_serializer.cc - json/string_escape.cc - lazy_instance.cc - location.cc - logging.cc - memory/ref_counted.cc - memory/ref_counted_memory.cc - memory/singleton.cc - memory/weak_ptr.cc - message_pump.cc - message_pump_default.cc - metrics/bucket_ranges.cc - metrics/histogram.cc - metrics/histogram_base.cc - metrics/histogram_samples.cc - metrics/sample_map.cc - metrics/sample_vector.cc - metrics/sparse_histogram.cc - metrics/statistics_recorder.cc - pickle.cc - platform_file.cc - platform_file_posix.cc - posix/file_descriptor_shuffle.cc - process_posix.cc - process_util.cc - process_util_linux.cc - process_util_posix.cc - profiler/alternate_timer.cc - profiler/tracked_time.cc - safe_strerror_posix.cc - string16.cc - string_number_conversions.cc - string_piece.cc - stringprintf.cc - string_split.cc - string_util.cc - synchronization/condition_variable_posix.cc - synchronization/lock.cc - synchronization/lock_impl_posix.cc - synchronization/waitable_event_posix.cc - sys_info_posix.cc - sys_string_conversions_posix.cc - third_party/dmg_fp/dtoa.cc - third_party/dmg_fp/g_fmt.cc - third_party/dynamic_annotations/dynamic_annotations.c - third_party/icu/icu_utf.cc - third_party/nspr/prtime.cc - threading/non_thread_safe_impl.cc - threading/platform_thread_posix.cc - threading/thread_checker_impl.cc - threading/thread_collision_warner.cc - threading/thread_id_name_manager.cc - threading/thread_local_posix.cc - threading/thread_local_storage_posix.cc - threading/thread_restrictions.cc - time.cc - time_posix.cc - tracked_objects.cc - utf_string_conversions.cc - utf_string_conversion_utils.cc - values.cc - vlog.cc - """, - 'libs' : 'pthread rt', - 'pc_libs' : 'glib-2.0', - }, - { - 'name' : 'glib', - 'sources' : """ - debug/trace_event_impl.cc - files/scoped_temp_dir.cc - message_pump_glib.cc - rand_util.cc - rand_util_posix.cc - """, - 'libs' : '', - 'pc_libs' : 'glib-2.0', - }, - { - 'name' : 'event', - 'sources' : """ - message_loop.cc - message_loop_proxy.cc - message_loop_proxy_impl.cc - message_pump_libevent.cc - pending_task.cc - run_loop.cc - task_runner.cc - thread_task_runner_handle.cc - threading/post_task_and_reply_impl.cc - threading/thread.cc - tracking_info.cc - """, - 'libs' : 'event base-glib-${bslot}', - 'pc_libs' : 'glib-2.0', - }, - { - 'name' : 'dl', - 'sources' : """ - native_library_posix.cc - """, - 'libs' : 'dl', - 'pc_libs' : '', - }, -] - -env = Environment() - -BASE_VER = os.environ.get('BASE_VER', '0') -PKG_CONFIG = os.environ.get('PKG_CONFIG', 'pkg-config') - -env.Append( - CPPPATH=['files'], - CCFLAGS=['-g'] -) -for key in Split('CC CXX AR RANLIB LD NM CFLAGS CCFLAGS'): - value = os.environ.get(key) - if value: - env[key] = Split(value) - -env['CCFLAGS'] += ['-fPIC', - '-fno-exceptions', - '-Wall', - '-Werror', - '-Wno-psabi', - '-DOS_CHROMEOS=1', - '-DTOOLKIT_VIEWS=1', - '-DUSE_AURA=1', - '-I..'] - -# Fix issue with scons not passing some vars through the environment. -for key in Split('PATH PKG_CONFIG SYSROOT'): - if os.environ.has_key(key): - env['ENV'][key] = os.environ[key] - -all_base_libs = [] -all_pc_libs = '' -all_libs = [] -all_scons_libs = [] - -# Build all the shared libraries. -for lib in base_libs: - pc_libs = lib['pc_libs'].replace('${bslot}', BASE_VER) - all_pc_libs += ' ' + pc_libs - - libs = Split(lib['libs'].replace('${bslot}', BASE_VER)) - all_libs += libs - - name = '%s-%s-%s' % (base_name, lib['name'], BASE_VER) - all_base_libs += [name] - corename = '%s-core-%s' % (base_name, BASE_VER) - # Automatically link the sub-libs against the main core lib. - # This is to keep from having to explicitly mention it in the - # table above (i.e. lazy). - if name != corename: - libs += [corename] - - e = env.Clone() - e.Append( - LIBS = Split(libs), - LIBPATH = ['.'], - LINKFLAGS = ['-Wl,--as-needed', '-Wl,-z,defs', - '-Wl,-soname,lib%s.so' % name], - ) - if pc_libs: - e.ParseConfig(PKG_CONFIG + ' --cflags --libs %s' % pc_libs) - all_scons_libs += [ e.SharedLibrary(name, Split(lib['sources'])) ] - - -# Build the random text files (pkg-config and linker script). - -def lib_list(libs): - return ' '.join(['-l' + l for l in libs]) - -subst_dict = { - '@BSLOT@' : BASE_VER, - '@PRIVATE_PC@' : all_pc_libs, - '@BASE_LIBS@' : lib_list(all_base_libs), - '@LIBS@' : lib_list(all_libs), -} -env = Environment(tools = ['textfile'], SUBST_DICT = subst_dict) - -env.Substfile('libchrome-%s.pc' % BASE_VER, - [Value(""" -prefix=/usr -includedir=${prefix}/include -bslot=@BSLOT@ - -Name: libchrome -Description: chrome base library -Version: ${bslot} -Requires: -Requires.private: glib-2.0 @PRIVATE_PC@ -Libs: -lbase-${bslot} -Libs.private: @BASE_LIBS@ @LIBS@ -Cflags: -I${includedir}/base-${bslot} -""")]) - -env.Substfile('libbase-%s.so' % BASE_VER, - [Value('GROUP ( AS_NEEDED ( @BASE_LIBS@ ) )')]) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/libchrome/files/base-125070-no-X.patch b/sdk_container/src/third_party/coreos-overlay/coreos-base/libchrome/files/base-125070-no-X.patch deleted file mode 100644 index ce84ff685d..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/libchrome/files/base-125070-no-X.patch +++ /dev/null @@ -1,15 +0,0 @@ -none of the consumers in our tree want a GUI message pump (gtk or X or anything -else), but rather just want a glib message pump. so change the UI define to go -straight to glib. this lets us avoid gtk/X completely in our packages. - ---- a/message_loop.cc -+++ b/message_loop.cc -@@ -153,7 +153,7 @@ MessageLoop::MessageLoop(Type type) - #define MESSAGE_PUMP_UI NULL - #define MESSAGE_PUMP_IO NULL - #elif defined(OS_POSIX) // POSIX but not MACOSX. --#define MESSAGE_PUMP_UI new base::MessagePumpForUI() -+#define MESSAGE_PUMP_UI new base::MessagePumpGlib() - #define MESSAGE_PUMP_IO new base::MessagePumpLibevent() - #else - #error Not implemented diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/libchrome/files/base-125070-x32.patch b/sdk_container/src/third_party/coreos-overlay/coreos-base/libchrome/files/base-125070-x32.patch deleted file mode 100644 index cc4318dfe7..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/libchrome/files/base-125070-x32.patch +++ /dev/null @@ -1,86 +0,0 @@ -OS_NACL defines this because it is really x32. but we can't use that -define with OS_CHROMEOS, so we have to check the compiler define. - -https://codereview.chromium.org/12180007/ - ---- a/atomicops.h -+++ b/atomicops.h -@@ -39,7 +39,7 @@ - #ifdef ARCH_CPU_64_BITS - // We need to be able to go between Atomic64 and AtomicWord implicitly. This - // means Atomic64 and AtomicWord should be the same type on 64-bit. --#if defined(OS_NACL) -+#if defined(OS_NACL) || defined(__ILP32__) - // NaCl's intptr_t is not actually 64-bits on 64-bit! - // http://code.google.com/p/nativeclient/issues/detail?id=1162 - typedef int64_t Atomic64; - -this is in upstream nspr already - -https://codereview.chromium.org/12186005/ - ---- a/third_party/nspr/prcpucfg_linux.h -+++ b/third_party/nspr/prcpucfg_linux.h -@@ -233,6 +233,53 @@ - - #elif defined(__x86_64__) - -+#ifdef __ILP32__ -+ -+#define IS_LITTLE_ENDIAN 1 -+#undef IS_BIG_ENDIAN -+ -+#define PR_BYTES_PER_BYTE 1 -+#define PR_BYTES_PER_SHORT 2 -+#define PR_BYTES_PER_INT 4 -+#define PR_BYTES_PER_INT64 8 -+#define PR_BYTES_PER_LONG 4 -+#define PR_BYTES_PER_FLOAT 4 -+#define PR_BYTES_PER_DOUBLE 8 -+#define PR_BYTES_PER_WORD 4 -+#define PR_BYTES_PER_DWORD 8 -+ -+#define PR_BITS_PER_BYTE 8 -+#define PR_BITS_PER_SHORT 16 -+#define PR_BITS_PER_INT 32 -+#define PR_BITS_PER_INT64 64 -+#define PR_BITS_PER_LONG 32 -+#define PR_BITS_PER_FLOAT 32 -+#define PR_BITS_PER_DOUBLE 64 -+#define PR_BITS_PER_WORD 32 -+ -+#define PR_BITS_PER_BYTE_LOG2 3 -+#define PR_BITS_PER_SHORT_LOG2 4 -+#define PR_BITS_PER_INT_LOG2 5 -+#define PR_BITS_PER_INT64_LOG2 6 -+#define PR_BITS_PER_LONG_LOG2 5 -+#define PR_BITS_PER_FLOAT_LOG2 5 -+#define PR_BITS_PER_DOUBLE_LOG2 6 -+#define PR_BITS_PER_WORD_LOG2 5 -+ -+#define PR_ALIGN_OF_SHORT 2 -+#define PR_ALIGN_OF_INT 4 -+#define PR_ALIGN_OF_LONG 4 -+#define PR_ALIGN_OF_INT64 4 -+#define PR_ALIGN_OF_FLOAT 4 -+#define PR_ALIGN_OF_DOUBLE 4 -+#define PR_ALIGN_OF_POINTER 4 -+#define PR_ALIGN_OF_WORD 4 -+ -+#define PR_BYTES_PER_WORD_LOG2 2 -+#define PR_BYTES_PER_DWORD_LOG2 3 -+ -+#else -+ - #define IS_LITTLE_ENDIAN 1 - #undef IS_BIG_ENDIAN - #define IS_64 -@@ -277,6 +324,8 @@ - #define PR_BYTES_PER_WORD_LOG2 3 - #define PR_BYTES_PER_DWORD_LOG2 3 - -+#endif -+ - #elif defined(__mc68000__) - - #undef IS_LITTLE_ENDIAN diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/libchrome/files/build_config.h-180609 b/sdk_container/src/third_party/coreos-overlay/coreos-base/libchrome/files/build_config.h-180609 deleted file mode 100644 index 462518d26d..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/libchrome/files/build_config.h-180609 +++ /dev/null @@ -1,154 +0,0 @@ -// Copyright (c) 2012 The Chromium 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 file adds defines about the platform we're currently building on. -// Operating System: -// OS_WIN / OS_MACOSX / OS_LINUX / OS_POSIX (MACOSX or LINUX) -// Compiler: -// COMPILER_MSVC / COMPILER_GCC -// Processor: -// ARCH_CPU_X86 / ARCH_CPU_X86_64 / ARCH_CPU_X86_FAMILY (X86 or X86_64) -// ARCH_CPU_32_BITS / ARCH_CPU_64_BITS - -#ifndef BUILD_BUILD_CONFIG_H_ -#define BUILD_BUILD_CONFIG_H_ - -#if defined(__APPLE__) -#include -#endif - -// A set of macros to use for platform detection. -#if defined(__APPLE__) -#define OS_MACOSX 1 -#if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE -#define OS_IOS 1 -#endif // defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE -#elif defined(ANDROID) -#define OS_ANDROID 1 -#elif defined(__native_client__) -#define OS_NACL 1 -#elif defined(__linux__) -#define OS_LINUX 1 -// Use TOOLKIT_GTK on linux if TOOLKIT_VIEWS isn't defined. -#if !defined(TOOLKIT_VIEWS) -#define TOOLKIT_GTK -#endif -#elif defined(_WIN32) -#define OS_WIN 1 -#define TOOLKIT_VIEWS 1 -#elif defined(__FreeBSD__) -#define OS_FREEBSD 1 -#define TOOLKIT_GTK -#elif defined(__OpenBSD__) -#define OS_OPENBSD 1 -#define TOOLKIT_GTK -#elif defined(__sun) -#define OS_SOLARIS 1 -#define TOOLKIT_GTK -#else -#error Please add support for your platform in build/build_config.h -#endif - -#if defined(USE_OPENSSL) && defined(USE_NSS) -#error Cannot use both OpenSSL and NSS -#endif - -// For access to standard BSD features, use OS_BSD instead of a -// more specific macro. -#if defined(OS_FREEBSD) || defined(OS_OPENBSD) -#define OS_BSD 1 -#endif - -// For access to standard POSIXish features, use OS_POSIX instead of a -// more specific macro. -#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_FREEBSD) || \ - defined(OS_OPENBSD) || defined(OS_SOLARIS) || defined(OS_ANDROID) || \ - defined(OS_NACL) -#define OS_POSIX 1 -#endif - -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && \ - !defined(OS_NACL) -#define USE_X11 1 // Use X for graphics. -#endif - -// Use tcmalloc -#if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(NO_TCMALLOC) -#define USE_TCMALLOC 1 -#endif - -// Compiler detection. -#if defined(__GNUC__) -#define COMPILER_GCC 1 -#elif defined(_MSC_VER) -#define COMPILER_MSVC 1 -#else -#error Please add support for your compiler in build/build_config.h -#endif - -// Processor architecture detection. For more info on what's defined, see: -// http://msdn.microsoft.com/en-us/library/b0084kay.aspx -// http://www.agner.org/optimize/calling_conventions.pdf -// or with gcc, run: "echo | gcc -E -dM -" -#if defined(_M_X64) || defined(__x86_64__) -#define ARCH_CPU_X86_FAMILY 1 -#define ARCH_CPU_X86_64 1 -#define ARCH_CPU_64_BITS 1 -#define ARCH_CPU_LITTLE_ENDIAN 1 -#elif defined(_M_IX86) || defined(__i386__) -#define ARCH_CPU_X86_FAMILY 1 -#define ARCH_CPU_X86 1 -#define ARCH_CPU_32_BITS 1 -#define ARCH_CPU_LITTLE_ENDIAN 1 -#elif defined(__ARMEL__) -#define ARCH_CPU_ARM_FAMILY 1 -#define ARCH_CPU_ARMEL 1 -#define ARCH_CPU_32_BITS 1 -#define ARCH_CPU_LITTLE_ENDIAN 1 -#elif defined(__pnacl__) -#define ARCH_CPU_32_BITS 1 -#elif defined(__MIPSEL__) -#define ARCH_CPU_MIPS_FAMILY 1 -#define ARCH_CPU_MIPSEL 1 -#define ARCH_CPU_32_BITS 1 -#define ARCH_CPU_LITTLE_ENDIAN 1 -#else -#error Please add support for your architecture in build/build_config.h -#endif - -// Type detection for wchar_t. -#if defined(OS_WIN) -#define WCHAR_T_IS_UTF16 -#elif defined(OS_POSIX) && defined(COMPILER_GCC) && \ - defined(__WCHAR_MAX__) && \ - (__WCHAR_MAX__ == 0x7fffffff || __WCHAR_MAX__ == 0xffffffff) -#define WCHAR_T_IS_UTF32 -#elif defined(OS_POSIX) && defined(COMPILER_GCC) && \ - defined(__WCHAR_MAX__) && \ - (__WCHAR_MAX__ == 0x7fff || __WCHAR_MAX__ == 0xffff) -// On Posix, we'll detect short wchar_t, but projects aren't guaranteed to -// compile in this mode (in particular, Chrome doesn't). This is intended for -// other projects using base who manage their own dependencies and make sure -// short wchar works for them. -#define WCHAR_T_IS_UTF16 -#else -#error Please add support for your compiler in build/build_config.h -#endif - -#if defined(__ARMEL__) && !defined(OS_IOS) -#define WCHAR_T_IS_UNSIGNED 1 -#elif defined(__MIPSEL__) -#define WCHAR_T_IS_UNSIGNED 0 -#endif - -#if defined(OS_ANDROID) -// The compiler thinks std::string::const_iterator and "const char*" are -// equivalent types. -#define STD_STRING_ITERATOR_IS_CHAR_POINTER -// The compiler thinks base::string16::const_iterator and "char16*" are -// equivalent types. -#define BASE_STRING16_ITERATOR_IS_CHAR16_POINTER -#endif - -#endif // BUILD_BUILD_CONFIG_H_ diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/libchrome/files/gtest_include_path_fixup.patch b/sdk_container/src/third_party/coreos-overlay/coreos-base/libchrome/files/gtest_include_path_fixup.patch deleted file mode 100644 index aa1d4b5788..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/libchrome/files/gtest_include_path_fixup.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur libchrome-55729-orig/files/base/gtest_prod_util.h libchrome-55729/files/base/gtest_prod_util.h ---- libchrome-55729-orig/files/base/gtest_prod_util.h 2010-08-11 13:51:24.000000000 -0700 -+++ libchrome-55729/files/base/gtest_prod_util.h 2010-08-11 14:08:20.000000000 -0700 -@@ -6,7 +6,7 @@ - #define BASE_GTEST_PROD_UTIL_H_ - #pragma once - --#include "testing/gtest/include/gtest/gtest_prod.h" -+#include "gtest/gtest_prod.h" - - // This is a wrapper for gtest's FRIEND_TEST macro that friends - // test with all possible prefixes. This is very helpful when changing the test diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/libchrome/files/readfiletostring_clearfirst.patch b/sdk_container/src/third_party/coreos-overlay/coreos-base/libchrome/files/readfiletostring_clearfirst.patch deleted file mode 100644 index 05a673a6cb..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/libchrome/files/readfiletostring_clearfirst.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/file_util.cc 2014-10-21 19:09:47.052101527 -0400 -+++ b/file_util.cc 2014-10-21 19:22:00.619134259 -0400 -@@ -152,6 +152,8 @@ - } - - bool ReadFileToString(const FilePath& path, std::string* contents) { -+ if (contents) -+ contents->clear(); - if (path.ReferencesParent()) - return false; - FILE* file = OpenFile(path, "rb"); diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/libchrome/libchrome-180609-r4.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/libchrome/libchrome-180609-r4.ebuild deleted file mode 120000 index 15f856517e..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/libchrome/libchrome-180609-r4.ebuild +++ /dev/null @@ -1 +0,0 @@ -libchrome-180609.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/libchrome/libchrome-180609.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/libchrome/libchrome-180609.ebuild deleted file mode 100644 index ffcbc8424e..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/libchrome/libchrome-180609.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright (c) 2013 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -# Note: the ${PV} should represent the overall svn rev number of the -# chromium tree that we're extracting from rather than the svn rev of -# the last change actually made to the base subdir. This way packages -# from other locations (like libchrome_crypto) can be coordinated. - -# XXX: This hits svn rev 180557 instead of rev 180609, but -# that is correct. See above note. - -EAPI="4" -CROS_WORKON_COMMIT="94b9b5d64fa557377ab1e3a5e3bd6cca7d0b73d8" -CROS_WORKON_PROJECT="chromium/src/base" -CROS_WORKON_GIT_SUFFIX="-${PV}" - -inherit cros-workon cros-debug toolchain-funcs scons-utils - -DESCRIPTION="Chrome base/ library extracted for use on Chrome OS" -HOMEPAGE="http://dev.chromium.org/chromium-os/packages/libchrome" -SRC_URI="" - -LICENSE="BSD" -SLOT="${PV}" -KEYWORDS="amd64 arm arm64 x86" -IUSE="cros_host" - -RDEPEND="dev-libs/glib - dev-libs/libevent" -DEPEND="${RDEPEND} - dev-cpp/gtest - cros_host? ( dev-util/scons )" - -src_prepare() { - ln -s "${S}" "${WORKDIR}/base" &> /dev/null - - mkdir -p "${WORKDIR}/build" - cp -p "${FILESDIR}/build_config.h-${SLOT}" "${WORKDIR}/build/build_config.h" || die - - cp -p "${FILESDIR}/SConstruct-${SLOT}" "${S}/SConstruct" || die - epatch "${FILESDIR}"/gtest_include_path_fixup.patch - - epatch "${FILESDIR}"/base-125070-no-X.patch - epatch "${FILESDIR}"/base-125070-x32.patch - epatch "${FILESDIR}"/readfiletostring_clearfirst.patch -} - -src_configure() { - tc-export CC CXX AR RANLIB LD NM PKG_CONFIG - cros-debug-add-NDEBUG - export CCFLAGS="$CFLAGS" - - # Fix builds with GCC 4.8 - if [[ $(gcc-major-version) -ge 4 && $(gcc-minor-version) -ge 8 ]]; then - CCFLAGS+=" -Wno-unused-local-typedefs" - fi - - mkdir -p third_party/libevent - echo '#include ' > third_party/libevent/event.h -} - -src_compile() { - BASE_VER=${SLOT} escons -k -} - -src_install() { - dolib.so libbase*-${SLOT}.so - - local d header_dirs=( - third_party/icu - third_party/nspr - third_party/valgrind - third_party/dynamic_annotations - . - debug - files - json - memory - metrics - posix - strings - synchronization - threading - ) - for d in "${header_dirs[@]}" ; do - insinto /usr/include/base-${SLOT}/base/${d} - doins ${d}/*.h - done - - insinto /usr/include/base-${SLOT}/build - doins "${WORKDIR}"/build/build_config.h - - insinto /usr/$(get_libdir)/pkgconfig - doins libchrome-${SLOT}.pc -} diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/libchrome/metadata.xml b/sdk_container/src/third_party/coreos-overlay/coreos-base/libchrome/metadata.xml deleted file mode 100644 index 097975e3ad..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/libchrome/metadata.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/cros-au.eclass b/sdk_container/src/third_party/coreos-overlay/eclass/cros-au.eclass deleted file mode 100644 index 75f52085cf..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/eclass/cros-au.eclass +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -# -# Original Author: The Chromium OS Authors -# Purpose: Library for handling packages that are part of Auto Update. -# - -inherit flag-o-matic - -# Some boards started out 32bit (user/kernel) and then migrated to 64bit -# (user/kernel). Since we need to auto-update (AU) from the 32bit to -# 64bit, and the old 32bit kernels can't execte 64bit code, we need to -# always build the AU code as 32bit. -# -# Setup the build env to create 32bit objects. -board_setup_32bit_au_env() -{ - [[ $# -eq 0 ]] || die "${FUNCNAME}: takes no arguments" - - __AU_OLD_ARCH=${ARCH} - __AU_OLD_ABI=${ABI} - __AU_OLD_LIBDIR_x86=${LIBDIR_x86} - export ARCH=x86 ABI=x86 LIBDIR_x86="lib" - __AU_OLD_CHOST=${CHOST} - export CHOST=i686-pc-linux-gnu - __AU_OLD_SYSROOT=${SYSROOT} - export SYSROOT=/usr/${CHOST} - append-ldflags -L"${__AU_OLD_SYSROOT}"/usr/lib - append-cxxflags -isystem "${__AU_OLD_SYSROOT}"/usr/include -} - -# undo what we did in the above function -board_teardown_32bit_au_env() -{ - [[ $# -eq 0 ]] || die "${FUNCNAME}: takes no arguments" - [ -z "${__AU_OLD_SYSROOT}" ] && \ - die "board_setup_32bit_au_env must be called first" - - filter-ldflags -L"${__AU_OLD_SYSROOT}"/usr/lib - filter-flags -isystem "${__AU_OLD_SYSROOT}"/usr/include - export SYSROOT=${__AU_OLD_SYSROOT} - export CHOST=${__AU_OLD_CHOST} - export LIBDIR_x86=${__AU_OLD_LIBDIR_x86} - export ABI=${__AU_OLD_ABI} - export ARCH=${__AU_OLD_ARCH} -} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.30.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.31.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.30.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.31.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild index d81dbb93cb..01d8a797c3 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild @@ -14,7 +14,7 @@ else KEYWORDS="amd64 arm arm64 x86" fi -inherit cros-workon cros-debug cros-au +inherit cros-workon cros-debug DESCRIPTION="CoreOS Bootengine" SRC_URI="" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/libbb/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-libs/libbb/Manifest deleted file mode 100644 index 505564766a..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-libs/libbb/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST busybox-1.19.0.tar.bz2 2168657 RMD160 07c8c313d8ed7edcf8f12fe805389c96bda3dae2 SHA1 70569f23751640d9ac7fc2aa49b29e6cd274be6d SHA256 19cf44a096d7796800780d6344c4cc5054dac9f50d1c9b7a5c506c4777f7620c diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/libbb/libbb-1.19.0.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-libs/libbb/libbb-1.19.0.ebuild deleted file mode 100644 index ca58e78caa..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-libs/libbb/libbb-1.19.0.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" -inherit toolchain-funcs flag-o-matic cros-au - -MY_P=busybox-${PV/_/-} -DESCRIPTION="library for busybox - libbb.a" -HOMEPAGE="http://www.busybox.net/" -SRC_URI="http://www.busybox.net/downloads/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm x86" -IUSE="32bit_au" - -S=${WORKDIR}/${MY_P} - -busybox_config_option() { - case $1 in - y) sed -i -e "s:.*\.*set:CONFIG_$2=y:g" .config;; - n) sed -i -e "s:CONFIG_$2=y:# CONFIG_$2 is not set:g" .config;; - *) use $1 \ - && busybox_config_option y $2 \ - || busybox_config_option n $2 - return 0 - ;; - esac - einfo $(grep "CONFIG_$2[= ]" .config || echo Could not find CONFIG_$2 ...) -} - -src_configure() { - emake allnoconfig > /dev/null - busybox_config_option y DD - busybox_config_option y RM - busybox_config_option y DD_IBS_OBS -} - -src_compile() { - use 32bit_au && board_setup_32bit_au_env - - tc-export CC AR RANLIB - emake CC="${CC}" AR="${AR}" RANLIB="${RANLIB}" libbb/lib.a - # Add the list of utils we need. Unused symbols will be stripped - cp libbb/lib.a libbb/libbb.a || die - $AR rc libbb/libbb.a coreutils/{dd,rm}.o || die -} - -src_install() { - dolib.a libbb/libbb.a - insinto /usr/include - doins include/libbb.h -} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/libbb/metadata.xml b/sdk_container/src/third_party/coreos-overlay/sys-libs/libbb/metadata.xml deleted file mode 100644 index 097975e3ad..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-libs/libbb/metadata.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - -