[distcc] Compiling distcc 3.0 under Cygwin/WinXP

[Perez, Aaron P.]

Now I get an error against 'tr'.

 

tr: extra operand `./_include_server/install.log'

Only one string may be given when deleting without squeezing repeats.

Try `tr --help' for more information.

+ INCLUDE_SERVER=

make: *** [install-include-server] Error 1

bash$

 

________________________________

From: Fergus Henderson [mailto:fergus at google.com] 
Sent: Monday, June 30, 2008 1:52 PM
To: Perez, Aaron P.
Cc: distcc at lists.samba.org
Subject: Re: [distcc] Compiling distcc 3.0 under Cygwin/WinXP

 

Thanks for sending the install.log file - that really helped.
I see the problem now.  It's a DOS-vs-UNIX text file format problem.
The install.log file is being created in DOS file format (CR LF line
endings), but the grep command is expecting it to be in Unix file format
(LF line endings).

Can you please try the attached patch, which I think will solve the
problem?

Cheers,
  Fergus.

Index: Makefile.in
===================================================================
--- Makefile.in (revision 525)
+++ Makefile.in (working copy)
@@ -1019,6 +1019,9 @@
 # Note: --record output is inconsistent (buggy?) and sometimes leaves
out
 # the leading slash in $prefix, even though we require prefix start
with
 # a slash.  We add it back in at cp time.
+# Also, on Cygwin the --record output is in DOS text file format (CR LF
+# line endings), so we need to convert it from DOS text file format to
+# Unix text file format (LF line endings); we use "tr -d '\r'" for
that.
 install-include-server: include-server pump
        if test -z "$(INCLUDESERVER_PYTHON)"; then      \
          echo "Not building $@: No suitable python found"; \
@@ -1042,7 +1045,7 @@
            cp -f "$(include_server_builddir)/install.log"
"$(PYTHON_INSTALL_RECORD)"; \
          fi; \
          $(mkinstalldirs) "$(DESTDIR)$(bindir)" && \
-         INCLUDE_SERVER=`grep '/include_server.py$$'
"$(include_server_builddir)/install.log"` && \
+         INCLUDE_SERVER=`tr -d '\r'
"$(include_server_builddir)/install.log" | grep '/include_server.py$$' `
&& \
          sed "s,^include_server='',include_server='$$INCLUDE_SERVER',"
\
            pump > "$(include_server_builddir)/pump" && \
          $(INSTALL_PROGRAM) "$(include_server_builddir)/pump"
"$(DESTDIR)$(bindir)"; \

-- 
Fergus Henderson <fergus at google.com> 

-------------- next part --------------
HTML attachment scrubbed and removed