From 66b2a6b33bf8f9f5b9fc28f6cf3c9c4a59a7bd17 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Sat, 6 Dec 2014 18:32:35 -0800 Subject: [PATCH 1/2] hard-host-depends: remove a couple unused graphic utilities --- ...0.1-r169.ebuild => hard-host-depends-0.0.1-r170.ebuild} | 0 .../hard-host-depends/hard-host-depends-0.0.1.ebuild | 7 ------- 2 files changed, 7 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/{hard-host-depends-0.0.1-r169.ebuild => hard-host-depends-0.0.1-r170.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r169.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r170.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r169.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r170.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 36be432d90..90f0599f19 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 @@ -69,7 +69,6 @@ RDEPEND="${RDEPEND} dev-python/ws4py sys-devel/bc dev-util/cmake - dev-util/gob dev-util/gdbus-codegen dev-util/gperf >=dev-util/gtk-doc-am-1.13 @@ -169,12 +168,6 @@ RDEPEND="${RDEPEND} dev-python/pyyaml " -# Tools for working with compiler generated profile information -# (such as coverage analysis in common.mk) -RDEPEND="${RDEPEND} - dev-util/lcov - " - # Host dependencies for building ISOs RDEPEND="${RDEPEND} virtual/cdrtools From 594933247d401646779adc278fa19f4184f8b2d3 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Sat, 6 Dec 2014 18:34:12 -0800 Subject: [PATCH 2/2] config: fix cross-compiled cmake build The upstream cmake eclass has started properly building cmake in cross-compiler mode so it doesn't attempt to run native code. Without those checks the test results need to be defined statically. --- .../coreos-overlay/coreos/config/cross_compile_config.cmake | 4 ++++ .../coreos-overlay/coreos/config/env/dev-util/cmake | 3 +++ 2 files changed, 7 insertions(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos/config/cross_compile_config.cmake create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos/config/env/dev-util/cmake diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/config/cross_compile_config.cmake b/sdk_container/src/third_party/coreos-overlay/coreos/config/cross_compile_config.cmake new file mode 100644 index 0000000000..af83a5cb1e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos/config/cross_compile_config.cmake @@ -0,0 +1,4 @@ +# Fix up cross compiling CMake + +SET(KWSYS_LFS_WORKS "1" CACHE STRING "" FORCE) +SET(KWSYS_CHAR_IS_SIGNED "1" CACHE STRING "" FORCE) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/config/env/dev-util/cmake b/sdk_container/src/third_party/coreos-overlay/coreos/config/env/dev-util/cmake new file mode 100644 index 0000000000..f84b7288d2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos/config/env/dev-util/cmake @@ -0,0 +1,3 @@ +if [[ $(cros_target) != "cros_host" ]] ; then + CMAKE_EXTRA_CACHE_FILE="${CROS_ADDONS_TREE}/config/cross_compile_config.cmake" +fi