diff --git a/procps-3.2.8-glibc-2.6.1.dif b/procps-3.2.8-glibc-2.6.1.dif index 7a550b8..f7f4165 100644 --- a/procps-3.2.8-glibc-2.6.1.dif +++ b/procps-3.2.8-glibc-2.6.1.dif @@ -106,3 +106,13 @@ free(tmpname); free(outname); return rc; +--- w.c ++++ w.c 2010-10-29 09:56:22.936426251 +0000 +@@ -15,6 +15,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/procps-3.2.8.dif b/procps-3.2.8.dif index 6805347..8cdf360 100644 --- a/procps-3.2.8.dif +++ b/procps-3.2.8.dif @@ -9,6 +9,15 @@ ALL_LDFLAGS := $(PKG_LDFLAGS) $(LDFLAGS) ############ Add some extra flags if gcc allows +@@ -250,7 +250,7 @@ pmap w uptime tload free sysctl vmstat u + slabtop top: % : %.o $(LIBPROC) + $(CC) $(ALL_CFLAGS) $^ $(ALL_LDFLAGS) -o $@ $(CURSES) + +-watch: % : %.o ++watch: % : %.o $(LIBPROC) + $(CC) $(ALL_CFLAGS) $^ $(ALL_LDFLAGS) -o $@ $(CURSES) + + ############ progX --> progY --- ps/module.mk +++ ps/module.mk 2010-10-04 16:46:47.668425720 +0000 @@ -20,11 +20,11 @@ PS_X := COPYING HACKING TRANSLATION comm diff --git a/procps.changes b/procps.changes index 101c236..dd0f2ef 100644 --- a/procps.changes +++ b/procps.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Oct 29 12:17:40 CEST 2010 - werner@suse.de + +- Fix race in parallel make + ------------------------------------------------------------------- Fri Oct 29 11:47:52 CEST 2010 - werner@suse.de