wok-current annotate linux/stuff/linux-diff-2.6.25.5.u @ rev 1087
Remove xorg dependancy loop
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Wed Jul 16 16:20:36 2008 +0000 (2008-07-16) |
parents | |
children |
rev | line source |
---|---|
pascal@886 | 1 --- linux-2.6.25.5/arch/x86/vdso/Makefile |
pascal@886 | 2 +++ linux-2.6.25.5/arch/x86/vdso/Makefile |
pascal@886 | 3 @@ -103,10 +103,12 @@ |
pascal@886 | 4 $(foreach H,$(filter-out FORCE,$^),\ |
pascal@886 | 5 if grep -q VDSO32_SYSENTER_RETURN $H; \ |
pascal@886 | 6 then diff -u $(@D)/.tmp_$(@F) $H; \ |
pascal@886 | 7 - else sed /VDSO32_SYSENTER_RETURN/d $(@D)/.tmp_$(@F) | \ |
pascal@886 | 8 - diff -u - $H; fi &&) : ;\ |
pascal@886 | 9 + else sed /VDSO32_SYSENTER_RETURN/d $(@D)/.tmp_$(@F) > \ |
pascal@886 | 10 + $(@D)/.tmp_$(@F).$$ ; \ |
pascal@886 | 11 + diff -u $(@D)/.tmp_$(@F).$$ $H; fi &&) : ;\ |
pascal@886 | 12 then mv -f $(@D)/.tmp_$(@F) $@; \ |
pascal@886 | 13 - else rm -f $(@D)/.tmp_$(@F); exit 1; \ |
pascal@886 | 14 + else rm -f $(@D)/.tmp_$(@F)*; exit 1; \ |
pascal@886 | 15 + rm -f $(@D)/.tmp_$(@F)*; \ |
pascal@886 | 16 fi |
pascal@886 | 17 endef |
pascal@886 | 18 |