On Feb 3, 2008, at 2:56 PM, Robert DuToit wrote:
Hi Mike,
If I replace the missing patch code for flags.diff in compat.c for
instance:
nt uid_ndx, gid_ndx, crtimes_ndx, acls_ndx, xattrs_ndx, unsort_ndx;
adding ... fileflags_ndx
so then
nt uid_ndx, gid_ndx, fileflags_ndx , crtimes_ndx, acls_ndx,
xattrs_ndx, unsort_ndx;
And I do this for all the .rej files
should it then compile and make will work?
Yes
I tried that though and then make:
robert-dutoits-powerbook-g4-15:rsync-3.0.0pre8 astrid$ make
Failed to create rounding.h!
make: *** [rounding.h] Error 1
robert-dutoits-powerbook-g4-15:rsync-3.0.0pre8 astrid$
rounding.h should get created when you run 'make' -- verify that your
source directory contains the "rounding.c" file or get it from the
latest nightly. From Makefile:
rounding.h: rounding.c rsync.h
@for r in 0 1 3; do \
if $(CC) $(CFLAGS) $(LDFLAGS) -o rounding -DEXTRA_ROUNDING=$$r -
I. $(srcdir)/rounding.c >/dev/null 2>&1; then \
echo "#define EXTRA_ROUNDING $$r" >rounding.h; \
if test -f "$$HOME/build_farm/build_test.fns"; then \
echo "EXTRA_ROUNDING is $$r" >&2; \
fi; \
break; \
fi; \
done
@rm -f rounding
@if test -f rounding.h; then : ; else \
echo "Failed to create rounding.h!"; \
exit 1; \
fi
Mike
Sorry for my continued ignorance with this- am just trying to get
crtimes and flags patches to work together in rsync 3...
Thanks, Rob D
On Feb 3, 2008, at 2:31 PM, Mike Bombich wrote:
I think the issue is that the flags patch and the crtimes patch are
often trying to patch the same lines. For example, line 65-ish in
compat.c:
flags.diff:
/* These index values are for the file-list's extra-attribute
array. */
- int uid_ndx, gid_ndx, acls_ndx, xattrs_ndx, unsort_ndx;
+ int uid_ndx, gid_ndx, fileflags_ndx, acls_ndx, xattrs_ndx,
unsort_ndx;
crtimes.diff:
/* These index values are for the file-list's extra-attribute
array. */
-int uid_ndx, gid_ndx, acls_ndx, xattrs_ndx, unsort_ndx;
+int uid_ndx, gid_ndx, crtimes_ndx, acls_ndx, xattrs_ndx, unsort_ndx;
The first patch will succeed, the second will fail.
Mike
On Feb 3, 2008, at 1:20 AM, Wayne Davison wrote:
On Sat, Feb 02, 2008 at 09:38:20PM -0500, Robert DuToit wrote:
I tried the crtimes patch and it compiles and works but when I
tried
to add the flags patch too I came up with this make error.
You apparently missed the patch errors before that. You need to
resolve
all the failed hunks from the second patch before trying to run
make.
Look for the *.rej files.
..wayne..
--
To unsubscribe or change options: https://lists.samba.org/mailman/listinfo/rsync
Before posting, read: http://www.catb.org/~esr/faqs/smart-questions.html
--
To unsubscribe or change options: https://lists.samba.org/mailman/listinfo/rsync
Before posting, read: http://www.catb.org/~esr/faqs/smart-questions.html
--
To unsubscribe or change options: https://lists.samba.org/mailman/listinfo/rsync
Before posting, read: http://www.catb.org/~esr/faqs/smart-questions.html
--
To unsubscribe or change options: https://lists.samba.org/mailman/listinfo/rsync
Before posting, read: http://www.catb.org/~esr/faqs/smart-questions.html
