 | | | | | |
I had problems on Linux with building dll from CVS. Apparently, it thought
that I was running windows.
The simple patch below fixes the problem for me, but I don't know if it
leaves the cygwin build intact...
--- util/Makefile.common.old Thu Sep 5 16:51:27 2002
+++ util/Makefile.common Thu Sep 5 16:51:36 2002
@@ -22,7 +22,7 @@
#
# Windows/Cygnwin, test against several values:
#
-ifneq (,$(findstring $(OSTYPE),cygwin32 cygwin WindowsNT Windows_NT)||,$(findstring CYGWIN,$(OSTYPE)))
+ifneq (,$(findstring $(OSTYPE),cygwin32 cygwin WindowsNT Windows_NT CYGWIN))
EXT=.exe
CC =gcc
CFLAGS+=-D_WIN32
| | | | | | | | | | | | | | | | |
| |
|
John,
It looks like my patch to catch all WindowsOS broke for Linux. Ooops. I see
an extra comma in there that should not be there. Could you try the
following for me (or just remove the comma)?
--- util/Makefile.common.old Thu Sep 5 16:51:27 2002
+++ util/Makefile.common Thu Sep 5 16:51:36 2002
@@ -22,7 +22,7 @@
#
# Windows/Cygnwin, test against several values:
#
-ifneq (,$(findstring $(OSTYPE),cygwin32 cygwin WindowsNT Windows_NT
CYGWIN))
+ifneq (,$(findstring $(OSTYPE),cygwin32 cygwin WindowsNT
Windows_NT)||$(findstring CYGWIN,$(OSTYPE)))
I do need to get a second hard drive so I can put Linux on it and test out
across platforms. Sorry once again.
Ed
John Jorgensen <jjorgens@2gn.com> wrote in message
news:Pine.LNX.4.21.0209051650100.22896-100000@2gn.com...
> I had problems on Linux with building dll from CVS. Apparently, it thought
> that I was running windows.
>
> The simple patch below fixes the problem for me, but I don't know if it
> leaves the cygwin build intact...
>
> --- util/Makefile.common.old Thu Sep 5 16:51:27 2002
> +++ util/Makefile.common Thu Sep 5 16:51:36 2002
> @@ -22,7 +22,7 @@
> #
> # Windows/Cygnwin, test against several values:
> #
> -ifneq (,$(findstring $(OSTYPE),cygwin32 cygwin WindowsNT • Windows_NT)||,$(findstring CYGWIN,$(OSTYPE)))
> +ifneq (,$(findstring $(OSTYPE),cygwin32 cygwin WindowsNT Windows_NT • CYGWIN))
> EXT=.exe
> CC =gcc
> CFLAGS+=-D_WIN32
>
>
| | | | | | | | | | | | | | | | | | | | |
This still doesn't work for me. Can you use a similar findstring as the
one in the root Makefile.common? The one that looks like this;
ifneq (,$(findstring $(OSTYPE),cygwin32 cygwin CYGWIN_NT-4.0 CYGWIN_NT-5.0 CYGWIN_NT-5.1 WindowsNT Windows_NT))
J*
On Fri, 6 Sep 2002, Ed Manlove wrote:
> John,
>
> It looks like my patch to catch all WindowsOS broke for Linux. Ooops. I see
> an extra comma in there that should not be there. Could you try the
> following for me (or just remove the comma)?
>
> --- util/Makefile.common.old Thu Sep 5 16:51:27 2002
> +++ util/Makefile.common Thu Sep 5 16:51:36 2002
> @@ -22,7 +22,7 @@
> #
> # Windows/Cygnwin, test against several values:
> #
> -ifneq (,$(findstring $(OSTYPE),cygwin32 cygwin WindowsNT Windows_NT
> CYGWIN))
> +ifneq (,$(findstring $(OSTYPE),cygwin32 cygwin WindowsNT
> Windows_NT)||$(findstring CYGWIN,$(OSTYPE)))
| | | | | | | | | | | | | | | | | | | | | | | |
| |
|
John,
There is another one in $(BRICKOS_ROOT)\Makefile.common. It will below the
line you comment here but I don't see any typos
#
# Cygwin 1.1
#
ifneq (,$(findstring CYGWIN,$(OSTYPE)))
What do you get when you type uname at the prompt?
Ed
John Jorgensen <jjorgens@2gn.com> wrote in message
news:Pine.LNX.4.21.0209061859100.30441-100000@2gn.com...
> This still doesn't work for me. Can you use a similar findstring as the
> one in the root Makefile.common? The one that looks like this;
>
> ifneq (,$(findstring $(OSTYPE),cygwin32 cygwin CYGWIN_NT-4.0 CYGWIN_NT-5.0 • CYGWIN_NT-5.1 WindowsNT Windows_NT))
>
> J*
>
> On Fri, 6 Sep 2002, Ed Manlove wrote:
>
> > John,
> >
> > It looks like my patch to catch all WindowsOS broke for Linux. Ooops. I • see
> > an extra comma in there that should not be there. Could you try the
> > following for me (or just remove the comma)?
> >
> > --- util/Makefile.common.old Thu Sep 5 16:51:27 2002
> > +++ util/Makefile.common Thu Sep 5 16:51:36 2002
> > @@ -22,7 +22,7 @@
> > #
> > # Windows/Cygnwin, test against several values:
> > #
> > -ifneq (,$(findstring $(OSTYPE),cygwin32 cygwin WindowsNT Windows_NT
> > CYGWIN))
> > +ifneq (,$(findstring $(OSTYPE),cygwin32 cygwin WindowsNT
> > Windows_NT)||$(findstring CYGWIN,$(OSTYPE)))
>
| | | | | | | | | | | | | | | | | | |
| |
|
John,
I believe I have a good solution. I ran a test both under Win98 and a
forced Linux OS (set OSTYPE=LINUX in makefiles). Below is a patch file for
the current CVS version of brickOS. As soon as I get confirmation that this
does fix my bug I will check it into CVS. Once again I am sorry for the
inconvenience.
--- util/Makefile.common Thu Sep 5 12:19:24 2002
+++ util/Makefile.common Thu Sep 12 11:26:34 2002
@@ -22,7 +22,7 @@
#
# Windows/Cygnwin, test against several values:
#
-ifneq (,$(findstring $(OSTYPE),cygwin32 cygwin WindowsNT
Windows_NT)||$(findstring CYGWIN,$(OSTYPE)))
+ifneq (,$(strip $(findstring $(OSTYPE),cygwin32 cygwin WindowsNT
Windows_NT) $(findstring CYGWIN,$(OSTYPE))))
EXT=.exe
CC =gcc
CFLAGS+=-D_WIN32
Ed
John Jorgensen <jjorgens@2gn.com> wrote in message
news:Pine.LNX.4.21.0209051650100.22896-100000@2gn.com...
> I had problems on Linux with building dll from CVS. Apparently, it thought
> that I was running windows.
>
> The simple patch below fixes the problem for me, but I don't know if it
> leaves the cygwin build intact...
>
> --- util/Makefile.common.old Thu Sep 5 16:51:27 2002
> +++ util/Makefile.common Thu Sep 5 16:51:36 2002
> @@ -22,7 +22,7 @@
> #
> # Windows/Cygnwin, test against several values:
> #
> -ifneq (,$(findstring $(OSTYPE),cygwin32 cygwin WindowsNT • Windows_NT)||,$(findstring CYGWIN,$(OSTYPE)))
> +ifneq (,$(findstring $(OSTYPE),cygwin32 cygwin WindowsNT Windows_NT • CYGWIN))
> EXT=.exe
> CC =gcc
> CFLAGS+=-D_WIN32
>
>
| | | | | | |
