Gitiles
Code Review Sign In
gerrit.openbmc.org / stefanberger / openbmc / d7bf8c17eca8f8c89898a7794462c773c449e983 / . / import-layers / meta-virtualization / recipes-containers / criu / files / 0001-criu-Fix-toolchain-hardcode.patch
blob: dc5b897742a42c379814822b86095aecb00707e0 [file] [log] [blame]
Brad Bishopd7bf8c12018-02-25 22:55:05 -0500[diff] [blame^]1From af679853a45fe63f680c99e70416c8ac620d23b8 Mon Sep 17 00:00:00 2001
2From: Mark Asselstine <mark.asselstine@windriver.com>
3Date: Fri, 8 Sep 2017 15:02:14 -0400
Patrick Williamse69d2352017-02-23 20:56:04 -0600[diff] [blame]4Subject: [PATCH] criu: Fix toolchain hardcode
Patrick Williamsd849ec72016-08-17 14:59:38 -0500[diff] [blame]5
6Replace ":=" to "?=" so that the toolchain used by bitbake build system will
7be taken.
8
9Signed-off-by: Yang Shi <yang.shi@windriver.com>
Patrick Williamse69d2352017-02-23 20:56:04 -0600[diff] [blame]10Signed-off-by: Jianchuan Wang <jianchuan.wang@windriver.com>
Brad Bishopd7bf8c12018-02-25 22:55:05 -0500[diff] [blame^]11Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Patrick Williamsd849ec72016-08-17 14:59:38 -0500[diff] [blame]12---
Patrick Williamse69d2352017-02-23 20:56:04 -0600[diff] [blame]13 Makefile | 2 +-
Patrick Williamse69d2352017-02-23 20:56:04 -0600[diff] [blame]14 scripts/nmk/scripts/include.mk | 2 +-
15 scripts/nmk/scripts/tools.mk | 40 ++++++++++++++++++++--------------------
Brad Bishopd7bf8c12018-02-25 22:55:05 -0500[diff] [blame^]16 3 files changed, 22 insertions(+), 22 deletions(-)
Patrick Williamsd849ec72016-08-17 14:59:38 -0500[diff] [blame]17
18diff --git a/Makefile b/Makefile
Brad Bishopd7bf8c12018-02-25 22:55:05 -0500[diff] [blame^]19index f2583a2..d7f51e5 100644
Patrick Williamsd849ec72016-08-17 14:59:38 -0500[diff] [blame]20--- a/Makefile
21+++ b/Makefile
Brad Bishopd7bf8c12018-02-25 22:55:05 -0500[diff] [blame^]22@@ -17,7 +17,7 @@ ifeq ($(origin HOSTCFLAGS), undefined)
23 HOSTCFLAGS := $(CFLAGS) $(USERCFLAGS)
24 endif
Patrick Williamse69d2352017-02-23 20:56:04 -0600[diff] [blame]25
26-UNAME-M := $(shell uname -m)
27+UNAME-M ?= $(shell uname -m)
Patrick Williamse69d2352017-02-23 20:56:04 -0600[diff] [blame]28
Patrick Williamse69d2352017-02-23 20:56:04 -0600[diff] [blame]29 #
Brad Bishopd7bf8c12018-02-25 22:55:05 -0500[diff] [blame^]30 # Supported Architectures
Patrick Williamse69d2352017-02-23 20:56:04 -0600[diff] [blame]31diff --git a/scripts/nmk/scripts/include.mk b/scripts/nmk/scripts/include.mk
Brad Bishopd7bf8c12018-02-25 22:55:05 -0500[diff] [blame^]32index 04ccb3a..0d63bc7 100644
Patrick Williamse69d2352017-02-23 20:56:04 -0600[diff] [blame]33--- a/scripts/nmk/scripts/include.mk
34+++ b/scripts/nmk/scripts/include.mk
35@@ -20,7 +20,7 @@ SUBARCH := $(shell uname -m | sed \
Brad Bishopd7bf8c12018-02-25 22:55:05 -0500[diff] [blame^]36 -e s/aarch64.*/aarch64/)
Patrick Williamse69d2352017-02-23 20:56:04 -0600[diff] [blame]37
38 ARCH ?= $(SUBARCH)
39-SRCARCH := $(ARCH)
40+SRCARCH ?= $(ARCH)
41
42 export SUBARCH ARCH SRCARCH
43
44diff --git a/scripts/nmk/scripts/tools.mk b/scripts/nmk/scripts/tools.mk
Brad Bishopd7bf8c12018-02-25 22:55:05 -0500[diff] [blame^]45index 56dba84..1698821 100644
Patrick Williamse69d2352017-02-23 20:56:04 -0600[diff] [blame]46--- a/scripts/nmk/scripts/tools.mk
47+++ b/scripts/nmk/scripts/tools.mk
Brad Bishopd7bf8c12018-02-25 22:55:05 -0500[diff] [blame^]48@@ -2,30 +2,30 @@ ifndef ____nmk_defined__tools
Patrick Williamse69d2352017-02-23 20:56:04 -0600[diff] [blame]49
50 #
51 # System tools shorthands
Patrick Williamsd849ec72016-08-17 14:59:38 -0500[diff] [blame]52-RM := rm -f
Brad Bishopd7bf8c12018-02-25 22:55:05 -0500[diff] [blame^]53+RM ?= rm -f
54 HOSTLD ?= ld
55-LD := $(CROSS_COMPILE)$(HOSTLD)
56+LD ?= $(CROSS_COMPILE)$(HOSTLD)
57 HOSTCC ?= gcc
58-CC := $(CROSS_COMPILE)$(HOSTCC)
Patrick Williamse69d2352017-02-23 20:56:04 -0600[diff] [blame]59-CPP := $(CC) -E
60-AS := $(CROSS_COMPILE)as
61-AR := $(CROSS_COMPILE)ar
62-STRIP := $(CROSS_COMPILE)strip
Patrick Williamsd849ec72016-08-17 14:59:38 -0500[diff] [blame]63-OBJCOPY := $(CROSS_COMPILE)objcopy
Patrick Williamse69d2352017-02-23 20:56:04 -0600[diff] [blame]64-OBJDUMP := $(CROSS_COMPILE)objdump
65-NM := $(CROSS_COMPILE)nm
66-MAKE := make
67-MKDIR := mkdir -p
68-AWK := awk
69-PERL := perl
70-PYTHON := python
71-FIND := find
72-SH := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
Brad Bishopd7bf8c12018-02-25 22:55:05 -0500[diff] [blame^]73+CC ?= $(CROSS_COMPILE)$(HOSTCC)
Patrick Williamse69d2352017-02-23 20:56:04 -0600[diff] [blame]74+CPP ?= $(CC) -E
75+AS ?= $(CROSS_COMPILE)as
76+AR ?= $(CROSS_COMPILE)ar
77+STRIP ?= $(CROSS_COMPILE)strip
Patrick Williamsd849ec72016-08-17 14:59:38 -0500[diff] [blame]78+OBJCOPY ?= $(CROSS_COMPILE)objcopy
Patrick Williamse69d2352017-02-23 20:56:04 -0600[diff] [blame]79+OBJDUMP ?= $(CROSS_COMPILE)objdump
80+NM ?= $(CROSS_COMPILE)nm
81+MAKE ?= make
82+MKDIR ?= mkdir -p
83+AWK ?= awk
84+PERL ?= perl
85+PYTHON ?= python
86+FIND ?= find
87+SH ?= $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
88 else if [ -x /bin/bash ]; then echo /bin/bash; \
89 else echo sh; fi ; fi)
90-CSCOPE := cscope
91-ETAGS := etags
92-CTAGS := ctags
93+CSCOPE ?= cscope
94+ETAGS ?= etags
95+CTAGS ?= ctags
Patrick Williamsd849ec72016-08-17 14:59:38 -0500[diff] [blame]96
Brad Bishopd7bf8c12018-02-25 22:55:05 -0500[diff] [blame^]97 export RM HOSTLD LD HOSTCC CC CPP AS AR STRIP OBJCOPY OBJDUMP
Patrick Williamse69d2352017-02-23 20:56:04 -0600[diff] [blame]98 export NM SH MAKE MKDIR AWK PERL PYTHON SH CSCOPE
Patrick Williamsd849ec72016-08-17 14:59:38 -0500[diff] [blame]99--
Brad Bishopd7bf8c12018-02-25 22:55:05 -0500[diff] [blame^]1002.7.4
Patrick Williamsd849ec72016-08-17 14:59:38 -0500[diff] [blame]101