From 7b8848f293b4d09322d2c675d646d2d87b76307e Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Sat, 19 Mar 2011 16:50:33 +0100 Subject: [PATCH] Fix compilation on Fedora 14 (make 3.82) --- patches.fixes/fixes-for-make-3.82.patch | 36 +++++++++++++++++++++++++ series.conf | 1 + 2 files changed, 37 insertions(+) create mode 100644 patches.fixes/fixes-for-make-3.82.patch diff --git a/patches.fixes/fixes-for-make-3.82.patch b/patches.fixes/fixes-for-make-3.82.patch new file mode 100644 index 0000000..e00e514 --- /dev/null +++ b/patches.fixes/fixes-for-make-3.82.patch @@ -0,0 +1,36 @@ +It doesn't like pattern and explicit rules to be on the same line, +and it seems to be more picky when matching file (or really directory) +names with different numbers of trailing slashes. + +Signed-off-by: Jan Beulich +Acked-by: Sam Ravnborg + +--- +firmware/Makefile | 2 +- +scripts/mkmakefile | 4 +++- +2 files changed, 4 insertions(+), 2 deletions(-) + +--- linux-2.6.36-rc1/firmware/Makefile ++++ 2.6.36-rc1-make-3.82-fixes/firmware/Makefile +@@ -142,7 +142,7 @@ fw-shipped-$(CONFIG_YAM) += yam/1200.bin + fw-shipped-all := $(fw-shipped-y) $(fw-shipped-m) $(fw-shipped-) + + # Directories which we _might_ need to create, so we have a rule for them. +-firmware-dirs := $(sort $(patsubst %,$(objtree)/$(obj)/%/,$(dir $(fw-external-y) $(fw-shipped-all)))) ++firmware-dirs := $(sort $(addprefix $(objtree)/$(obj)/,$(dir $(fw-external-y) $(fw-shipped-all)))) + + quiet_cmd_mkdir = MKDIR $(patsubst $(objtree)/%,%,$@) + cmd_mkdir = mkdir -p $@ +--- linux-2.6.36-rc1/scripts/mkmakefile ++++ 2.6.36-rc1-make-3.82-fixes/scripts/mkmakefile +@@ -44,7 +44,9 @@ all: + + Makefile:; + +-\$(all) %/: all ++\$(all): all + @: + ++%/: all ++ @: + EOF diff --git a/series.conf b/series.conf index 6794e82..d839581 100644 --- a/series.conf +++ b/series.conf @@ -856,3 +856,4 @@ patches.xen/pcifront-irq-not-evtchn.patch patches.qubes/nuke_balloon_minimum_target.patch + patches.fixes/fixes-for-make-3.82.patch