wok annotate linux/stuff/linux-diff-2.6.29.3.u @ rev 3701
Upgrade: freeglut (2.4.0 to 2.6.0-rc1)
| author | Matthew Sheets <rcx@zoominternet.net> |
|---|---|
| date | Fri Jul 17 12:22:07 2009 +0000 (2009-07-17) |
| parents | |
| children |
| rev | line source |
|---|---|
| pascal@2990 | 1 --- linux-2.6.29.3/arch/x86/vdso/Makefile |
| pascal@2990 | 2 +++ linux-2.6.29.3/arch/x86/vdso/Makefile |
| pascal@2990 | 3 @@ -104,10 +104,12 @@ |
| pascal@2990 | 4 $(foreach H,$(filter-out FORCE,$^),\ |
| pascal@2990 | 5 if grep -q VDSO32_SYSENTER_RETURN $H; \ |
| pascal@2990 | 6 then diff -u $(@D)/.tmp_$(@F) $H; \ |
| pascal@2990 | 7 - else sed /VDSO32_SYSENTER_RETURN/d $(@D)/.tmp_$(@F) | \ |
| pascal@2990 | 8 - diff -u - $H; fi &&) : ;\ |
| pascal@2990 | 9 + else sed /VDSO32_SYSENTER_RETURN/d $(@D)/.tmp_$(@F) > \ |
| pascal@2990 | 10 + $(@D)/.tmp_$(@F).$$ ; \ |
| pascal@2990 | 11 + diff -u $(@D)/.tmp_$(@F).$$ $H; fi &&) : ;\ |
| pascal@2990 | 12 then mv -f $(@D)/.tmp_$(@F) $@; \ |
| pascal@2990 | 13 - else rm -f $(@D)/.tmp_$(@F); exit 1; \ |
| pascal@2990 | 14 + else rm -f $(@D)/.tmp_$(@F)*; exit 1; \ |
| pascal@2990 | 15 + rm -f $(@D)/.tmp_$(@F)*; \ |
| pascal@2990 | 16 fi |
| pascal@2990 | 17 endef |
| pascal@2990 | 18 |