1c8fb911e6
- Update for latest mdadm-4.1+ patches, this is required by jsc#SLE-10078 and jsc#SLE-9348. Mostly the purpose is for latest Intel IMSM raid support. The following patches also include previous patches with new re-ordered prefix numbers. - Makefile: install mdadm_env.sh to /usr/lib/mdadm (bsc#1111960) 0000-Makefile-install-mdadm_env.sh-to-usr-lib-mdadm.patch - Assemble: keep MD_DISK_FAILFAST and MD_DISK_WRITEMOSTLY flag (jsc#SLE-10078, jsc#SLE-9348) 0001-Assemble-keep-MD_DISK_FAILFAST-and-MD_DISK_WRITEMOST.patch - Document PART-POLICY lines (jsc#SLE-10078, jsc#SLE-9348) 0002-Document-PART-POLICY-lines.patc - policy: support devices with multiple paths. (jsc#SLE-10078, jsc#SLE-9348) 0003-policy-support-devices-with-multiple-paths.patch - mdcheck: add systemd unit files to run mdcheck. (bsc#1115407) 0004-mdcheck-add-systemd-unit-files-to-run-mdcheck.patch - Monitor: add system timer to run --oneshot periodically (bsc#1115407) 0005-Monitor-add-system-timer-to-run-oneshot-periodically.patch - imsm: update metadata correctly while raid10 double (jsc#SLE-10078, jsc#SLE-9348) 0006-imsm-update-metadata-correctly-while-raid10-double-d.patch - Assemble: mask FAILFAST and WRITEMOSTLY flags when finding (jsc#SLE-10078, jsc#SLE-9348) 0007-Assemble-mask-FAILFAST-and-WRITEMOSTLY-flags-when-fi.patch - Grow: avoid overflow in compute_backup_blocks() (jsc#SLE-10078, jsc#SLE-9348) 0008-Grow-avoid-overflow-in-compute_backup_blocks.patch - Grow: report correct new chunk size. (jsc#SLE-10078, jsc#SLE-9348) 0009-Grow-report-correct-new-chunk-size.patch OBS-URL: https://build.opensuse.org/request/show/781064 OBS-URL: https://build.opensuse.org/package/show/Base:System/mdadm?expand=0&rev=181
41 lines
1.3 KiB
Diff
41 lines
1.3 KiB
Diff
From aced6fc9542077a69b00d05bc9cd66c12fc34950 Mon Sep 17 00:00:00 2001
|
|
From: dann frazier <dann.frazier@canonical.com>
|
|
Date: Mon, 9 Dec 2019 13:54:13 -0700
|
|
Subject: [PATCH] Respect $(CROSS_COMPILE) when $(CC) is the default
|
|
Git-commit: aced6fc9542077a69b00d05bc9cd66c12fc34950
|
|
Patch-mainline: mdadm-4.1+
|
|
References: jsc#SLE-10078, jsc#SLE-9348
|
|
|
|
Commit 1180ed5 told make to only respect $(CROSS_COMPILE) when $(CC)
|
|
was unset. But that will never be the case, as make provides
|
|
a default value for $(CC). Change this logic to respect $(CROSS_COMPILE)
|
|
when $(CC) is the default. Patch originally by Helmet Grohne.
|
|
|
|
Fixes: 1180ed5 ("Makefile: make the CC definition conditional")
|
|
Signed-off-by: dann frazier <dann.frazier@canonical.com>
|
|
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
|
|
Signed-off-by: Coly Li <colyli@suse.de>
|
|
|
|
---
|
|
Makefile | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/Makefile b/Makefile
|
|
index dfe00b0..a33319a 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -46,7 +46,9 @@ ifdef COVERITY
|
|
COVERITY_FLAGS=-include coverity-gcc-hack.h
|
|
endif
|
|
|
|
-CC ?= $(CROSS_COMPILE)gcc
|
|
+ifeq ($(origin CC),default)
|
|
+CC := $(CROSS_COMPILE)gcc
|
|
+endif
|
|
CXFLAGS ?= -ggdb
|
|
CWFLAGS = -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter
|
|
ifdef WARN_UNUSED
|
|
--
|
|
2.25.0
|
|
|