update buildroot to 2017.02.11
This commit is contained in:
@@ -0,0 +1,43 @@
|
||||
From fe42d6f7b739e8d42811bf46bcccfafa728847a2 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Mathias=20De=20Mar=C3=A9?= <mathias.de_mare@nokia.com>
|
||||
Date: Mon, 19 Sep 2016 10:38:13 +0200
|
||||
Subject: [PATCH] Convert argument to '--sysroot' option to relative path
|
||||
|
||||
Previously, only the argument to '--sysroot=' was converted.
|
||||
This changeset adds support for '--sysroot'.
|
||||
|
||||
Signed-off-by: Brandon Maier <brandon.maier@rockwellcollins.com>
|
||||
Signed-off-by: Matt Weber <matthew.weber@rockwellcollins.com>
|
||||
---
|
||||
ccache.c | 15 +++++++++++++++
|
||||
1 file changed, 15 insertions(+)
|
||||
|
||||
diff --git a/ccache.c b/ccache.c
|
||||
index 8ffadcc..76139b9 100644
|
||||
--- a/ccache.c
|
||||
+++ b/ccache.c
|
||||
@@ -2407,6 +2407,21 @@ cc_process_args(struct args *args, struct args **preprocessor_args,
|
||||
free(option);
|
||||
continue;
|
||||
}
|
||||
+ // Alternate form of specifying sysroot without =
|
||||
+ if (str_eq(argv[i], "--sysroot")) {
|
||||
+ if (i == argc-1) {
|
||||
+ cc_log("Missing argument to %s", argv[i]);
|
||||
+ stats_update(STATS_ARGS);
|
||||
+ result = false;
|
||||
+ goto out;
|
||||
+ }
|
||||
+ args_add(stripped_args, argv[i]);
|
||||
+ char *relpath = make_relative_path(x_strdup(argv[i+1]));
|
||||
+ args_add(stripped_args, relpath);
|
||||
+ i++;
|
||||
+ free(relpath);
|
||||
+ continue;
|
||||
+ }
|
||||
if (str_startswith(argv[i], "-Wp,")) {
|
||||
if (str_eq(argv[i], "-Wp,-P")
|
||||
|| strstr(argv[i], ",-P,")
|
||||
--
|
||||
2.8.3
|
||||
|
||||
3
bsp/buildroot-2017.02.11/package/ccache/ccache.hash
Normal file
3
bsp/buildroot-2017.02.11/package/ccache/ccache.hash
Normal file
@@ -0,0 +1,3 @@
|
||||
# Verified key https://samba.org/ftp/ccache/ccache-3.3.4.tar.xz.asc - sha256 computed locally
|
||||
sha256 24f15bf389e38c41548c9c259532187774ec0cb9686c3497bbb75504c8dc404f ccache-3.3.4.tar.xz
|
||||
sha256 190576a6e938760ec8113523e6fd380141117303e90766cc4802e770422b30c6 ccache-3.3.5.tar.xz
|
||||
74
bsp/buildroot-2017.02.11/package/ccache/ccache.mk
Normal file
74
bsp/buildroot-2017.02.11/package/ccache/ccache.mk
Normal file
@@ -0,0 +1,74 @@
|
||||
################################################################################
|
||||
#
|
||||
# ccache
|
||||
#
|
||||
################################################################################
|
||||
|
||||
CCACHE_VERSION = 3.3.5
|
||||
CCACHE_SITE = https://www.samba.org/ftp/ccache
|
||||
CCACHE_SOURCE = ccache-$(CCACHE_VERSION).tar.xz
|
||||
CCACHE_LICENSE = GPLv3+, others
|
||||
CCACHE_LICENSE_FILES = LICENSE.txt GPL-3.0.txt
|
||||
|
||||
# Force ccache to use its internal zlib. The problem is that without
|
||||
# this, ccache would link against the zlib of the build system, but we
|
||||
# might build and install a different version of zlib in $(O)/host
|
||||
# afterwards, which ccache will pick up. This might break if there is
|
||||
# a version mismatch. A solution would be to add host-zlib has a
|
||||
# dependency of ccache, but it would require tuning the zlib .mk file
|
||||
# to use HOSTCC_NOCCACHE as the compiler. Instead, we take the easy
|
||||
# path: tell ccache to use its internal copy of zlib, so that ccache
|
||||
# has zero dependency besides the C library.
|
||||
HOST_CCACHE_CONF_OPTS += --with-bundled-zlib
|
||||
|
||||
# Patch host-ccache as follows:
|
||||
# - Use BR_CACHE_DIR instead of CCACHE_DIR, because CCACHE_DIR
|
||||
# is already used by autotargets for the ccache package.
|
||||
# BR_CACHE_DIR is exported by Makefile based on config option
|
||||
# BR2_CCACHE_DIR.
|
||||
# - Change hard-coded last-ditch default to match path in .config, to avoid
|
||||
# the need to specify BR_CACHE_DIR when invoking ccache directly.
|
||||
# CCache replaces "%s" with the home directory of the current user,
|
||||
# So rewrite BR_CACHE_DIR to take that into consideration for SDK purpose
|
||||
HOST_CCACHE_DEFAULT_CCACHE_DIR = $(patsubst $(HOME)/%,\%s/%,$(BR_CACHE_DIR))
|
||||
|
||||
define HOST_CCACHE_PATCH_CONFIGURATION
|
||||
sed -i 's,getenv("CCACHE_DIR"),getenv("BR_CACHE_DIR"),' $(@D)/ccache.c
|
||||
sed -i 's,"%s/.ccache","$(HOST_CCACHE_DEFAULT_CCACHE_DIR)",' $(@D)/conf.c
|
||||
endef
|
||||
|
||||
HOST_CCACHE_POST_PATCH_HOOKS += HOST_CCACHE_PATCH_CONFIGURATION
|
||||
|
||||
define HOST_CCACHE_MAKE_CACHE_DIR
|
||||
mkdir -p $(BR_CACHE_DIR)
|
||||
endef
|
||||
|
||||
HOST_CCACHE_POST_INSTALL_HOOKS += HOST_CCACHE_MAKE_CACHE_DIR
|
||||
|
||||
# Provide capability to do initial ccache setup (e.g. increase default size)
|
||||
BR_CCACHE_INITIAL_SETUP = $(call qstrip,$(BR2_CCACHE_INITIAL_SETUP))
|
||||
ifneq ($(BR_CCACHE_INITIAL_SETUP),)
|
||||
define HOST_CCACHE_DO_INITIAL_SETUP
|
||||
@$(call MESSAGE,"Applying initial settings")
|
||||
$(CCACHE) $(BR_CCACHE_INITIAL_SETUP)
|
||||
$(CCACHE) -s
|
||||
endef
|
||||
|
||||
HOST_CCACHE_POST_INSTALL_HOOKS += HOST_CCACHE_DO_INITIAL_SETUP
|
||||
endif
|
||||
|
||||
$(eval $(host-autotools-package))
|
||||
|
||||
ifeq ($(BR2_CCACHE),y)
|
||||
ccache-stats: host-ccache
|
||||
$(Q)$(CCACHE) -s
|
||||
|
||||
ccache-options: host-ccache
|
||||
ifeq ($(CCACHE_OPTIONS),)
|
||||
$(Q)echo "Usage: make ccache-options CCACHE_OPTIONS=\"opts\""
|
||||
$(Q)echo "where 'opts' corresponds to one or more valid ccache options" \
|
||||
"(see ccache help text below)"
|
||||
$(Q)echo
|
||||
endif
|
||||
$(Q)$(CCACHE) $(CCACHE_OPTIONS)
|
||||
endif
|
||||
Reference in New Issue
Block a user