wok diff linux-libre/stuff/linux-libre-diff-2.6.37-gnu.u @ rev 15319
icewm: add libfontconfig
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Fri Sep 27 17:59:45 2013 +0000 (2013-09-27) |
parents | |
children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/linux-libre/stuff/linux-libre-diff-2.6.37-gnu.u Fri Sep 27 17:59:45 2013 +0000 1.3 @@ -0,0 +1,40 @@ 1.4 +--- linux-2.6.30.6/arch/x86/vdso/Makefile 1.5 ++++ linux-2.6.30.6/arch/x86/vdso/Makefile 1.6 +@@ -104,10 +104,12 @@ 1.7 + $(foreach H,$(filter-out FORCE,$^),\ 1.8 + if grep -q VDSO32_SYSENTER_RETURN $H; \ 1.9 + then diff -u $(@D)/.tmp_$(@F) $H; \ 1.10 +- else sed /VDSO32_SYSENTER_RETURN/d $(@D)/.tmp_$(@F) | \ 1.11 +- diff -u - $H; fi &&) : ;\ 1.12 ++ else sed /VDSO32_SYSENTER_RETURN/d $(@D)/.tmp_$(@F) > \ 1.13 ++ $(@D)/.tmp_$(@F).$$ ; \ 1.14 ++ diff -u $(@D)/.tmp_$(@F).$$ $H; fi &&) : ;\ 1.15 + then mv -f $(@D)/.tmp_$(@F) $@; \ 1.16 +- else rm -f $(@D)/.tmp_$(@F); exit 1; \ 1.17 ++ else rm -f $(@D)/.tmp_$(@F)*; exit 1; \ 1.18 ++ rm -f $(@D)/.tmp_$(@F)*; \ 1.19 + fi 1.20 + endef 1.21 + 1.22 + 1.23 +--- linux-2.6.34/scripts/Makefile.lib 1.24 ++++ linux-2.6.34/scripts/Makefile.lib 1.25 +@@ -204,7 +204,8 @@ 1.26 + # --------------------------------------------------------------------------- 1.27 + 1.28 + quiet_cmd_gzip = GZIP $@ 1.29 +-cmd_gzip = (cat $(filter-out FORCE,$^) | gzip -f -9 > $@) || \ 1.30 ++cmd_gzip = (cat $(filter-out FORCE,$^) | gzip -f -9 > $@) && \ 1.31 ++ ( which advdef > /dev/null && advdef -z $@ ; true ) || \ 1.32 + (rm -f $@ ; false) 1.33 + 1.34 + 1.35 +@@ -238,7 +239,7 @@ 1.36 + 1.37 + quiet_cmd_lzma = LZMA $@ 1.38 + cmd_lzma = (cat $(filter-out FORCE,$^) | \ 1.39 +- lzma -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \ 1.40 ++ lzma e -si -so && $(call size_append, $(filter-out FORCE,$^))) > $@ || \ 1.41 + (rm -f $@ ; false) 1.42 + 1.43 + quiet_cmd_lzo = LZO $@