From 090b48ccffba73ef037e1a737697cbcfa523e565 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 16 Jul 2015 16:52:28 -0700 Subject: [PATCH] 4.1-stable patches added patches: tools-selftests-fix-clean-target-with-make-3.81.patch --- queue-4.1/series | 1 + ...ests-fix-clean-target-with-make-3.81.patch | 38 +++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 queue-4.1/tools-selftests-fix-clean-target-with-make-3.81.patch diff --git a/queue-4.1/series b/queue-4.1/series index 190b863c5e2..317d1bddc10 100644 --- a/queue-4.1/series +++ b/queue-4.1/series @@ -24,3 +24,4 @@ acpi-init-switch-over-platform-to-the-acpi-mode-later.patch acpi-pm-add-missing-pm_generic_complete-invocation.patch acpi-pnp-avoid-conflicting-resource-reservations.patch iio-accel-kxcjk-1013-add-the-kxcj9000-acpi-id.patch +tools-selftests-fix-clean-target-with-make-3.81.patch diff --git a/queue-4.1/tools-selftests-fix-clean-target-with-make-3.81.patch b/queue-4.1/tools-selftests-fix-clean-target-with-make-3.81.patch new file mode 100644 index 00000000000..95bdb625afe --- /dev/null +++ b/queue-4.1/tools-selftests-fix-clean-target-with-make-3.81.patch @@ -0,0 +1,38 @@ +From 60df4642a83546fa6ea8286f5094ce8c0906c3ec Mon Sep 17 00:00:00 2001 +From: Arnaldo Carvalho de Melo +Date: Thu, 14 May 2015 16:55:18 -0300 +Subject: tools selftests: Fix 'clean' target with make 3.81 + +From: Arnaldo Carvalho de Melo + +commit 60df4642a83546fa6ea8286f5094ce8c0906c3ec upstream. + +Make 3.81 doesn't have the 'undefine' command. Using undefine +to clear LDFLAGS fails when make version 3.81 is used. Fix it +to use override to clear LDFLAGS. + +Tested-by: Shuah Khan +Cc: David Ahern +Cc: Ingo Molnar +Cc: Michael Ellerman +Link: http://lkml.kernel.org/r/20150514151225.GH23588@kernel.org +Signed-off-by: Arnaldo Carvalho de Melo +Signed-off-by: Shuah Khan +Cc: Sudip Mukherjee +Signed-off-by: Greg Kroah-Hartman + +--- + tools/testing/selftests/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/tools/testing/selftests/Makefile ++++ b/tools/testing/selftests/Makefile +@@ -27,7 +27,7 @@ TARGETS_HOTPLUG += memory-hotplug + # Makefile to avoid test build failures when test + # Makefile doesn't have explicit build rules. + ifeq (1,$(MAKELEVEL)) +-undefine LDFLAGS ++override LDFLAGS = + override MAKEFLAGS = + endif + -- 2.47.3