John,
Sorry, I was out of town yesterday.
Suhaib
PS: Patches from John.
-----Original Message-----
From: [EMAIL PROTECTED]
To: Suhaib Siddiqi
Sent: 10/28/2000 8:46 PM
Subject: [Fwd: failure notice]
Suhaib,
Could you post this for me?
John
Here are two patches I created to allow me to compile ( so far)
#1) cygwin.cf: get rid of already defined warnings for HasGcc and
HasGcc2
#2) imake.c: does not handle #statement (#if, #endif, etc) if it is
the only element on the line and
there is a '\r' right after.
John
--------------C38FAC665E9B8C7253691683
Content-Type: text/plain; charset=us-ascii;
name="cygwin.cf.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="cygwin.cf.patch"
4,7c4,7
< XCOMM - avoided tons of "not in XXX directory" messages;
< XCOMM - dlls are built stripped;
< XCOMM - search for cpp in a default location;
< XCOMM - fixed problem with missing netinet/tcp.h;
---
> XCOMM - avoided tons of "not in XXX directory" messages;
> XCOMM - dlls are built stripped;
> XCOMM - search for cpp in a default location;
> XCOMM - fixed problem with missing netinet/tcp.h;
9,11c9,11
< XCOMM - xterm compiles and works;
< XCOMM - more libs are built as a DLLs;
< XCOMM - all DLLs have different base addresses;
---
> XCOMM - xterm compiles and works;
> XCOMM - more libs are built as a DLLs;
> XCOMM - all DLLs have different base addresses;
13c13
< XCOMM - dllwrap is used to build DLLs;
---
> XCOMM - dllwrap is used to build DLLs;
15c15
< XCOMM - gcc -E is invoked instead of cpp;
---
> XCOMM - gcc -E is invoked instead of cpp;
29c29
< #ifndef OSTeenyVersion 2
---
> #ifndef OSTeenyVersion 2
33c33
< XCOMM #define OSDefines -DSYSV -DSYSV386
---
> XCOMM #define OSDefines -DSYSV -DSYSV386
37c37
< #define BuildServer YES
---
> #define BuildServer YES
42a43,45
> #ifdef HasGcc
> #undef HasGcc
> #endif
43a47,49
> #ifdef HasGcc2
> #undef HasGcc2
> #endif
52c58
< #define HasPoll NO
---
> #define HasPoll NO
79c85
< #define DefaultGcc2i386Opt -O2
---
> #define DefaultGcc2i386Opt -O2
111c117
< #define ServerOSDefines XFree86ServerDefines -DDDXTIME
-DFD_SETSIZE=256 -DDXOSINIT
---
> #define ServerOSDefines XFree86ServerDefines -DDDXTIME
-DFD_SETSIZE=256 -DDXOSINIT
115c121
< #define ExtraLibraries
---
> #define ExtraLibraries
--------------C38FAC665E9B8C7253691683
Content-Type: text/plain; charset=us-ascii;
name="imake.c.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="imake.c.patch"
1338,1377c1338,1377
< if (!(inFile = fopen(imakefile, "r")))
< LogFatal("Cannot open %s for input.", imakefile);
< if (fstat(fileno(inFile), &st) < 0)
< LogFatal("Cannot stat %s for size.", imakefile);
< buf = Emalloc((int)st.st_size+3);
< count = fread(buf + 2, 1, st.st_size, inFile);
< if (count == 0 && st.st_size != 0)
< LogFatal("Cannot read %s:", imakefile);
< fclose(inFile);
< buf[0] = '\n';
< buf[1] = '\n';
< buf[count + 2] = '\0';
<
< punwritten = pbuf = buf + 2;
< while (*pbuf) {
< /* for compatibility, replace make comments for cpp */
< if (*pbuf == '#' && pbuf[-1] == '\n' && pbuf[-2] != '\\') {
< ptoken = pbuf+1;
< while (*ptoken == ' ' || *ptoken == '\t')
< ptoken++;
< pend = ptoken;
< while (*pend && *pend != ' ' && *pend != '\t' && *pend
!= '\n')
< pend++;
< savec = *pend;
< *pend = '\0';
< if (strcmp(ptoken, "define") &&
< strcmp(ptoken, "if") &&
< strcmp(ptoken, "ifdef") &&
< strcmp(ptoken, "ifndef") &&
< strcmp(ptoken, "include") &&
< strcmp(ptoken, "line") &&
< strcmp(ptoken, "else") &&
< strcmp(ptoken, "elif") &&
< strcmp(ptoken, "endif") &&
< strcmp(ptoken, "error") &&
< strcmp(ptoken, "pragma") &&
< strcmp(ptoken, "undef")) {
< if (outFile == NULL) {
< int fd;
< tmpImakefile = Strdup(tmpImakefile);
---
> if (!(inFile = fopen(imakefile, "r")))
> LogFatal("Cannot open %s for input.", imakefile);
> if (fstat(fileno(inFile), &st) < 0)
> LogFatal("Cannot stat %s for size.", imakefile);
> buf = Emalloc((int)st.st_size+3);
> count = fread(buf + 2, 1, st.st_size, inFile);
> if (count == 0 && st.st_size != 0)
> LogFatal("Cannot read %s:", imakefile);
> fclose(inFile);
> buf[0] = '\n';
> buf[1] = '\n';
> buf[count + 2] = '\0';
>
> punwritten = pbuf = buf + 2;
> while (*pbuf) {
> /* for compatibility, replace make comments for cpp */
> if (*pbuf == '#' && pbuf[-1] == '\n' && pbuf[-2] != '\\')
{
> ptoken = pbuf+1;
> while (*ptoken == ' ' || *ptoken == '\t')
> ptoken++;
> pend = ptoken;
> while (*pend && *pend != ' ' && *pend != '\t' && *pend
!= '\n' && *pend != '\r')
> pend++;
> savec = *pend;
> *pend = '\0';
> if (strcmp(ptoken, "define") &&
> strcmp(ptoken, "if") &&
> strcmp(ptoken, "ifdef") &&
> strcmp(ptoken, "ifndef") &&
> strcmp(ptoken, "include") &&
> strcmp(ptoken, "line") &&
> strcmp(ptoken, "else") &&
> strcmp(ptoken, "elif") &&
> strcmp(ptoken, "endif") &&
> strcmp(ptoken, "error") &&
> strcmp(ptoken, "pragma") &&
> strcmp(ptoken, "undef")) {
> if (outFile == NULL) {
> int fd;
> tmpImakefile = Strdup(tmpImakefile);
--------------C38FAC665E9B8C7253691683--
