This is the mail archive of the
cygwin-apps@cygwin.com
mailing list for the Cygwin project.
Re: Ready for test coreutils-5.2.0-1 [again]
- From: Bas van Gompel <cygwin-apps dot buzz at bavag dot tmfweb dot nl>
- To: cygwin-apps at cygwin dot com
- Date: Sat, 13 Mar 2004 18:34:10 +0100 (MET)
- Subject: Re: Ready for test coreutils-5.2.0-1 [again]
- Organisation: Ehm...
- Reply-to: <cygwin-apps at cygwin dot com>
Op Fri, 12 Mar 2004 16:45:22 -0500
schreef Mark Blackburn <marklist at fangorn.ca>
in <40522F72.5040408@fangorn.ca>
[...]
Hello,
following patch does allow the 'check' target to be built.
It:
*) removes $(EXEEXT) where needed (this should probably go upstream...)
*) allows checking to continue after errors
To use it the test_rule in the build-script has to be set to 'check'.
(there also is a target check-root...)
Apply the patch with:
patch coreutils-5.2.0-1.patch<the_patch
hth,
Buzz.
<the_patch>
--- coreutils-5.2.0-1.patch.orig 2004-03-13 08:51:56.000000000 -0500
+++ coreutils-5.2.0-1.patch 2004-03-13 10:02:16.000000000 -0500
@@ -320,9 +320,73 @@
+the coreutils. "
+category: Base
+requires: cygwin libiconv2 libintl2
+diff -urN -x .build -x .inst -x .sinst coreutils-5.2.0-orig/Makefile.am coreutils-5.2.0/Makefile.am
+--- coreutils-5.2.0-orig/Makefile.am 2004-02-14 18:42:38.000000000 -0500
++++ coreutils-5.2.0/Makefile.am 2004-03-12 18:31:02.000000000 -0500
+@@ -21,7 +21,7 @@
+
+ # Some tests always need root privileges, others need them only sometimes.
+ check-root:
+- cd tests && $(MAKE) $@
++ -cd tests && $(MAKE) $@
+
+ dist-hook:
+ test -x $(srcdir)/config/install-sh
+diff -urN -x .build -x .inst -x .sinst coreutils-5.2.0-orig/Makefile.in coreutils-5.2.0/Makefile.in
+--- coreutils-5.2.0-orig/Makefile.in 2004-02-14 18:42:44.000000000 -0500
++++ coreutils-5.2.0/Makefile.in 2004-03-13 09:55:16.000000000 -0500
+@@ -384,7 +384,14 @@
+ else \
+ local_target="$$target"; \
+ fi; \
+- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
++ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target ; \
++ s=$$? ; if \
++ test x"$$target" = xcheck ; then true ; \
++ elif test $$s = 0 ; then \
++ true ; \
++ else \
++ false ; \
++ fi ) \
+ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+@@ -733,7 +740,7 @@
+
+ # Some tests always need root privileges, others need them only sometimes.
+ check-root:
+- cd tests && $(MAKE) $@
++ -cd tests && $(MAKE) $@
+
+ dist-hook:
+ test -x $(srcdir)/config/install-sh
+diff -urN -x .build -x .inst -x .sinst coreutils-5.2.0-orig/man/Makefile.am coreutils-5.2.0/man/Makefile.am
+--- coreutils-5.2.0-orig/man/Makefile.am 2004-01-23 10:54:24.000000000 -0500
++++ coreutils-5.2.0/man/Makefile.am 2004-03-12 18:28:32.000000000 -0500
+@@ -157,7 +157,7 @@
+ programs = \
+ echo 'spy:;@echo $$(all_programs)' \
+ | MAKEFLAGS= $(MAKE) -s -C ../src -f Makefile -f - spy \
+- | ../src/tr -s ' ' '\n' | $(ASSORT) -u | grep -v '\['
++ | ../src/tr -s ' ' '\n' | sed -e 's/$(EXEEXT)$$//' | $(ASSORT) -u | grep -v '\['
+
+ .PHONY: check-programs-vs-x
+ check-programs-vs-x:
+diff -urN -x .build -x .inst -x .sinst coreutils-5.2.0-orig/man/Makefile.in coreutils-5.2.0/man/Makefile.in
+--- coreutils-5.2.0-orig/man/Makefile.in 2004-02-08 15:12:50.000000000 -0500
++++ coreutils-5.2.0/man/Makefile.in 2004-03-13 09:55:14.000000000 -0500
+@@ -296,7 +296,7 @@
+ programs = \
+ echo 'spy:;@echo $$(all_programs)' \
+ | MAKEFLAGS= $(MAKE) -s -C ../src -f Makefile -f - spy \
+- | ../src/tr -s ' ' '\n' | $(ASSORT) -u | grep -v '\['
++ | ../src/tr -s ' ' '\n' | sed -e 's/$(EXEEXT)$$//' | $(ASSORT) -u | grep -v '\['
+
+ all: all-am
+
diff -urN -x .build -x .inst -x .sinst coreutils-5.2.0-orig/src/Makefile.am coreutils-5.2.0/src/Makefile.am
---- coreutils-5.2.0-orig/src/Makefile.am 2004-02-02 03:12:57.000000000 -0500
-+++ coreutils-5.2.0/src/Makefile.am 2004-03-11 13:09:37.000000000 -0500
+--- coreutils-5.2.0-orig/src/Makefile.am 2004-02-02 03:12:58.000000000 -0500
++++ coreutils-5.2.0/src/Makefile.am 2004-03-13 09:46:44.000000000 -0500
@@ -30,7 +30,7 @@
# must precede $(LIBINTL) in order to ensure we use GNU getopt.
# But libfetish.a must also follow $(LIBINTL), since libintl uses
</the_patch>
--
) | | ---/ ---/ Yes, this | This message consist of true | I do not
-- | | / / really is | and false bits entirely. | mail for
) | | / / a 72 by 4 +-------------------------------+ any1 but
-- \--| /--- /--- .sigfile. | |perl -pe "s.u(z)\1.as." | me. 4^re