public inbox for cygwin@cygwin.com
 help / color / mirror / Atom feed
* Problem with patch 2.5.8-7
@ 2003-09-06 15:02 Volker Quetschke
  2003-09-06 20:12 ` Corinna Vinschen
  0 siblings, 1 reply; 9+ messages in thread
From: Volker Quetschke @ 2003-09-06 15:02 UTC (permalink / raw)
  To: cygwin


[-- Attachment #1.1: Type: text/plain, Size: 637 bytes --]

Hi!

I'm experiencing problems with the current patch program, version
2.5.8-7. (System W2k, all binary mounts, Cygwin updated two hours ago.)

With the attached two files the following command worked with
previous versions of patch (still works if I go back to
patch 2.5.8-3 (my last version))

But now:
$ patch -i dos_lineends.patch -b -p2
fails.
vc_common.mak is in: ./STLport-4.0/src/vc_common.mak

Any hints?

Volker

P.S. I skipped the cygcheck output because the older version still
works.

-- 
PGP/GPG key  (ID: 0x9F8A785D)  available  from  wwwkeys.de.pgp.net
key-fingerprint 550D F17E B082 A3E9 F913  9E53 3D35 C9BA 9F8A 785D


[-- Attachment #1.2: vc_common.mak --]
[-- Type: text/plain, Size: 2766 bytes --]

#
#

!IF "$(OS)" == "Windows_NT"
NULL=
!ELSE 
NULL=nul
!ENDIF 


#
# Tools
#

# RSC=rc.exe
LINK=lib.exe
DYN_LINK=link.exe
OBJEXT=obj
DYNEXT=dll
STEXT=lib
RM=-rd /S /Q

PATH_SEP=\\

MKDIR=-mkdir
LINK_OUT=/out:
DYNLINK_OUT=/out:
STATIC_SUFFIX=_static
INSTALL_STEP=do_install

!include common_macros.mak

#
#
# Flags
#

FLAGS_COMMON =/Zm800 /nologo /W3 /GR /GX /FI "vc_warning_disable.h" /D "WIN32" /D "_WINDOWS" /I "$(STLPORT_DIR)" /D "__SGI_STL_OWN_IOSTREAMS" $(EXTRA_COMMON_FLAGS)

FLAGS_COMMON_static = $(FLAGS_COMMON) /D "_LIB" /FD
FLAGS_COMMON_dynamic = $(FLAGS_COMMON) /D "_USRDLL"


LDFLAGS_COMMON_static=/nologo /machine:I386
LDFLAGS_COMMON_dynamic=/nologo /dll /incremental:no /machine:I386

CXXFLAGS_DEBUG_static=$(FLAGS_COMMON_static) /MTd /Zi /Yd /Gm /Od  /D "_DEBUG"  /Fo"$(DEBUG_OBJDIR_static)\\" /Fd"$(DEBUG_OBJDIR_static)\\" /YXstlport_prefix.h /Fp$(DEBUG_OBJDIR_static)\stlport.pch /c

CXXFLAGS_DEBUG_dynamic=$(FLAGS_COMMON_dynamic) /MDd /Zi /Yd /Gm /Od  /D "_DEBUG"  /Fo"$(DEBUG_OBJDIR_dynamic)\\" /Fd"$(DEBUG_OBJDIR_dynamic)\\" /YXstlport_prefix.h /Fp$(DEBUG_OBJDIR_dynamic)\stlport.pch /c

CXXFLAGS_STLDEBUG_static=$(FLAGS_COMMON_static) /MTd /Zi /Yd /Gm /Od  /D "_DEBUG"  /D "__STL_DEBUG" /Fo"$(STLDEBUG_OBJDIR_static)\\" /Fd"$(STLDEBUG_OBJDIR_static)\\"  /YXstlport_prefix.h /Fp$(STLDEBUG_OBJDIR_static)\stlport.pch /c 

CXXFLAGS_STLDEBUG_dynamic=$(FLAGS_COMMON_dynamic) /MDd /Zi /Yd /Gm /Od  /D "_DEBUG"  /D "__STL_DEBUG" /Fo"$(STLDEBUG_OBJDIR_dynamic)\\" /Fd"$(STLDEBUG_OBJDIR_dynamic)\\"  /YXstlport_prefix.h /Fp$(STLDEBUG_OBJDIR_dynamic)\stlport.pch /c 

LDFLAGS_DEBUG_static=$(LDFLAGS_COMMON_static) /NODEFAULTLIB:MTD /DEBUGTYPE:CV
LDFLAGS_DEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) /DEBUG /DEBUGTYPE:CV /implib:"$(OUTDIR)\$(DEBUG_NAME).$(STEXT)" 

LDFLAGS_STLDEBUG_static=$(LDFLAGS_COMMON_static) /NODEFAULTLIB:MTD /DEBUGTYPE:CV
LDFLAGS_STLDEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) /DEBUG /DEBUGTYPE:CV /implib:"$(OUTDIR)\$(STLDEBUG_NAME).$(STEXT)" 

CXXFLAGS_RELEASE_static=$(FLAGS_COMMON_static) /O2 /MT /D "NDEBUG" /Fo"$(RELEASE_OBJDIR_static)\\" /Fd"$(RELEASE_OBJDIR_static)\\"  /YXstlport_prefix.h /Fp$(RELEASE_OBJDIR_static)\stlport.pch /c 

CXXFLAGS_RELEASE_dynamic=$(FLAGS_COMMON_dynamic) /O2 /MD /D "NDEBUG" /Fo"$(RELEASE_OBJDIR_dynamic)\\" /Fd"$(RELEASE_OBJDIR_dynamic)\\" /YXstlport_prefix.h /Fp$(RELEASE_OBJDIR_dynamic)\stlport.pch /c 

LDFLAGS_RELEASE_static=$(LDFLAGS_COMMON_static)
LDFLAGS_RELEASE_dynamic=$(LDFLAGS_COMMON_dynamic) /implib:"$(OUTDIR)\$(RELEASE_NAME).$(STEXT)" 

RESFILE=$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)stlport.res
RESFILE_debug=$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)stlport.res
RESFILE_stldebug=$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)stlport.res


#
# Rules
#

!include common_rules.mak

!include nmake_common.mak


[-- Attachment #1.3: dos_lineends.patch --]
[-- Type: text/plain, Size: 3677 bytes --]

*** ./unxsols3.pro/misc/STLport-4.0/src/vc_common.mak	Fri Jul 14 03:53:26 2000
--- build/unxsols3.pro/STLport-4.0/src/vc_common.mak	Fri Oct  5 15:34:10 2001
***************
*** 42,48 ****
  
  
  LDFLAGS_COMMON_static=/nologo /machine:I386
! LDFLAGS_COMMON_dynamic=/nologo /dll /incremental:no /machine:I386
  
  CXXFLAGS_DEBUG_static=$(FLAGS_COMMON_static) /MTd /Zi /Yd /Gm /Od  /D "_DEBUG"  /Fo"$(DEBUG_OBJDIR_static)\\" /Fd"$(DEBUG_OBJDIR_static)\\" /YXstlport_prefix.h /Fp$(DEBUG_OBJDIR_static)\stlport.pch /c
  
--- 42,48 ----
  
  
  LDFLAGS_COMMON_static=/nologo /machine:I386
! LDFLAGS_COMMON_dynamic=/nologo /nodefaultlib oldnames.lib kernel32.lib /dll /incremental:no /machine:I386
  
  CXXFLAGS_DEBUG_static=$(FLAGS_COMMON_static) /MTd /Zi /Yd /Gm /Od  /D "_DEBUG"  /Fo"$(DEBUG_OBJDIR_static)\\" /Fd"$(DEBUG_OBJDIR_static)\\" /YXstlport_prefix.h /Fp$(DEBUG_OBJDIR_static)\stlport.pch /c
  
***************
*** 53,62 ****
  CXXFLAGS_STLDEBUG_dynamic=$(FLAGS_COMMON_dynamic) /MDd /Zi /Yd /Gm /Od  /D "_DEBUG"  /D "__STL_DEBUG" /Fo"$(STLDEBUG_OBJDIR_dynamic)\\" /Fd"$(STLDEBUG_OBJDIR_dynamic)\\"  /YXstlport_prefix.h /Fp$(STLDEBUG_OBJDIR_dynamic)\stlport.pch /c 
  
  LDFLAGS_DEBUG_static=$(LDFLAGS_COMMON_static) /NODEFAULTLIB:MTD /DEBUGTYPE:CV
! LDFLAGS_DEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) /DEBUG /DEBUGTYPE:CV /implib:"$(OUTDIR)\$(DEBUG_NAME).$(STEXT)" 
  
  LDFLAGS_STLDEBUG_static=$(LDFLAGS_COMMON_static) /NODEFAULTLIB:MTD /DEBUGTYPE:CV
! LDFLAGS_STLDEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) /DEBUG /DEBUGTYPE:CV /implib:"$(OUTDIR)\$(STLDEBUG_NAME).$(STEXT)" 
  
  CXXFLAGS_RELEASE_static=$(FLAGS_COMMON_static) /O2 /MT /D "NDEBUG" /Fo"$(RELEASE_OBJDIR_static)\\" /Fd"$(RELEASE_OBJDIR_static)\\"  /YXstlport_prefix.h /Fp$(RELEASE_OBJDIR_static)\stlport.pch /c 
  
--- 53,62 ----
  CXXFLAGS_STLDEBUG_dynamic=$(FLAGS_COMMON_dynamic) /MDd /Zi /Yd /Gm /Od  /D "_DEBUG"  /D "__STL_DEBUG" /Fo"$(STLDEBUG_OBJDIR_dynamic)\\" /Fd"$(STLDEBUG_OBJDIR_dynamic)\\"  /YXstlport_prefix.h /Fp$(STLDEBUG_OBJDIR_dynamic)\stlport.pch /c 
  
  LDFLAGS_DEBUG_static=$(LDFLAGS_COMMON_static) /NODEFAULTLIB:MTD /DEBUGTYPE:CV
! LDFLAGS_DEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) msvcrtd.lib /DEBUG /DEBUGTYPE:CV /implib:"$(OUTDIR)\$(DEBUG_NAME).$(STEXT)" 
  
  LDFLAGS_STLDEBUG_static=$(LDFLAGS_COMMON_static) /NODEFAULTLIB:MTD /DEBUGTYPE:CV
! LDFLAGS_STLDEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) msvcrtd.lib /DEBUG /DEBUGTYPE:CV /implib:"$(OUTDIR)\$(STLDEBUG_NAME).$(STEXT)" 
  
  CXXFLAGS_RELEASE_static=$(FLAGS_COMMON_static) /O2 /MT /D "NDEBUG" /Fo"$(RELEASE_OBJDIR_static)\\" /Fd"$(RELEASE_OBJDIR_static)\\"  /YXstlport_prefix.h /Fp$(RELEASE_OBJDIR_static)\stlport.pch /c 
  
***************
*** 63,69 ****
  CXXFLAGS_RELEASE_dynamic=$(FLAGS_COMMON_dynamic) /O2 /MD /D "NDEBUG" /Fo"$(RELEASE_OBJDIR_dynamic)\\" /Fd"$(RELEASE_OBJDIR_dynamic)\\" /YXstlport_prefix.h /Fp$(RELEASE_OBJDIR_dynamic)\stlport.pch /c 
  
  LDFLAGS_RELEASE_static=$(LDFLAGS_COMMON_static)
! LDFLAGS_RELEASE_dynamic=$(LDFLAGS_COMMON_dynamic) /implib:"$(OUTDIR)\$(RELEASE_NAME).$(STEXT)" 
  
  RESFILE=$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)stlport.res
  RESFILE_debug=$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)stlport.res
--- 63,69 ----
  CXXFLAGS_RELEASE_dynamic=$(FLAGS_COMMON_dynamic) /O2 /MD /D "NDEBUG" /Fo"$(RELEASE_OBJDIR_dynamic)\\" /Fd"$(RELEASE_OBJDIR_dynamic)\\" /YXstlport_prefix.h /Fp$(RELEASE_OBJDIR_dynamic)\stlport.pch /c 
  
  LDFLAGS_RELEASE_static=$(LDFLAGS_COMMON_static)
! LDFLAGS_RELEASE_dynamic=$(LDFLAGS_COMMON_dynamic) msvcrt.lib /implib:"$(OUTDIR)\$(RELEASE_NAME).$(STEXT)" 
  
  RESFILE=$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)stlport.res
  RESFILE_debug=$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)stlport.res


[-- Attachment #2: Type: application/pgp-signature, Size: 251 bytes --]

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: Problem with patch 2.5.8-7
  2003-09-06 15:02 Problem with patch 2.5.8-7 Volker Quetschke
@ 2003-09-06 20:12 ` Corinna Vinschen
  2003-09-06 20:52   ` Volker Quetschke
  0 siblings, 1 reply; 9+ messages in thread
From: Corinna Vinschen @ 2003-09-06 20:12 UTC (permalink / raw)
  To: cygwin

On Sat, Sep 06, 2003 at 05:06:03PM +0200, Volker Quetschke wrote:
> Hi!
> 
> I'm experiencing problems with the current patch program, version
> 2.5.8-7. (System W2k, all binary mounts, Cygwin updated two hours ago.)
> 
> With the attached two files the following command worked with
> previous versions of patch (still works if I go back to
> patch 2.5.8-3 (my last version))
> 
> But now:
> $ patch -i dos_lineends.patch -b -p2
> fails.
> vc_common.mak is in: ./STLport-4.0/src/vc_common.mak

So it fails.  Interesting.  I wonder *how* it fails though. 
http://cygwin.com/problems.html

Corinna

P.S.: I tried it and it works for me.

-- 
Corinna Vinschen                  Please, send mails regarding Cygwin to
Cygwin Developer                                mailto:cygwin@cygwin.com
Red Hat, Inc.

--
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple
Problem reports:       http://cygwin.com/problems.html
Documentation:         http://cygwin.com/docs.html
FAQ:                   http://cygwin.com/faq/

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: Problem with patch 2.5.8-7
  2003-09-06 20:12 ` Corinna Vinschen
@ 2003-09-06 20:52   ` Volker Quetschke
  2003-09-06 21:22     ` Igor Pechtchanski
                       ` (2 more replies)
  0 siblings, 3 replies; 9+ messages in thread
From: Volker Quetschke @ 2003-09-06 20:52 UTC (permalink / raw)
  To: cygwin

[-- Attachment #1: Type: text/plain, Size: 1512 bytes --]

Hi!

>>I'm experiencing problems with the current patch program, version
>>2.5.8-7. (System W2k, all binary mounts, Cygwin updated two hours ago.)
>>
>>With the attached two files the following command worked with
>>previous versions of patch (still works if I go back to
>>patch 2.5.8-3 (my last version))
>>
>>But now:
>>$ patch -i dos_lineends.patch -b -p2
>>fails.
>>vc_common.mak is in: ./STLport-4.0/src/vc_common.mak
> 
> So it fails.  Interesting.  I wonder *how* it fails though. 
> http://cygwin.com/problems.html
Ok, I stepped into the usual trap. If it fails for me, it has to fail for
you also :-(

Details follow:

$ ll
total 4
drwxrwxr-x+   3 q        none            0 Sep  6 22:42 STLport-4.0/
-rwxrwxr-x    1 admins   none         3737 Sep  6 22:41 dos_lineends.patch*
[q@lisi]/tmp/patchtest:{517}:
$ patch -i dos_lineends.patch -b -p2
patching file STLport-4.0/src/vc_common.mak
Hunk #1 FAILED at 42.
Hunk #2 FAILED at 53.
Hunk #3 FAILED at 63.
3 out of 3 hunks FAILED -- saving rejects to file STLport-4.0/src/vc_common.mak.rej

This time I attached the output of cygcheck -s -v -r.

As a data point, if I do a
$ dos2unix.exe STLport-4.0/src/vc_common.mak
first, the patch applies cleanly, but this is wrong,
both patch and file are DOS style files with 0D0A lineendings.

> P.S.: I tried it and it works for me.
It works if I use patch 2.5.8-3

Volker

-- 
PGP/GPG key  (ID: 0x9F8A785D)  available  from  wwwkeys.de.pgp.net
key-fingerprint 550D F17E B082 A3E9 F913  9E53 3D35 C9BA 9F8A 785D

[-- Attachment #2: Type: application/pgp-signature, Size: 251 bytes --]

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: Problem with patch 2.5.8-7
  2003-09-06 20:52   ` Volker Quetschke
@ 2003-09-06 21:22     ` Igor Pechtchanski
  2003-09-06 21:47     ` Volker Quetschke
  2003-09-07  8:29     ` Corinna Vinschen
  2 siblings, 0 replies; 9+ messages in thread
From: Igor Pechtchanski @ 2003-09-06 21:22 UTC (permalink / raw)
  To: Volker Quetschke; +Cc: cygwin

On Sat, 6 Sep 2003, Volker Quetschke wrote:

> Hi!
>
> >>I'm experiencing problems with the current patch program, version
> >>2.5.8-7. (System W2k, all binary mounts, Cygwin updated two hours ago.)
> >>
> >>With the attached two files the following command worked with
> >>previous versions of patch (still works if I go back to
> >>patch 2.5.8-3 (my last version))
> >>
> >>But now:
> >>$ patch -i dos_lineends.patch -b -p2
> >>fails.
> >>vc_common.mak is in: ./STLport-4.0/src/vc_common.mak
> >
> > So it fails.  Interesting.  I wonder *how* it fails though.
> > http://cygwin.com/problems.html
> Ok, I stepped into the usual trap. If it fails for me, it has to fail for
> you also :-(
>
> Details follow:
>
> $ ll
> total 4
> drwxrwxr-x+   3 q        none            0 Sep  6 22:42 STLport-4.0/
> -rwxrwxr-x    1 admins   none         3737 Sep  6 22:41 dos_lineends.patch*
> [q@lisi]/tmp/patchtest:{517}:
> $ patch -i dos_lineends.patch -b -p2
> patching file STLport-4.0/src/vc_common.mak
> Hunk #1 FAILED at 42.
> Hunk #2 FAILED at 53.
> Hunk #3 FAILED at 63.
> 3 out of 3 hunks FAILED -- saving rejects to file STLport-4.0/src/vc_common.mak.rej
>
> This time I attached the output of cygcheck -s -v -r.
>
> As a data point, if I do a
> $ dos2unix.exe STLport-4.0/src/vc_common.mak
> first, the patch applies cleanly, but this is wrong,
> both patch and file are DOS style files with 0D0A lineendings.
>
> > P.S.: I tried it and it works for me.
> It works if I use patch 2.5.8-3
>
> Volker

I've got a couple more data points.  As can be seen from the session
below, when the patch (and the file being patched) contains DOS line
endings throughout, patch misbehaves on both text and binary mounts.
FWIW, patch works fine if only the data lines in the patch have DOS line
endings.  Hope this helps.
	Igor

$ pwd
/tmp/patchtest
$ od -c source.patch
0000000   -   -   -       s   o   u   r   c   e   -   o   r   i   g  \t
0000020   2   0   0   3   -   0   9   -   0   6       1   7   :   0   7
0000040   :   4   0   .   0   0   0   0   0   0   0   0   0       -   0
0000060   4   0   0  \r  \n   +   +   +       s   o   u   r   c   e  \t
0000100   2   0   0   3   -   0   9   -   0   6       1   7   :   0   8
0000120   :   1   8   .   0   9   1   9   1   5   2   0   0       -   0
0000140   4   0   0  \r  \n   @   @       -   1       +   1   ,   2
0000160   @   @  \r  \n      \r  \n   +  \r  \n
0000172
$ mount -ufb c:/cygwin/tmp/patchtest /tmp/patchtest
$ mount | grep tmp
c:\cygwin\tmp\patchtest on /tmp/patchtest type user (binmode)
$ od -c source
0000000  \r  \n
0000002
$ patch -p0 < source.patch
(Stripping trailing CRs from patch.)
patching file source
Hunk #1 succeeded at 1 with fuzz 1.
$ od -c source
0000000  \r  \n  \n
0000003
$ cp -p source-orig source
$ mount -uft c:/cygwin/tmp/patchtest /tmp/patchtest
$ mount | grep tmp
c:\cygwin\tmp\patchtest on /tmp/patchtest type user (textmode)
$ od -c source
0000000  \r  \n
0000002
$ patch -p0 < source.patch
patching file source
$ od -c source
0000000  \n  \n
0000002
$

-- 
				http://cs.nyu.edu/~pechtcha/
      |\      _,,,---,,_		pechtcha@cs.nyu.edu
ZZZzz /,`.-'`'    -.  ;-;;,_		igor@watson.ibm.com
     |,4-  ) )-,_. ,\ (  `'-'		Igor Pechtchanski, Ph.D.
    '---''(_/--'  `-'\_) fL	a.k.a JaguaR-R-R-r-r-r-.-.-.  Meow!

"I have since come to realize that being between your mentor and his route
to the bathroom is a major career booster."  -- Patrick Naughton

--
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple
Problem reports:       http://cygwin.com/problems.html
Documentation:         http://cygwin.com/docs.html
FAQ:                   http://cygwin.com/faq/

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: Problem with patch 2.5.8-7
  2003-09-06 20:52   ` Volker Quetschke
  2003-09-06 21:22     ` Igor Pechtchanski
@ 2003-09-06 21:47     ` Volker Quetschke
  2003-09-07  8:29     ` Corinna Vinschen
  2 siblings, 0 replies; 9+ messages in thread
From: Volker Quetschke @ 2003-09-06 21:47 UTC (permalink / raw)
  To: cygwin


[-- Attachment #1.1: Type: text/plain, Size: 219 bytes --]

> This time I attached the output of cygcheck -s -v -r.

Oops, now it does ;-)

-- 
PGP/GPG key  (ID: 0x9F8A785D)  available  from  wwwkeys.de.pgp.net
key-fingerprint 550D F17E B082 A3E9 F913  9E53 3D35 C9BA 9F8A 785D


[-- Attachment #1.2: cygcheck.out --]
[-- Type: text/plain, Size: 26563 bytes --]


Cygwin Win95/NT Configuration Diagnostics
Current System Time: Sat Sep 06 22:48:14 2003

Windows 2000 Professional Ver 5.0 Build 2195 Service Pack 3

Path:	C:\cygwin\usr\local\bin
	C:\cygwin\bin
	C:\cygwin\bin
	c:\WINNT\system32
	c:\WINNT
	c:\WINNT\System32\Wbem
	c:\Programme\Gemeinsame Dateien\Ulead Systems\MPEG
	c:\Programme\ATI Technologies\ATI Control Panel
	c:\Programme\Executive Software\DiskeeperWorkstation\
	C:\cygwin\usr\X11R6\bin

Output from C:\cygwin\bin\id.exe (nontsec)
UID: 1002(q) GID: 513(none)
513(none)

Output from C:\cygwin\bin\id.exe (ntsec)
UID: 1002(q) GID: 513(none)
513(none)      544(admins)    545(benutzer)

SysDir: C:\WINNT\System32
WinDir: C:\WINNT

CYGWIN = `tty codepage:oem'
HOME = `C:\cygwin\home\qloc'
MAKE_MODE = `unix'
PWD = `/tmp/patchtest'
USER = `q'

ALLUSERSPROFILE = `C:\Dokumente und Einstellungen\All Users'
APPDATA = `C:\Dokumente und Einstellungen\q\Anwendungsdaten'
COLORFGBG = `0;default;15'
COLORTERM = `rxvt-xpm'
COMMONPROGRAMFILES = `C:\Programme\Gemeinsame Dateien'
COMPUTERNAME = `LISI'
COMSPEC = `C:\WINNT\system32\cmd.exe'
DISKEEPERICON = `C:\Programme\Executive Software\DiskeeperWorkstation\'
DISPLAY = `:0'
EDITOR = `nano -w'
FTP_PASSIVE = `1'
HOMEDRIVE = `C:'
HOMEPATH = `\'
HOSTNAME = `lisi'
JOETERM = `linux'
LOGONSERVER = `\\LISI'
LS_COLORS = `no=00:fi=00:di=01;34:ln=01;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arj=01;31:*.taz=01;31:*.lzh=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.gz=01;31:*.bz2=01;31:*.deb=01;31:*.rpm=01;31:*.jpg=01;35:*.png=01;35:*.gif=01;35:*.bmp=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.png=01;35:*.mpg=01;35:*.avi=01;35:*.fli=01;35:*.gl=01;35:*.dl=01;35:'
MANPATH = `:/usr/ssl/man'
NUMBER_OF_PROCESSORS = `1'
OLDPWD = `/tmp/patchtest/STLport-4.0'
OS2LIBPATH = `C:\WINNT\system32\os2\dll;'
OS = `Windows_NT'
PATHEXT = `.COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH'
PERLIO = `perlio'
PROCESSOR_ARCHITECTURE = `x86'
PROCESSOR_IDENTIFIER = `x86 Family 6 Model 6 Stepping 2, AuthenticAMD'
PROCESSOR_LEVEL = `6'
PROCESSOR_REVISION = `0602'
PROGRAMFILES = `C:\Programme'
PS1 = `[$USER@$HOSTNAME]\w:{\!}:
\$ '
SHLVL = `1'
SYSTEMDRIVE = `C:'
SYSTEMROOT = `C:\WINNT'
TEMP = `d:\temp'
TERM = `xterm'
TMP = `d:\temp'
TZ = `CET-1CEST-2,M3.5.0/02:00:00,M10.5.0/03:00:00'
USERDOMAIN = `LISI'
USERNAME = `q'
USERPROFILE = `C:\Dokumente und Einstellungen\q'
WINDIR = `C:\WINNT'
WINDOWID = `168047224'
_ = `/bin/cygcheck'

HKEY_CURRENT_USER\Software\Cygnus Solutions
HKEY_CURRENT_USER\Software\Cygnus Solutions\Cygwin
HKEY_CURRENT_USER\Software\Cygnus Solutions\Cygwin\mounts v2
  (default) = `/cygdrive'
  cygdrive flags = 0x00000022
HKEY_CURRENT_USER\Software\Cygnus Solutions\Cygwin\Program Options
HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\MenuOrder\Start Menu\Programs\Cygnus Solutions
  (default) = (unsupported type)
HKEY_LOCAL_MACHINE\SOFTWARE\Cygnus Solutions
HKEY_LOCAL_MACHINE\SOFTWARE\Cygnus Solutions\Cygwin
HKEY_LOCAL_MACHINE\SOFTWARE\Cygnus Solutions\Cygwin\mounts v2
  (default) = `/cygdrive'
  cygdrive flags = 0x00000022
HKEY_LOCAL_MACHINE\SOFTWARE\Cygnus Solutions\Cygwin\mounts v2\/
  (default) = `C:/cygwin'
  flags = 0x0000000a
HKEY_LOCAL_MACHINE\SOFTWARE\Cygnus Solutions\Cygwin\mounts v2\/usr/bin
  (default) = `C:/cygwin/bin'
  flags = 0x0000000a
HKEY_LOCAL_MACHINE\SOFTWARE\Cygnus Solutions\Cygwin\mounts v2\/usr/lib
  (default) = `C:/cygwin/lib'
  flags = 0x0000000a
HKEY_LOCAL_MACHINE\SOFTWARE\Cygnus Solutions\Cygwin\mounts v2\/usr/X11R6/lib/X11/fonts
  (default) = `C:\cygwin\usr\X11R6\lib\X11\fonts'
  flags = 0x0000000a
HKEY_LOCAL_MACHINE\SOFTWARE\Cygnus Solutions\Cygwin\mounts v2\/w1
  (default) = `e:\w1'
  flags = 0x0000000a
HKEY_LOCAL_MACHINE\SOFTWARE\Cygnus Solutions\Cygwin\mounts v2\/w2
  (default) = `e:\w2'
  flags = 0x0000000a
HKEY_LOCAL_MACHINE\SOFTWARE\Cygnus Solutions\Cygwin\Program Options

a:  fd           N/A    N/A                    
c:  hd  NTFS    8063Mb  96% CP CS UN PA FC     
d:  hd  FAT32   8087Mb  70% CP    UN           FIRE_E1
e:  hd  NTFS   30215Mb  65% CP CS UN PA FC     FIRE_E2
f:  hd  FAT32  10242Mb  95% CP    UN           FIRE_E3
g:  cd           N/A    N/A                    
h:  cd           N/A    N/A                    
p:  net NTFS    8001Mb  47% CP CS UN PA FC     
q:  net NTFS   35204Mb  63% CP CS UN PA FC     Lager1

.                                  /cygdrive                 user    binmode,cygdrive
C:/cygwin                          /                         system  binmode
C:/cygwin/bin                      /usr/bin                  system  binmode
C:/cygwin/lib                      /usr/lib                  system  binmode
C:\cygwin\usr\X11R6\lib\X11\fonts  /usr/X11R6/lib/X11/fonts  system  binmode
e:\w1                              /w1                       system  binmode
e:\w2                              /w2                       system  binmode
.                                  /cygdrive                 system  binmode,cygdrive

Found: C:\cygwin\bin\awk.exe
Found: C:\cygwin\bin\bash.exe
Found: C:\cygwin\bin\cat.exe
Found: C:\cygwin\bin\cp.exe
Found: C:\cygwin\bin\cpp.exe
Found: C:\cygwin\bin\find.exe
Found: C:\cygwin\bin\gcc.exe
Found: C:\cygwin\bin\gdb.exe
Found: C:\cygwin\bin\grep.exe
Found: C:\cygwin\bin\ld.exe
Found: C:\cygwin\bin\ls.exe
Found: C:\cygwin\bin\make.exe
Found: C:\cygwin\bin\mv.exe
Found: C:\cygwin\bin\rm.exe
Found: C:\cygwin\bin\sed.exe
Found: C:\cygwin\bin\sh.exe
Found: C:\cygwin\bin\tar.exe

   61k 2003/08/09 C:\cygwin\bin\cygbz2-1.dll - os=4.0 img=1.0 sys=4.0
                  "cygbz2-1.dll" v0.0 ts=2003/8/9 8:35
   54k 2002/01/27 C:\cygwin\bin\cygbz21.0.dll - os=4.0 img=1.0 sys=4.0
                  "cygbz21.0.dll" v0.0 ts=2002/1/27 2:07
   14k 2003/08/10 C:\cygwin\bin\cygcharset-1.dll - os=4.0 img=1.0 sys=4.0
                  "cygcharset-1.dll" v0.0 ts=2003/8/10 22:57
  849k 2003/08/11 C:\cygwin\bin\cygcrypto-0.9.7.dll - os=4.0 img=1.0 sys=4.0
                  "cygcrypto-0.9.7.dll" v0.0 ts=2003/8/11 10:58
  645k 2003/04/11 C:\cygwin\bin\cygcrypto.dll - os=4.0 img=1.0 sys=4.0
                  "cygcrypto.dll" v0.0 ts=2003/4/11 12:37
  551k 2003/04/02 C:\cygwin\bin\cygcurl-2.dll - os=4.0 img=1.0 sys=4.0
                  "cygcurl-2.dll" v0.0 ts=2003/4/2 22:09
  380k 2002/07/24 C:\cygwin\bin\cygdb-3.1.dll - os=4.0 img=1.0 sys=4.0
                  "cygdb-3.1.dll" v0.0 ts=2002/7/24 18:24
  487k 2002/07/24 C:\cygwin\bin\cygdb_cxx-3.1.dll - os=4.0 img=1.0 sys=4.0
                  "cygdb_cxx-3.1.dll" v0.0 ts=2002/7/24 18:25
  135k 2003/04/13 C:\cygwin\bin\cygexpat-0.dll - os=4.0 img=1.0 sys=4.0
                  "cygexpat-0.dll" v0.0 ts=2003/4/13 23:24
   61k 2003/06/10 C:\cygwin\bin\cygexslt-0.dll - os=4.0 img=1.0 sys=4.0
                  "cygexslt-0.dll" v0.0 ts=2003/6/10 20:07
   45k 2001/04/25 C:\cygwin\bin\cygform5.dll - os=4.0 img=1.0 sys=4.0
                  "cygform5.dll" v0.0 ts=2001/4/25 7:28
   35k 2002/01/09 C:\cygwin\bin\cygform6.dll - os=4.0 img=1.0 sys=4.0
                  "cygform6.dll" v0.0 ts=2002/1/9 7:03
   48k 2003/08/09 C:\cygwin\bin\cygform7.dll - os=4.0 img=1.0 sys=4.0
                  "cygform7.dll" v0.0 ts=2003/8/9 11:25
   28k 2003/07/20 C:\cygwin\bin\cyggdbm-3.dll - os=4.0 img=1.0 sys=4.0
                  "cyggdbm-3.dll" v0.0 ts=2003/7/20 9:58
   30k 2003/08/11 C:\cygwin\bin\cyggdbm-4.dll - os=4.0 img=1.0 sys=4.0
                  "cyggdbm-4.dll" v0.0 ts=2003/8/11 4:12
   19k 2003/03/22 C:\cygwin\bin\cyggdbm.dll - os=4.0 img=1.0 sys=4.0
                  "cyggdbm.dll" v0.0 ts=2002/2/20 4:05
   15k 2003/07/20 C:\cygwin\bin\cyggdbm_compat-3.dll - os=4.0 img=1.0 sys=4.0
                  "cyggdbm_compat-3.dll" v0.0 ts=2003/7/20 10:00
   15k 2003/08/11 C:\cygwin\bin\cyggdbm_compat-4.dll - os=4.0 img=1.0 sys=4.0
                  "cyggdbm_compat-4.dll" v0.0 ts=2003/8/11 4:13
   69k 2003/08/10 C:\cygwin\bin\cyggettextlib-0-12-1.dll - os=4.0 img=1.0 sys=4.0
                  "cyggettextlib-0-12-1.dll" v0.0 ts=2003/8/11 0:10
   12k 2003/08/10 C:\cygwin\bin\cyggettextpo-0.dll - os=4.0 img=1.0 sys=4.0
                  "cyggettextpo-0.dll" v0.0 ts=2003/8/11 0:11
  134k 2003/08/10 C:\cygwin\bin\cyggettextsrc-0-12-1.dll - os=4.0 img=1.0 sys=4.0
                  "cyggettextsrc-0-12-1.dll" v0.0 ts=2003/8/11 0:10
   29k 2003/08/10 C:\cygwin\bin\cyghistory5.dll - os=4.0 img=1.0 sys=4.0
                  "cyghistory5.dll" v0.0 ts=2003/8/11 1:16
  958k 2003/08/10 C:\cygwin\bin\cygiconv-2.dll - os=4.0 img=1.0 sys=4.0
                  "cygiconv-2.dll" v0.0 ts=2003/8/10 22:57
   22k 2001/12/13 C:\cygwin\bin\cygintl-1.dll - os=4.0 img=1.0 sys=4.0
                  "cygintl-1.dll" v0.0 ts=2001/12/13 10:28
   37k 2003/08/10 C:\cygwin\bin\cygintl-2.dll - os=4.0 img=1.0 sys=4.0
                  "cygintl-2.dll" v0.0 ts=2003/8/10 23:50
   21k 2001/06/20 C:\cygwin\bin\cygintl.dll - os=4.0 img=1.0 sys=4.0
                  "cygintl.dll" v0.0 ts=2001/6/20 19:09
   48k 2003/08/10 C:\cygwin\bin\cygjbig1.dll - os=4.0 img=1.0 sys=4.0
                  "cygjbig1.dll" v0.0 ts=2003/8/11 1:58
  132k 2003/08/11 C:\cygwin\bin\cygjpeg-62.dll - os=4.0 img=1.0 sys=4.0
                  "cygjpeg-62.dll" v0.0 ts=2003/8/11 2:37
  119k 2002/02/09 C:\cygwin\bin\cygjpeg6b.dll - os=4.0 img=1.0 sys=4.0
                  "cygjpeg6b.dll" v0.0 ts=2002/2/9 6:19
   59k 2002/09/20 C:\cygwin\bin\cygkpathsea-3-3-7.dll - os=4.0 img=1.0 sys=4.0
                  "cygkpathsea-3-3-7.dll" v0.0 ts=2002/9/20 16:54
   60k 2003/07/27 C:\cygwin\bin\cygkpathsea-3abi13.dll - os=4.0 img=1.0 sys=4.0
                  "cygkpathsea-3abi13.dll" v0.0 ts=2003/7/27 22:23
   32k 2003/08/18 C:\cygwin\bin\cygltdl-3.dll - os=4.0 img=1.0 sys=4.0
                  "cygltdl-3.dll" v0.0 ts=2003/8/18 7:35
   26k 2001/04/25 C:\cygwin\bin\cygmenu5.dll - os=4.0 img=1.0 sys=4.0
                  "cygmenu5.dll" v0.0 ts=2001/4/25 7:27
   20k 2002/01/09 C:\cygwin\bin\cygmenu6.dll - os=4.0 img=1.0 sys=4.0
                  "cygmenu6.dll" v0.0 ts=2002/1/9 7:03
   29k 2003/08/09 C:\cygwin\bin\cygmenu7.dll - os=4.0 img=1.0 sys=4.0
                  "cygmenu7.dll" v0.0 ts=2003/8/9 11:25
  156k 2001/04/25 C:\cygwin\bin\cygncurses++5.dll - os=4.0 img=1.0 sys=4.0
                  "cygncurses++5.dll" v0.0 ts=2001/4/25 7:29
  175k 2002/01/09 C:\cygwin\bin\cygncurses++6.dll - os=4.0 img=1.0 sys=4.0
                  "cygncurses++6.dll" v0.0 ts=2002/1/9 7:03
  226k 2001/04/25 C:\cygwin\bin\cygncurses5.dll - os=4.0 img=1.0 sys=4.0
                  "cygncurses5.dll" v0.0 ts=2001/4/25 7:17
  202k 2002/01/09 C:\cygwin\bin\cygncurses6.dll - os=4.0 img=1.0 sys=4.0
                  "cygncurses6.dll" v0.0 ts=2002/1/9 7:03
  224k 2003/08/09 C:\cygwin\bin\cygncurses7.dll - os=4.0 img=1.0 sys=4.0
                  "cygncurses7.dll" v0.0 ts=2003/8/9 11:24
   15k 2001/04/25 C:\cygwin\bin\cygpanel5.dll - os=4.0 img=1.0 sys=4.0
                  "cygpanel5.dll" v0.0 ts=2001/4/25 7:27
   12k 2002/01/09 C:\cygwin\bin\cygpanel6.dll - os=4.0 img=1.0 sys=4.0
                  "cygpanel6.dll" v0.0 ts=2002/1/9 7:03
   19k 2003/08/09 C:\cygwin\bin\cygpanel7.dll - os=4.0 img=1.0 sys=4.0
                  "cygpanel7.dll" v0.0 ts=2003/8/9 11:24
   67k 2003/08/22 C:\cygwin\bin\cygpcre-0.dll - os=4.0 img=1.0 sys=4.0
                  "cygpcre-0.dll" v0.0 ts=2003/8/22 12:41
   63k 2003/04/11 C:\cygwin\bin\cygpcre.dll - os=4.0 img=1.0 sys=4.0
                  "cygpcre.dll" v0.0 ts=2003/4/11 10:31
   15k 2003/08/22 C:\cygwin\bin\cygpcreposix-0.dll - os=4.0 img=1.0 sys=4.0
                  "cygpcreposix-0.dll" v0.0 ts=2003/8/22 12:41
   61k 2003/04/11 C:\cygwin\bin\cygpcreposix.dll - os=4.0 img=1.0 sys=4.0
                  "cygpcreposix.dll" v0.0 ts=2003/4/11 10:31
 1100k 2003/08/29 C:\cygwin\bin\cygperl5_8_0.dll - os=4.0 img=1.0 sys=4.0
                  "cygperl5_8_0.dll" v0.0 ts=2003/8/29 12:20
  168k 2003/08/10 C:\cygwin\bin\cygpng10.dll - os=4.0 img=1.0 sys=4.0
                  "cygpng10.dll" v0.0 ts=2003/8/11 0:31
  173k 2003/08/10 C:\cygwin\bin\cygpng12.dll - os=4.0 img=1.0 sys=4.0
                  "cygpng12.dll" v0.0 ts=2003/8/11 0:35
  170k 2002/01/21 C:\cygwin\bin\cygpng2.dll - os=4.0 img=1.0 sys=4.0
                  "cygpng2.dll" v0.0 ts=2002/1/21 2:05
   22k 2002/06/09 C:\cygwin\bin\cygpopt-0.dll - os=4.0 img=1.0 sys=4.0
                  "cygpopt-0.dll" v0.0 ts=2002/6/9 7:45
  148k 2003/08/10 C:\cygwin\bin\cygreadline5.dll - os=4.0 img=1.0 sys=4.0
                  "cygreadline5.dll" v0.0 ts=2003/8/11 1:16
   66k 2001/11/20 C:\cygwin\bin\cygregex.dll - os=4.0 img=1.0 sys=4.0
                  "cygregex.dll" v0.0 ts=2001/11/20 15:44
  176k 2003/08/11 C:\cygwin\bin\cygssl-0.9.7.dll - os=4.0 img=1.0 sys=4.0
                  "cygssl-0.9.7.dll" v0.0 ts=2003/8/11 10:58
  165k 2003/04/11 C:\cygwin\bin\cygssl.dll - os=4.0 img=1.0 sys=4.0
                  "cygssl.dll" v0.0 ts=2003/4/11 12:37
  281k 2003/02/24 C:\cygwin\bin\cygtiff3.dll - os=4.0 img=1.0 sys=4.0
                  "cygtiff3.dll" v0.0 ts=2003/2/24 5:58
  282k 2003/08/11 C:\cygwin\bin\cygtiff4.dll - os=4.0 img=1.0 sys=4.0
                  "cygtiff4.dll" v0.0 ts=2003/8/11 4:32
  903k 2003/06/09 C:\cygwin\bin\cygxml2-2.dll - os=4.0 img=1.0 sys=4.0
                  "cygxml2-2.dll" v0.0 ts=2003/6/10 1:49
   50k 2003/08/09 C:\cygwin\bin\cygXpm-noX4.dll - os=4.0 img=1.0 sys=4.0
                  "cygXpm-noX4.dll" v0.0 ts=2003/8/9 9:21
   54k 2003/08/09 C:\cygwin\bin\cygXpm-X4.dll - os=4.0 img=1.0 sys=4.0
                  "cygXpm-X4.dll" v0.0 ts=2003/8/9 9:22
  174k 2003/06/10 C:\cygwin\bin\cygxslt-1.dll - os=4.0 img=1.0 sys=4.0
                  "cygxslt-1.dll" v0.0 ts=2003/6/10 19:42
   13k 2003/06/10 C:\cygwin\bin\cygxsltbreakpoint-1.dll - os=4.0 img=1.0 sys=4.0
                  "cygxsltbreakpoint-1.dll" v0.0 ts=2003/6/10 20:07
   60k 2003/08/09 C:\cygwin\bin\cygz.dll - os=4.0 img=1.0 sys=4.0
                  "cygz.dll" v0.0 ts=2003/8/9 8:28
  945k 2003/09/01 C:\cygwin\bin\cygwin1.dll - os=4.0 img=1.0 sys=4.0
                  "cygwin1.dll" v0.0 ts=2003/9/1 19:15
    Cygwin DLL version info:
        DLL version: 1.5.3
        DLL epoch: 19
        DLL bad signal mask: 19005
        DLL old termios: 5
        DLL malloc env: 28
        API major: 0
        API minor: 90
        Shared data: 3
        DLL identifier: cygwin1
        Mount registry: 2
        Cygnus registry name: Cygnus Solutions
        Cygwin registry name: Cygwin
        Program options name: Program Options
        Cygwin mount registry name: mounts v2
        Cygdrive flags: cygdrive flags
        Cygdrive prefix: cygdrive prefix
        Cygdrive default prefix: 
        Build date: Mon Sep 1 13:15:28 EDT 2003
        Shared id: cygwin1S3

  671k 2003/08/01 C:\cygwin\usr\X11R6\bin\cygdps-1.dll - os=4.0 img=1.0 sys=4.0
                  "cygdps-1.dll" v0.0 ts=2003/8/1 6:06
   53k 2003/08/01 C:\cygwin\usr\X11R6\bin\cygdpstk-1.dll - os=4.0 img=1.0 sys=4.0
                  "cygdpstk-1.dll" v0.0 ts=2003/8/1 6:06
  146k 2003/08/01 C:\cygwin\usr\X11R6\bin\cygexpat-1.dll - os=4.0 img=1.0 sys=4.0
                  "cygexpat-1.dll" v0.0 ts=2003/8/1 6:06
  174k 2003/08/01 C:\cygwin\usr\X11R6\bin\cygfontconfig-1.dll - os=4.0 img=1.0 sys=4.0
                  "cygfontconfig-1.dll" v0.0 ts=2003/8/1 6:06
  340k 2003/08/01 C:\cygwin\usr\X11R6\bin\cygfreetype-9.dll - os=4.0 img=1.0 sys=4.0
                  "cygfreetype-9.dll" v0.0 ts=2003/8/1 6:06
  524k 2003/08/01 C:\cygwin\usr\X11R6\bin\cygGL-1.dll - os=4.0 img=1.0 sys=4.0
                  "cygGL-1.dll" v0.0 ts=2003/8/1 6:05
  592k 2003/08/01 C:\cygwin\usr\X11R6\bin\cygGLU-1.dll - os=4.0 img=1.0 sys=4.0
                  "cygGLU-1.dll" v0.0 ts=2003/8/1 6:05
  109k 2003/08/01 C:\cygwin\usr\X11R6\bin\cygICE-6.dll - os=4.0 img=1.0 sys=4.0
                  "cygICE-6.dll" v0.0 ts=2003/8/1 6:05
   25k 2003/08/01 C:\cygwin\usr\X11R6\bin\cygoldX-6.dll - os=4.0 img=1.0 sys=4.0
                  "cygoldX-6.dll" v0.0 ts=2003/8/1 6:04
 1510k 2003/08/01 C:\cygwin\usr\X11R6\bin\cygOSMesa-4.dll - os=4.0 img=1.0 sys=4.0
                  "cygOSMesa-4.dll" v0.0 ts=2003/8/1 6:05
   41k 2002/05/14 C:\cygwin\usr\X11R6\bin\cygPropList-0.dll - os=4.0 img=1.0 sys=4.0
                  "cygPropList-0.dll" v0.0 ts=2002/5/14 5:13
   40k 2003/08/01 C:\cygwin\usr\X11R6\bin\cygpsres-1.dll - os=4.0 img=1.0 sys=4.0
                  "cygpsres-1.dll" v0.0 ts=2003/8/1 6:06
   54k 2003/08/01 C:\cygwin\usr\X11R6\bin\cygSM-6.dll - os=4.0 img=1.0 sys=4.0
                  "cygSM-6.dll" v0.0 ts=2003/8/1 6:05
 1067k 2003/08/01 C:\cygwin\usr\X11R6\bin\cygX11-6.dll - os=4.0 img=1.0 sys=4.0
                  "cygX11-6.dll" v0.0 ts=2003/8/1 6:04
   57k 2003/08/01 C:\cygwin\usr\X11R6\bin\cygXcursor-1.dll - os=4.0 img=1.0 sys=4.0
                  "cygXcursor-1.dll" v0.0 ts=2003/8/1 6:06
   77k 2003/08/01 C:\cygwin\usr\X11R6\bin\cygXext-6.dll - os=4.0 img=1.0 sys=4.0
                  "cygXext-6.dll" v0.0 ts=2003/8/1 6:05
   83k 2003/08/01 C:\cygwin\usr\X11R6\bin\cygXft-1.dll - os=4.0 img=1.0 sys=4.0
                  "cygXft-1.dll" v0.0 ts=2003/8/1 6:06
  105k 2003/08/01 C:\cygwin\usr\X11R6\bin\cygXft-2.dll - os=4.0 img=1.0 sys=4.0
                  "cygXft-2.dll" v0.0 ts=2003/8/1 6:06
   53k 2003/08/01 C:\cygwin\usr\X11R6\bin\cygXi-6.dll - os=4.0 img=1.0 sys=4.0
                  "cygXi-6.dll" v0.0 ts=2003/8/1 6:05
   29k 2003/08/01 C:\cygwin\usr\X11R6\bin\cygXmuu-1.dll - os=4.0 img=1.0 sys=4.0
                  "cygXmuu-1.dll" v0.0 ts=2003/8/1 6:05
   58k 2003/08/01 C:\cygwin\usr\X11R6\bin\cygXp-6.dll - os=4.0 img=1.0 sys=4.0
                  "cygXp-6.dll" v0.0 ts=2003/8/1 6:05
   81k 2003/08/01 C:\cygwin\usr\X11R6\bin\cygXpm-4.dll - os=4.0 img=1.0 sys=4.0
                  "cygXpm-4.dll" v0.0 ts=2003/8/1 6:05
   29k 2003/08/01 C:\cygwin\usr\X11R6\bin\cygXrandr-2.dll - os=4.0 img=1.0 sys=4.0
                  "cygXrandr-2.dll" v0.0 ts=2003/8/1 6:06
   49k 2003/08/01 C:\cygwin\usr\X11R6\bin\cygXrender-1.dll - os=4.0 img=1.0 sys=4.0
                  "cygXrender-1.dll" v0.0 ts=2003/8/1 6:06
  384k 2003/08/01 C:\cygwin\usr\X11R6\bin\cygXTrap-6.dll - os=4.0 img=1.0 sys=4.0
                  "cygXTrap-6.dll" v0.0 ts=2003/8/1 6:06
   38k 2003/08/01 C:\cygwin\usr\X11R6\bin\cygXtst-6.dll - os=4.0 img=1.0 sys=4.0
                  "cygXtst-6.dll" v0.0 ts=2003/8/1 6:05
   34k 2003/08/01 C:\cygwin\usr\X11R6\bin\cygXv-1.dll - os=4.0 img=1.0 sys=4.0
                  "cygXv-1.dll" v0.0 ts=2003/8/1 6:05

Cygwin Package Information
Last downloaded files to: D:\cyginst
Last downloaded files from: ftp://mirrors.rcn.net/mirrors/sources.redhat.com/cygwin

Package                 Version            
_update-info-dir        00211-1            
ash                     20020731-3         
autoconf                2.57a-1            
autoconf-devel          2.57-2             
autoconf-stable         2.13-5             
automake                1.7.5a-1           
automake-devel          1.7.6-2            
automake-stable         1.4p5-6            
base-files              2.5-1              
base-passwd             1.1-1              
bash                    2.05b-13           
bc                      1.06-1             
binutils                20030901-1         
bison                   20030307-1         
byacc                   1.9-1              
bzip2                   1.0.2-5            
clear                   1.0-1              
compface                1.4-5              
cpio                    2.5-3              
cron                    3.0.1-11           
crypt                   1.0-2              
ctags                   5.5-4              
curl                    7.10.4-1           
cvs                     1.11.6-3           
cygrunsrv               0.96-2             
cygutils                1.2.1-2            
cygwin                  1.5.3-1            
cygwin-doc              1.3-6              
dejagnu                 20021217-2         
diff                    1.0-1              
diffutils               2.8.4-1            
dpkg                    1.10.4-2           
ed                      0.2-1              
enscript                1.6.3-3            
expat                   1.95.6-1           
expect                  20030128-1         
figlet                  2.2-1              
file                    4.03-2             
fileutils               4.1-2              
findutils               4.1.7-4            
flex                    2.5.4-2            
fortune                 1.8-2              
gawk                    3.1.3-3            
gcc                     3.2-3              
gcc-mingw               20020817-5         
gcc2                    2.95.3-10          
gdb                     20030901-1         
gdbm                    1.8.3-7            
gettext                 0.12.1-3           
gettext-devel           0.12.1-3           
ghostscript             7.05-2             
ghostscript-base        7.05-2             
gnupg                   1.2.2-1            
gperf                   2.7.2-1            
grace                   5.1.12-1           
grep                    2.5-1              
groff                   1.18.1-2           
gzip                    1.3.3-4            
indent                  2.2.8-1            
inetutils               1.3.2-24           
irc                     20010101-3         
jbigkit                 1.5-3              
jpeg                    6b-11              
less                    381-1              
lesstif                 0.93.41-1          
libbz2_0                1.0.2-1            
libbz2_1                1.0.2-5            
libcharset1             1.9.1-3            
libdb3.1                3.1.17-2           
libgdbm                 1.8.0-5            
libgdbm-devel           1.8.3-7            
libgdbm3                1.8.3-3            
libgdbm4                1.8.3-7            
libgettextpo0           0.12.1-3           
libiconv                1.9.1-3            
libiconv2               1.9.1-3            
libintl                 0.10.38-3          
libintl1                0.10.40-1          
libintl2                0.12.1-3           
libjpeg62               6b-11              
libjpeg6b               6b-8               
libkpathsea3            20020911-1         
libkpathsea3abi13       2.0.2-2            
libltdl3                1.5-3              
libncurses5             5.2-1              
libncurses6             5.2-8              
libncurses7             5.3-4              
libpcre                 4.1-1              
libpcre0                4.4-1              
libpng                  1.2.5-4            
libpng10                1.0.15-4           
libpng12                1.2.5-4            
libpng12-devel          1.2.5-4            
libpng2                 1.0.12-1           
libpopt0                1.6.4-4            
libPropList             0.10.1-3           
libreadline4            4.1-2              
libreadline5            4.3-5              
libtiff-devel           3.6.0-5            
libtiff3                3.6.0-2            
libtiff4                3.6.0-5            
libtool                 1.5a-1             
libtool-devel           1.5-3              
libtool-stable          1.4.3-2            
libxml2                 2.5.7-1            
libxslt                 1.0.30-2           
links                   0.96-1             
login                   1.9-7              
lynx                    2.8.4-7            
m4                      1.4-1              
make                    3.80-1             
man                     1.5j-2             
mc                      4.6.0-4            
mingw                   20010917-1         
mingw-runtime           3.0-1              
mktemp                  1.5-3              
mt                      2.0.1-2            
mutt                    1.4-1              
nano                    1.2.2-1            
ncftp                   3.1.4-1            
ncurses                 5.3-4              
newlib-man              20020801           
openbox                 0.99.1-3           
opengl                  1.1.0-6            
openssh                 3.6.1p2-2          
openssl                 0.9.7b-3           
openssl096              0.9.6j-1           
patch                   2.5.8-7            
pcre                    4.4-1              
pcre-doc                4.4-1              
perl                    5.8.0-5            
perl_manpages           5.8.0-5            
pkgconfig               0.15.0-4           
popt                    1.6.4-4            
python                  2.3-2              
rcs                     5.7-3              
readline                4.3-5              
regex                   4.4-2              
robots                  2.0-3              
rsync                   2.5.6-1            
rxvt                    2.7.10-3           
sed                     4.0.7-3            
sh-utils                2.0.15-4           
sharutils               4.2.1-3            
shutdown                1.3-1              
ssmtp                   2.38.7-4           
tar                     1.13.25-3          
tcltk                   20030901-1         
tcsh                    6.12.00-7          
termcap                 20021106-2         
terminfo                5.3_20030726-1     
tetex-beta              20020911-1         
tetex-bin               2.0.2-2            
texinfo                 4.2-4              
textutils               2.0.21-1           
tidy                    030201-1           
tiff                    3.6.0-5            
time                    1.7-1              
units                   1.77-1             
unzip                   5.50-5             
vim                     6.2-3              
w32api                  2.3-1              
wget                    1.8.2-2            
which                   1.5-2              
whois                   4.6.2-1            
WindowMaker             0.80.0-2           
XFree86-base            4.3.0-1            
XFree86-bin             4.3.0-1            
XFree86-etc             4.3.0-3            
XFree86-fenc            4.2.0-3            
XFree86-fnts            4.2.0-3            
XFree86-lib             4.3.0-1            
XFree86-lib-compat      4.3.0-1            
XFree86-man             4.3.0-1            
XFree86-prog            4.3.0-4            
XFree86-startup-scripts 4.2.0-5            
XFree86-xserv           4.3.0-6            
xpm-nox                 4.2.0-4            
zip                     2.3-5              
zlib                    1.1.4-4            
Use -h to see help about each section


[-- Attachment #2: Type: application/pgp-signature, Size: 251 bytes --]

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: Problem with patch 2.5.8-7
  2003-09-06 20:52   ` Volker Quetschke
  2003-09-06 21:22     ` Igor Pechtchanski
  2003-09-06 21:47     ` Volker Quetschke
@ 2003-09-07  8:29     ` Corinna Vinschen
  2 siblings, 0 replies; 9+ messages in thread
From: Corinna Vinschen @ 2003-09-07  8:29 UTC (permalink / raw)
  To: cygwin

On Sat, Sep 06, 2003 at 10:56:19PM +0200, Volker Quetschke wrote:
> >>$ patch -i dos_lineends.patch -b -p2
> >>fails.
> >>vc_common.mak is in: ./STLport-4.0/src/vc_common.mak
> 
> >So it fails.  Interesting.  I wonder *how* it fails though. 
> >http://cygwin.com/problems.html
> Ok, I stepped into the usual trap. If it fails for me, it has to fail for
> you also :-(

It fails for me as well *iff* I change your two attached files to
having CRLF line endings.  Grr.  Thanks for the report, though.

I've uploaded a patched patch (2.5.8-8).

Corinna

-- 
Corinna Vinschen                  Please, send mails regarding Cygwin to
Cygwin Developer                                mailto:cygwin@cygwin.com
Red Hat, Inc.

--
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple
Problem reports:       http://cygwin.com/problems.html
Documentation:         http://cygwin.com/docs.html
FAQ:                   http://cygwin.com/faq/

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: Problem with patch 2.5.8-7
@ 2003-09-15  2:39 Volker Quetschke
  0 siblings, 0 replies; 9+ messages in thread
From: Volker Quetschke @ 2003-09-15  2:39 UTC (permalink / raw)
  To: cygwin


[-- Attachment #1.1: Type: text/plain, Size: 219 bytes --]

> This time I attached the output of cygcheck -s -v -r.

Oops, now it does ;-)

-- 
PGP/GPG key  (ID: 0x9F8A785D)  available  from  wwwkeys.de.pgp.net
key-fingerprint 550D F17E B082 A3E9 F913  9E53 3D35 C9BA 9F8A 785D


[-- Attachment #1.2: cygcheck.out --]
[-- Type: text/plain, Size: 26561 bytes --]


Cygwin Win95/NT Configuration Diagnostics
Current System Time: Sat Sep 06 22:48:14 2003

Windows 2000 Professional Ver 5.0 Build 2195 Service Pack 3

Path:	C:\cygwin\usr\local\bin
	C:\cygwin\bin
	C:\cygwin\bin
	c:\WINNT\system32
	c:\WINNT
	c:\WINNT\System32\Wbem
	c:\Programme\Gemeinsame Dateien\Ulead Systems\MPEG
	c:\Programme\ATI Technologies\ATI Control Panel
	c:\Programme\Executive Software\DiskeeperWorkstation\
	C:\cygwin\usr\X11R6\bin

Output from C:\cygwin\bin\id.exe (nontsec)
UID: 1002(q) GID: 513(none)
513(none)

Output from C:\cygwin\bin\id.exe (ntsec)
UID: 1002(q) GID: 513(none)
513(none)      544(admins)    545(benutzer)

SysDir: C:\WINNT\System32
WinDir: C:\WINNT

CYGWIN = `tty codepage:oem'
HOME = `C:\cygwin\home\qloc'
MAKE_MODE = `unix'
PWD = `/tmp/patchtest'
USER = `q'

ALLUSERSPROFILE = `C:\Dokumente und Einstellungen\All Users'
APPDATA = `C:\Dokumente und Einstellungen\q\Anwendungsdaten'
COLORFGBG = `0;default;15'
COLORTERM = `rxvt-xpm'
COMMONPROGRAMFILES = `C:\Programme\Gemeinsame Dateien'
COMPUTERNAME = `LISI'
COMSPEC = `C:\WINNT\system32\cmd.exe'
DISKEEPERICON = `C:\Programme\Executive Software\DiskeeperWorkstation\'
DISPLAY = `:0'
EDITOR = `nano -w'
FTP_PASSIVE = `1'
HOMEDRIVE = `C:'
HOMEPATH = `\'
HOSTNAME = `lisi'
JOETERM = `linux'
LOGONSERVER = `\\LISI'
LS_COLORS = `no=00:fi=00:di=01;34:ln=01;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arj=01;31:*.taz=01;31:*.lzh=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.gz=01;31:*.bz2=01;31:*.deb=01;31:*.rpm=01;31:*.jpg=01;35:*.png=01;35:*.gif=01;35:*.bmp=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.png=01;35:*.mpg=01;35:*.avi=01;35:*.fli=01;35:*.gl=01;35:*.dl=01;35:'
MANPATH = `:/usr/ssl/man'
NUMBER_OF_PROCESSORS = `1'
OLDPWD = `/tmp/patchtest/STLport-4.0'
OS2LIBPATH = `C:\WINNT\system32\os2\dll;'
OS = `Windows_NT'
PATHEXT = `.COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH'
PERLIO = `perlio'
PROCESSOR_ARCHITECTURE = `x86'
PROCESSOR_IDENTIFIER = `x86 Family 6 Model 6 Stepping 2, AuthenticAMD'
PROCESSOR_LEVEL = `6'
PROCESSOR_REVISION = `0602'
PROGRAMFILES = `C:\Programme'
PS1 = `[$USER@$HOSTNAME]\w:{\!}:
\$ '
SHLVL = `1'
SYSTEMDRIVE = `C:'
SYSTEMROOT = `C:\WINNT'
TEMP = `d:\temp'
TERM = `xterm'
TMP = `d:\temp'
TZ = `CET-1CEST-2,M3.5.0/02:00:00,M10.5.0/03:00:00'
USERDOMAIN = `LISI'
USERNAME = `q'
USERPROFILE = `C:\Dokumente und Einstellungen\q'
WINDIR = `C:\WINNT'
WINDOWID = `168047224'
_ = `/bin/cygcheck'

HKEY_CURRENT_USER\Software\Cygnus Solutions
HKEY_CURRENT_USER\Software\Cygnus Solutions\Cygwin
HKEY_CURRENT_USER\Software\Cygnus Solutions\Cygwin\mounts v2
  (default) = `/cygdrive'
  cygdrive flags = 0x00000022
HKEY_CURRENT_USER\Software\Cygnus Solutions\Cygwin\Program Options
HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\MenuOrder\Start Menu\Programs\Cygnus Solutions
  (default) = (unsupported type)
HKEY_LOCAL_MACHINE\SOFTWARE\Cygnus Solutions
HKEY_LOCAL_MACHINE\SOFTWARE\Cygnus Solutions\Cygwin
HKEY_LOCAL_MACHINE\SOFTWARE\Cygnus Solutions\Cygwin\mounts v2
  (default) = `/cygdrive'
  cygdrive flags = 0x00000022
HKEY_LOCAL_MACHINE\SOFTWARE\Cygnus Solutions\Cygwin\mounts v2\/
  (default) = `C:/cygwin'
  flags = 0x0000000a
HKEY_LOCAL_MACHINE\SOFTWARE\Cygnus Solutions\Cygwin\mounts v2\/usr/bin
  (default) = `C:/cygwin/bin'
  flags = 0x0000000a
HKEY_LOCAL_MACHINE\SOFTWARE\Cygnus Solutions\Cygwin\mounts v2\/usr/lib
  (default) = `C:/cygwin/lib'
  flags = 0x0000000a
HKEY_LOCAL_MACHINE\SOFTWARE\Cygnus Solutions\Cygwin\mounts v2\/usr/X11R6/lib/X11/fonts
  (default) = `C:\cygwin\usr\X11R6\lib\X11\fonts'
  flags = 0x0000000a
HKEY_LOCAL_MACHINE\SOFTWARE\Cygnus Solutions\Cygwin\mounts v2\/w1
  (default) = `e:\w1'
  flags = 0x0000000a
HKEY_LOCAL_MACHINE\SOFTWARE\Cygnus Solutions\Cygwin\mounts v2\/w2
  (default) = `e:\w2'
  flags = 0x0000000a
HKEY_LOCAL_MACHINE\SOFTWARE\Cygnus Solutions\Cygwin\Program Options

a:  fd           N/A    N/A                    
c:  hd  NTFS    8063Mb  96% CP CS UN PA FC     
d:  hd  FAT32   8087Mb  70% CP    UN           FIRE_E1
e:  hd  NTFS   30215Mb  65% CP CS UN PA FC     FIRE_E2
f:  hd  FAT32  10242Mb  95% CP    UN           FIRE_E3
g:  cd           N/A    N/A                    
h:  cd           N/A    N/A                    
p:  net NTFS    8001Mb  47% CP CS UN PA FC     
q:  net NTFS   35204Mb  63% CP CS UN PA FC     Lager1

                                  /cygdrive                 user    binmode,cygdrive
C:/cygwin                          /                         system  binmode
C:/cygwin/bin                      /usr/bin                  system  binmode
C:/cygwin/lib                      /usr/lib                  system  binmode
C:\cygwin\usr\X11R6\lib\X11\fonts  /usr/X11R6/lib/X11/fonts  system  binmode
e:\w1                              /w1                       system  binmode
e:\w2                              /w2                       system  binmode
                                  /cygdrive                 system  binmode,cygdrive

Found: C:\cygwin\bin\awk.exe
Found: C:\cygwin\bin\bash.exe
Found: C:\cygwin\bin\cat.exe
Found: C:\cygwin\bin\cp.exe
Found: C:\cygwin\bin\cpp.exe
Found: C:\cygwin\bin\find.exe
Found: C:\cygwin\bin\gcc.exe
Found: C:\cygwin\bin\gdb.exe
Found: C:\cygwin\bin\grep.exe
Found: C:\cygwin\bin\ld.exe
Found: C:\cygwin\bin\ls.exe
Found: C:\cygwin\bin\make.exe
Found: C:\cygwin\bin\mv.exe
Found: C:\cygwin\bin\rm.exe
Found: C:\cygwin\bin\sed.exe
Found: C:\cygwin\bin\sh.exe
Found: C:\cygwin\bin\tar.exe

   61k 2003/08/09 C:\cygwin\bin\cygbz2-1.dll - os=4.0 img=1.0 sys=4.0
                  "cygbz2-1.dll" v0.0 ts=2003/8/9 8:35
   54k 2002/01/27 C:\cygwin\bin\cygbz21.0.dll - os=4.0 img=1.0 sys=4.0
                  "cygbz21.0.dll" v0.0 ts=2002/1/27 2:07
   14k 2003/08/10 C:\cygwin\bin\cygcharset-1.dll - os=4.0 img=1.0 sys=4.0
                  "cygcharset-1.dll" v0.0 ts=2003/8/10 22:57
  849k 2003/08/11 C:\cygwin\bin\cygcrypto-0.9.7.dll - os=4.0 img=1.0 sys=4.0
                  "cygcrypto-0.9.7.dll" v0.0 ts=2003/8/11 10:58
  645k 2003/04/11 C:\cygwin\bin\cygcrypto.dll - os=4.0 img=1.0 sys=4.0
                  "cygcrypto.dll" v0.0 ts=2003/4/11 12:37
  551k 2003/04/02 C:\cygwin\bin\cygcurl-2.dll - os=4.0 img=1.0 sys=4.0
                  "cygcurl-2.dll" v0.0 ts=2003/4/2 22:09
  380k 2002/07/24 C:\cygwin\bin\cygdb-3.1.dll - os=4.0 img=1.0 sys=4.0
                  "cygdb-3.1.dll" v0.0 ts=2002/7/24 18:24
  487k 2002/07/24 C:\cygwin\bin\cygdb_cxx-3.1.dll - os=4.0 img=1.0 sys=4.0
                  "cygdb_cxx-3.1.dll" v0.0 ts=2002/7/24 18:25
  135k 2003/04/13 C:\cygwin\bin\cygexpat-0.dll - os=4.0 img=1.0 sys=4.0
                  "cygexpat-0.dll" v0.0 ts=2003/4/13 23:24
   61k 2003/06/10 C:\cygwin\bin\cygexslt-0.dll - os=4.0 img=1.0 sys=4.0
                  "cygexslt-0.dll" v0.0 ts=2003/6/10 20:07
   45k 2001/04/25 C:\cygwin\bin\cygform5.dll - os=4.0 img=1.0 sys=4.0
                  "cygform5.dll" v0.0 ts=2001/4/25 7:28
   35k 2002/01/09 C:\cygwin\bin\cygform6.dll - os=4.0 img=1.0 sys=4.0
                  "cygform6.dll" v0.0 ts=2002/1/9 7:03
   48k 2003/08/09 C:\cygwin\bin\cygform7.dll - os=4.0 img=1.0 sys=4.0
                  "cygform7.dll" v0.0 ts=2003/8/9 11:25
   28k 2003/07/20 C:\cygwin\bin\cyggdbm-3.dll - os=4.0 img=1.0 sys=4.0
                  "cyggdbm-3.dll" v0.0 ts=2003/7/20 9:58
   30k 2003/08/11 C:\cygwin\bin\cyggdbm-4.dll - os=4.0 img=1.0 sys=4.0
                  "cyggdbm-4.dll" v0.0 ts=2003/8/11 4:12
   19k 2003/03/22 C:\cygwin\bin\cyggdbm.dll - os=4.0 img=1.0 sys=4.0
                  "cyggdbm.dll" v0.0 ts=2002/2/20 4:05
   15k 2003/07/20 C:\cygwin\bin\cyggdbm_compat-3.dll - os=4.0 img=1.0 sys=4.0
                  "cyggdbm_compat-3.dll" v0.0 ts=2003/7/20 10:00
   15k 2003/08/11 C:\cygwin\bin\cyggdbm_compat-4.dll - os=4.0 img=1.0 sys=4.0
                  "cyggdbm_compat-4.dll" v0.0 ts=2003/8/11 4:13
   69k 2003/08/10 C:\cygwin\bin\cyggettextlib-0-12-1.dll - os=4.0 img=1.0 sys=4.0
                  "cyggettextlib-0-12-1.dll" v0.0 ts=2003/8/11 0:10
   12k 2003/08/10 C:\cygwin\bin\cyggettextpo-0.dll - os=4.0 img=1.0 sys=4.0
                  "cyggettextpo-0.dll" v0.0 ts=2003/8/11 0:11
  134k 2003/08/10 C:\cygwin\bin\cyggettextsrc-0-12-1.dll - os=4.0 img=1.0 sys=4.0
                  "cyggettextsrc-0-12-1.dll" v0.0 ts=2003/8/11 0:10
   29k 2003/08/10 C:\cygwin\bin\cyghistory5.dll - os=4.0 img=1.0 sys=4.0
                  "cyghistory5.dll" v0.0 ts=2003/8/11 1:16
  958k 2003/08/10 C:\cygwin\bin\cygiconv-2.dll - os=4.0 img=1.0 sys=4.0
                  "cygiconv-2.dll" v0.0 ts=2003/8/10 22:57
   22k 2001/12/13 C:\cygwin\bin\cygintl-1.dll - os=4.0 img=1.0 sys=4.0
                  "cygintl-1.dll" v0.0 ts=2001/12/13 10:28
   37k 2003/08/10 C:\cygwin\bin\cygintl-2.dll - os=4.0 img=1.0 sys=4.0
                  "cygintl-2.dll" v0.0 ts=2003/8/10 23:50
   21k 2001/06/20 C:\cygwin\bin\cygintl.dll - os=4.0 img=1.0 sys=4.0
                  "cygintl.dll" v0.0 ts=2001/6/20 19:09
   48k 2003/08/10 C:\cygwin\bin\cygjbig1.dll - os=4.0 img=1.0 sys=4.0
                  "cygjbig1.dll" v0.0 ts=2003/8/11 1:58
  132k 2003/08/11 C:\cygwin\bin\cygjpeg-62.dll - os=4.0 img=1.0 sys=4.0
                  "cygjpeg-62.dll" v0.0 ts=2003/8/11 2:37
  119k 2002/02/09 C:\cygwin\bin\cygjpeg6b.dll - os=4.0 img=1.0 sys=4.0
                  "cygjpeg6b.dll" v0.0 ts=2002/2/9 6:19
   59k 2002/09/20 C:\cygwin\bin\cygkpathsea-3-3-7.dll - os=4.0 img=1.0 sys=4.0
                  "cygkpathsea-3-3-7.dll" v0.0 ts=2002/9/20 16:54
   60k 2003/07/27 C:\cygwin\bin\cygkpathsea-3abi13.dll - os=4.0 img=1.0 sys=4.0
                  "cygkpathsea-3abi13.dll" v0.0 ts=2003/7/27 22:23
   32k 2003/08/18 C:\cygwin\bin\cygltdl-3.dll - os=4.0 img=1.0 sys=4.0
                  "cygltdl-3.dll" v0.0 ts=2003/8/18 7:35
   26k 2001/04/25 C:\cygwin\bin\cygmenu5.dll - os=4.0 img=1.0 sys=4.0
                  "cygmenu5.dll" v0.0 ts=2001/4/25 7:27
   20k 2002/01/09 C:\cygwin\bin\cygmenu6.dll - os=4.0 img=1.0 sys=4.0
                  "cygmenu6.dll" v0.0 ts=2002/1/9 7:03
   29k 2003/08/09 C:\cygwin\bin\cygmenu7.dll - os=4.0 img=1.0 sys=4.0
                  "cygmenu7.dll" v0.0 ts=2003/8/9 11:25
  156k 2001/04/25 C:\cygwin\bin\cygncurses++5.dll - os=4.0 img=1.0 sys=4.0
                  "cygncurses++5.dll" v0.0 ts=2001/4/25 7:29
  175k 2002/01/09 C:\cygwin\bin\cygncurses++6.dll - os=4.0 img=1.0 sys=4.0
                  "cygncurses++6.dll" v0.0 ts=2002/1/9 7:03
  226k 2001/04/25 C:\cygwin\bin\cygncurses5.dll - os=4.0 img=1.0 sys=4.0
                  "cygncurses5.dll" v0.0 ts=2001/4/25 7:17
  202k 2002/01/09 C:\cygwin\bin\cygncurses6.dll - os=4.0 img=1.0 sys=4.0
                  "cygncurses6.dll" v0.0 ts=2002/1/9 7:03
  224k 2003/08/09 C:\cygwin\bin\cygncurses7.dll - os=4.0 img=1.0 sys=4.0
                  "cygncurses7.dll" v0.0 ts=2003/8/9 11:24
   15k 2001/04/25 C:\cygwin\bin\cygpanel5.dll - os=4.0 img=1.0 sys=4.0
                  "cygpanel5.dll" v0.0 ts=2001/4/25 7:27
   12k 2002/01/09 C:\cygwin\bin\cygpanel6.dll - os=4.0 img=1.0 sys=4.0
                  "cygpanel6.dll" v0.0 ts=2002/1/9 7:03
   19k 2003/08/09 C:\cygwin\bin\cygpanel7.dll - os=4.0 img=1.0 sys=4.0
                  "cygpanel7.dll" v0.0 ts=2003/8/9 11:24
   67k 2003/08/22 C:\cygwin\bin\cygpcre-0.dll - os=4.0 img=1.0 sys=4.0
                  "cygpcre-0.dll" v0.0 ts=2003/8/22 12:41
   63k 2003/04/11 C:\cygwin\bin\cygpcre.dll - os=4.0 img=1.0 sys=4.0
                  "cygpcre.dll" v0.0 ts=2003/4/11 10:31
   15k 2003/08/22 C:\cygwin\bin\cygpcreposix-0.dll - os=4.0 img=1.0 sys=4.0
                  "cygpcreposix-0.dll" v0.0 ts=2003/8/22 12:41
   61k 2003/04/11 C:\cygwin\bin\cygpcreposix.dll - os=4.0 img=1.0 sys=4.0
                  "cygpcreposix.dll" v0.0 ts=2003/4/11 10:31
 1100k 2003/08/29 C:\cygwin\bin\cygperl5_8_0.dll - os=4.0 img=1.0 sys=4.0
                  "cygperl5_8_0.dll" v0.0 ts=2003/8/29 12:20
  168k 2003/08/10 C:\cygwin\bin\cygpng10.dll - os=4.0 img=1.0 sys=4.0
                  "cygpng10.dll" v0.0 ts=2003/8/11 0:31
  173k 2003/08/10 C:\cygwin\bin\cygpng12.dll - os=4.0 img=1.0 sys=4.0
                  "cygpng12.dll" v0.0 ts=2003/8/11 0:35
  170k 2002/01/21 C:\cygwin\bin\cygpng2.dll - os=4.0 img=1.0 sys=4.0
                  "cygpng2.dll" v0.0 ts=2002/1/21 2:05
   22k 2002/06/09 C:\cygwin\bin\cygpopt-0.dll - os=4.0 img=1.0 sys=4.0
                  "cygpopt-0.dll" v0.0 ts=2002/6/9 7:45
  148k 2003/08/10 C:\cygwin\bin\cygreadline5.dll - os=4.0 img=1.0 sys=4.0
                  "cygreadline5.dll" v0.0 ts=2003/8/11 1:16
   66k 2001/11/20 C:\cygwin\bin\cygregex.dll - os=4.0 img=1.0 sys=4.0
                  "cygregex.dll" v0.0 ts=2001/11/20 15:44
  176k 2003/08/11 C:\cygwin\bin\cygssl-0.9.7.dll - os=4.0 img=1.0 sys=4.0
                  "cygssl-0.9.7.dll" v0.0 ts=2003/8/11 10:58
  165k 2003/04/11 C:\cygwin\bin\cygssl.dll - os=4.0 img=1.0 sys=4.0
                  "cygssl.dll" v0.0 ts=2003/4/11 12:37
  281k 2003/02/24 C:\cygwin\bin\cygtiff3.dll - os=4.0 img=1.0 sys=4.0
                  "cygtiff3.dll" v0.0 ts=2003/2/24 5:58
  282k 2003/08/11 C:\cygwin\bin\cygtiff4.dll - os=4.0 img=1.0 sys=4.0
                  "cygtiff4.dll" v0.0 ts=2003/8/11 4:32
  903k 2003/06/09 C:\cygwin\bin\cygxml2-2.dll - os=4.0 img=1.0 sys=4.0
                  "cygxml2-2.dll" v0.0 ts=2003/6/10 1:49
   50k 2003/08/09 C:\cygwin\bin\cygXpm-noX4.dll - os=4.0 img=1.0 sys=4.0
                  "cygXpm-noX4.dll" v0.0 ts=2003/8/9 9:21
   54k 2003/08/09 C:\cygwin\bin\cygXpm-X4.dll - os=4.0 img=1.0 sys=4.0
                  "cygXpm-X4.dll" v0.0 ts=2003/8/9 9:22
  174k 2003/06/10 C:\cygwin\bin\cygxslt-1.dll - os=4.0 img=1.0 sys=4.0
                  "cygxslt-1.dll" v0.0 ts=2003/6/10 19:42
   13k 2003/06/10 C:\cygwin\bin\cygxsltbreakpoint-1.dll - os=4.0 img=1.0 sys=4.0
                  "cygxsltbreakpoint-1.dll" v0.0 ts=2003/6/10 20:07
   60k 2003/08/09 C:\cygwin\bin\cygz.dll - os=4.0 img=1.0 sys=4.0
                  "cygz.dll" v0.0 ts=2003/8/9 8:28
  945k 2003/09/01 C:\cygwin\bin\cygwin1.dll - os=4.0 img=1.0 sys=4.0
                  "cygwin1.dll" v0.0 ts=2003/9/1 19:15
    Cygwin DLL version info:
        DLL version: 1.5.3
        DLL epoch: 19
        DLL bad signal mask: 19005
        DLL old termios: 5
        DLL malloc env: 28
        API major: 0
        API minor: 90
        Shared data: 3
        DLL identifier: cygwin1
        Mount registry: 2
        Cygnus registry name: Cygnus Solutions
        Cygwin registry name: Cygwin
        Program options name: Program Options
        Cygwin mount registry name: mounts v2
        Cygdrive flags: cygdrive flags
        Cygdrive prefix: cygdrive prefix
        Cygdrive default prefix: 
        Build date: Mon Sep 1 13:15:28 EDT 2003
        Shared id: cygwin1S3

  671k 2003/08/01 C:\cygwin\usr\X11R6\bin\cygdps-1.dll - os=4.0 img=1.0 sys=4.0
                  "cygdps-1.dll" v0.0 ts=2003/8/1 6:06
   53k 2003/08/01 C:\cygwin\usr\X11R6\bin\cygdpstk-1.dll - os=4.0 img=1.0 sys=4.0
                  "cygdpstk-1.dll" v0.0 ts=2003/8/1 6:06
  146k 2003/08/01 C:\cygwin\usr\X11R6\bin\cygexpat-1.dll - os=4.0 img=1.0 sys=4.0
                  "cygexpat-1.dll" v0.0 ts=2003/8/1 6:06
  174k 2003/08/01 C:\cygwin\usr\X11R6\bin\cygfontconfig-1.dll - os=4.0 img=1.0 sys=4.0
                  "cygfontconfig-1.dll" v0.0 ts=2003/8/1 6:06
  340k 2003/08/01 C:\cygwin\usr\X11R6\bin\cygfreetype-9.dll - os=4.0 img=1.0 sys=4.0
                  "cygfreetype-9.dll" v0.0 ts=2003/8/1 6:06
  524k 2003/08/01 C:\cygwin\usr\X11R6\bin\cygGL-1.dll - os=4.0 img=1.0 sys=4.0
                  "cygGL-1.dll" v0.0 ts=2003/8/1 6:05
  592k 2003/08/01 C:\cygwin\usr\X11R6\bin\cygGLU-1.dll - os=4.0 img=1.0 sys=4.0
                  "cygGLU-1.dll" v0.0 ts=2003/8/1 6:05
  109k 2003/08/01 C:\cygwin\usr\X11R6\bin\cygICE-6.dll - os=4.0 img=1.0 sys=4.0
                  "cygICE-6.dll" v0.0 ts=2003/8/1 6:05
   25k 2003/08/01 C:\cygwin\usr\X11R6\bin\cygoldX-6.dll - os=4.0 img=1.0 sys=4.0
                  "cygoldX-6.dll" v0.0 ts=2003/8/1 6:04
 1510k 2003/08/01 C:\cygwin\usr\X11R6\bin\cygOSMesa-4.dll - os=4.0 img=1.0 sys=4.0
                  "cygOSMesa-4.dll" v0.0 ts=2003/8/1 6:05
   41k 2002/05/14 C:\cygwin\usr\X11R6\bin\cygPropList-0.dll - os=4.0 img=1.0 sys=4.0
                  "cygPropList-0.dll" v0.0 ts=2002/5/14 5:13
   40k 2003/08/01 C:\cygwin\usr\X11R6\bin\cygpsres-1.dll - os=4.0 img=1.0 sys=4.0
                  "cygpsres-1.dll" v0.0 ts=2003/8/1 6:06
   54k 2003/08/01 C:\cygwin\usr\X11R6\bin\cygSM-6.dll - os=4.0 img=1.0 sys=4.0
                  "cygSM-6.dll" v0.0 ts=2003/8/1 6:05
 1067k 2003/08/01 C:\cygwin\usr\X11R6\bin\cygX11-6.dll - os=4.0 img=1.0 sys=4.0
                  "cygX11-6.dll" v0.0 ts=2003/8/1 6:04
   57k 2003/08/01 C:\cygwin\usr\X11R6\bin\cygXcursor-1.dll - os=4.0 img=1.0 sys=4.0
                  "cygXcursor-1.dll" v0.0 ts=2003/8/1 6:06
   77k 2003/08/01 C:\cygwin\usr\X11R6\bin\cygXext-6.dll - os=4.0 img=1.0 sys=4.0
                  "cygXext-6.dll" v0.0 ts=2003/8/1 6:05
   83k 2003/08/01 C:\cygwin\usr\X11R6\bin\cygXft-1.dll - os=4.0 img=1.0 sys=4.0
                  "cygXft-1.dll" v0.0 ts=2003/8/1 6:06
  105k 2003/08/01 C:\cygwin\usr\X11R6\bin\cygXft-2.dll - os=4.0 img=1.0 sys=4.0
                  "cygXft-2.dll" v0.0 ts=2003/8/1 6:06
   53k 2003/08/01 C:\cygwin\usr\X11R6\bin\cygXi-6.dll - os=4.0 img=1.0 sys=4.0
                  "cygXi-6.dll" v0.0 ts=2003/8/1 6:05
   29k 2003/08/01 C:\cygwin\usr\X11R6\bin\cygXmuu-1.dll - os=4.0 img=1.0 sys=4.0
                  "cygXmuu-1.dll" v0.0 ts=2003/8/1 6:05
   58k 2003/08/01 C:\cygwin\usr\X11R6\bin\cygXp-6.dll - os=4.0 img=1.0 sys=4.0
                  "cygXp-6.dll" v0.0 ts=2003/8/1 6:05
   81k 2003/08/01 C:\cygwin\usr\X11R6\bin\cygXpm-4.dll - os=4.0 img=1.0 sys=4.0
                  "cygXpm-4.dll" v0.0 ts=2003/8/1 6:05
   29k 2003/08/01 C:\cygwin\usr\X11R6\bin\cygXrandr-2.dll - os=4.0 img=1.0 sys=4.0
                  "cygXrandr-2.dll" v0.0 ts=2003/8/1 6:06
   49k 2003/08/01 C:\cygwin\usr\X11R6\bin\cygXrender-1.dll - os=4.0 img=1.0 sys=4.0
                  "cygXrender-1.dll" v0.0 ts=2003/8/1 6:06
  384k 2003/08/01 C:\cygwin\usr\X11R6\bin\cygXTrap-6.dll - os=4.0 img=1.0 sys=4.0
                  "cygXTrap-6.dll" v0.0 ts=2003/8/1 6:06
   38k 2003/08/01 C:\cygwin\usr\X11R6\bin\cygXtst-6.dll - os=4.0 img=1.0 sys=4.0
                  "cygXtst-6.dll" v0.0 ts=2003/8/1 6:05
   34k 2003/08/01 C:\cygwin\usr\X11R6\bin\cygXv-1.dll - os=4.0 img=1.0 sys=4.0
                  "cygXv-1.dll" v0.0 ts=2003/8/1 6:05

Cygwin Package Information
Last downloaded files to: D:\cyginst
Last downloaded files from: ftp://mirrors.rcn.net/mirrors/sources.redhat.com/cygwin

Package                 Version            
_update-info-dir        00211-1            
ash                     20020731-3         
autoconf                2.57a-1            
autoconf-devel          2.57-2             
autoconf-stable         2.13-5             
automake                1.7.5a-1           
automake-devel          1.7.6-2            
automake-stable         1.4p5-6            
base-files              2.5-1              
base-passwd             1.1-1              
bash                    2.05b-13           
bc                      1.06-1             
binutils                20030901-1         
bison                   20030307-1         
byacc                   1.9-1              
bzip2                   1.0.2-5            
clear                   1.0-1              
compface                1.4-5              
cpio                    2.5-3              
cron                    3.0.1-11           
crypt                   1.0-2              
ctags                   5.5-4              
curl                    7.10.4-1           
cvs                     1.11.6-3           
cygrunsrv               0.96-2             
cygutils                1.2.1-2            
cygwin                  1.5.3-1            
cygwin-doc              1.3-6              
dejagnu                 20021217-2         
diff                    1.0-1              
diffutils               2.8.4-1            
dpkg                    1.10.4-2           
ed                      0.2-1              
enscript                1.6.3-3            
expat                   1.95.6-1           
expect                  20030128-1         
figlet                  2.2-1              
file                    4.03-2             
fileutils               4.1-2              
findutils               4.1.7-4            
flex                    2.5.4-2            
fortune                 1.8-2              
gawk                    3.1.3-3            
gcc                     3.2-3              
gcc-mingw               20020817-5         
gcc2                    2.95.3-10          
gdb                     20030901-1         
gdbm                    1.8.3-7            
gettext                 0.12.1-3           
gettext-devel           0.12.1-3           
ghostscript             7.05-2             
ghostscript-base        7.05-2             
gnupg                   1.2.2-1            
gperf                   2.7.2-1            
grace                   5.1.12-1           
grep                    2.5-1              
groff                   1.18.1-2           
gzip                    1.3.3-4            
indent                  2.2.8-1            
inetutils               1.3.2-24           
irc                     20010101-3         
jbigkit                 1.5-3              
jpeg                    6b-11              
less                    381-1              
lesstif                 0.93.41-1          
libbz2_0                1.0.2-1            
libbz2_1                1.0.2-5            
libcharset1             1.9.1-3            
libdb3.1                3.1.17-2           
libgdbm                 1.8.0-5            
libgdbm-devel           1.8.3-7            
libgdbm3                1.8.3-3            
libgdbm4                1.8.3-7            
libgettextpo0           0.12.1-3           
libiconv                1.9.1-3            
libiconv2               1.9.1-3            
libintl                 0.10.38-3          
libintl1                0.10.40-1          
libintl2                0.12.1-3           
libjpeg62               6b-11              
libjpeg6b               6b-8               
libkpathsea3            20020911-1         
libkpathsea3abi13       2.0.2-2            
libltdl3                1.5-3              
libncurses5             5.2-1              
libncurses6             5.2-8              
libncurses7             5.3-4              
libpcre                 4.1-1              
libpcre0                4.4-1              
libpng                  1.2.5-4            
libpng10                1.0.15-4           
libpng12                1.2.5-4            
libpng12-devel          1.2.5-4            
libpng2                 1.0.12-1           
libpopt0                1.6.4-4            
libPropList             0.10.1-3           
libreadline4            4.1-2              
libreadline5            4.3-5              
libtiff-devel           3.6.0-5            
libtiff3                3.6.0-2            
libtiff4                3.6.0-5            
libtool                 1.5a-1             
libtool-devel           1.5-3              
libtool-stable          1.4.3-2            
libxml2                 2.5.7-1            
libxslt                 1.0.30-2           
links                   0.96-1             
login                   1.9-7              
lynx                    2.8.4-7            
m4                      1.4-1              
make                    3.80-1             
man                     1.5j-2             
mc                      4.6.0-4            
mingw                   20010917-1         
mingw-runtime           3.0-1              
mktemp                  1.5-3              
mt                      2.0.1-2            
mutt                    1.4-1              
nano                    1.2.2-1            
ncftp                   3.1.4-1            
ncurses                 5.3-4              
newlib-man              20020801           
openbox                 0.99.1-3           
opengl                  1.1.0-6            
openssh                 3.6.1p2-2          
openssl                 0.9.7b-3           
openssl096              0.9.6j-1           
patch                   2.5.8-7            
pcre                    4.4-1              
pcre-doc                4.4-1              
perl                    5.8.0-5            
perl_manpages           5.8.0-5            
pkgconfig               0.15.0-4           
popt                    1.6.4-4            
python                  2.3-2              
rcs                     5.7-3              
readline                4.3-5              
regex                   4.4-2              
robots                  2.0-3              
rsync                   2.5.6-1            
rxvt                    2.7.10-3           
sed                     4.0.7-3            
sh-utils                2.0.15-4           
sharutils               4.2.1-3            
shutdown                1.3-1              
ssmtp                   2.38.7-4           
tar                     1.13.25-3          
tcltk                   20030901-1         
tcsh                    6.12.00-7          
termcap                 20021106-2         
terminfo                5.3_20030726-1     
tetex-beta              20020911-1         
tetex-bin               2.0.2-2            
texinfo                 4.2-4              
textutils               2.0.21-1           
tidy                    030201-1           
tiff                    3.6.0-5            
time                    1.7-1              
units                   1.77-1             
unzip                   5.50-5             
vim                     6.2-3              
w32api                  2.3-1              
wget                    1.8.2-2            
which                   1.5-2              
whois                   4.6.2-1            
WindowMaker             0.80.0-2           
XFree86-base            4.3.0-1            
XFree86-bin             4.3.0-1            
XFree86-etc             4.3.0-3            
XFree86-fenc            4.2.0-3            
XFree86-fnts            4.2.0-3            
XFree86-lib             4.3.0-1            
XFree86-lib-compat      4.3.0-1            
XFree86-man             4.3.0-1            
XFree86-prog            4.3.0-4            
XFree86-startup-scripts 4.2.0-5            
XFree86-xserv           4.3.0-6            
xpm-nox                 4.2.0-4            
zip                     2.3-5              
zlib                    1.1.4-4            
Use -h to see help about each section


[-- Attachment #2: Type: application/pgp-signature, Size: 251 bytes --]

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: Problem with patch 2.5.8-7
@ 2003-09-15  2:39 Volker Quetschke
  0 siblings, 0 replies; 9+ messages in thread
From: Volker Quetschke @ 2003-09-15  2:39 UTC (permalink / raw)
  To: cygwin

[-- Attachment #1: Type: text/plain, Size: 1512 bytes --]

Hi!

>>I'm experiencing problems with the current patch program, version
>>2.5.8-7. (System W2k, all binary mounts, Cygwin updated two hours ago.)
>>
>>With the attached two files the following command worked with
>>previous versions of patch (still works if I go back to
>>patch 2.5.8-3 (my last version))
>>
>>But now:
>>$ patch -i dos_lineends.patch -b -p2
>>fails.
>>vc_common.mak is in: ./STLport-4.0/src/vc_common.mak
> 
> So it fails.  Interesting.  I wonder *how* it fails though. 
> http://cygwin.com/problems.html
Ok, I stepped into the usual trap. If it fails for me, it has to fail for
you also :-(

Details follow:

$ ll
total 4
drwxrwxr-x+   3 q        none            0 Sep  6 22:42 STLport-4.0/
-rwxrwxr-x    1 admins   none         3737 Sep  6 22:41 dos_lineends.patch*
[q@lisi]/tmp/patchtest:{517}:
$ patch -i dos_lineends.patch -b -p2
patching file STLport-4.0/src/vc_common.mak
Hunk #1 FAILED at 42.
Hunk #2 FAILED at 53.
Hunk #3 FAILED at 63.
3 out of 3 hunks FAILED -- saving rejects to file STLport-4.0/src/vc_common.mak.rej

This time I attached the output of cygcheck -s -v -r.

As a data point, if I do a
$ dos2unix.exe STLport-4.0/src/vc_common.mak
first, the patch applies cleanly, but this is wrong,
both patch and file are DOS style files with 0D0A lineendings.

> P.S.: I tried it and it works for me.
It works if I use patch 2.5.8-3

Volker

-- 
PGP/GPG key  (ID: 0x9F8A785D)  available  from  wwwkeys.de.pgp.net
key-fingerprint 550D F17E B082 A3E9 F913  9E53 3D35 C9BA 9F8A 785D

[-- Attachment #2: Type: application/pgp-signature, Size: 251 bytes --]

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Problem with patch 2.5.8-7
@ 2003-09-15  2:39 Volker Quetschke
  0 siblings, 0 replies; 9+ messages in thread
From: Volker Quetschke @ 2003-09-15  2:39 UTC (permalink / raw)
  To: cygwin


[-- Attachment #1.1: Type: text/plain, Size: 637 bytes --]

Hi!

I'm experiencing problems with the current patch program, version
2.5.8-7. (System W2k, all binary mounts, Cygwin updated two hours ago.)

With the attached two files the following command worked with
previous versions of patch (still works if I go back to
patch 2.5.8-3 (my last version))

But now:
$ patch -i dos_lineends.patch -b -p2
fails.
vc_common.mak is in: ./STLport-4.0/src/vc_common.mak

Any hints?

Volker

P.S. I skipped the cygcheck output because the older version still
works.

-- 
PGP/GPG key  (ID: 0x9F8A785D)  available  from  wwwkeys.de.pgp.net
key-fingerprint 550D F17E B082 A3E9 F913  9E53 3D35 C9BA 9F8A 785D


[-- Attachment #1.2: vc_common.mak --]
[-- Type: text/plain, Size: 2766 bytes --]

#
#

!IF "$(OS)" == "Windows_NT"
NULL=
!ELSE 
NULL=nul
!ENDIF 


#
# Tools
#

# RSC=rc.exe
LINK=lib.exe
DYN_LINK=link.exe
OBJEXT=obj
DYNEXT=dll
STEXT=lib
RM=-rd /S /Q

PATH_SEP=\\

MKDIR=-mkdir
LINK_OUT=/out:
DYNLINK_OUT=/out:
STATIC_SUFFIX=_static
INSTALL_STEP=do_install

!include common_macros.mak

#
#
# Flags
#

FLAGS_COMMON =/Zm800 /nologo /W3 /GR /GX /FI "vc_warning_disable.h" /D "WIN32" /D "_WINDOWS" /I "$(STLPORT_DIR)" /D "__SGI_STL_OWN_IOSTREAMS" $(EXTRA_COMMON_FLAGS)

FLAGS_COMMON_static = $(FLAGS_COMMON) /D "_LIB" /FD
FLAGS_COMMON_dynamic = $(FLAGS_COMMON) /D "_USRDLL"


LDFLAGS_COMMON_static=/nologo /machine:I386
LDFLAGS_COMMON_dynamic=/nologo /dll /incremental:no /machine:I386

CXXFLAGS_DEBUG_static=$(FLAGS_COMMON_static) /MTd /Zi /Yd /Gm /Od  /D "_DEBUG"  /Fo"$(DEBUG_OBJDIR_static)\\" /Fd"$(DEBUG_OBJDIR_static)\\" /YXstlport_prefix.h /Fp$(DEBUG_OBJDIR_static)\stlport.pch /c

CXXFLAGS_DEBUG_dynamic=$(FLAGS_COMMON_dynamic) /MDd /Zi /Yd /Gm /Od  /D "_DEBUG"  /Fo"$(DEBUG_OBJDIR_dynamic)\\" /Fd"$(DEBUG_OBJDIR_dynamic)\\" /YXstlport_prefix.h /Fp$(DEBUG_OBJDIR_dynamic)\stlport.pch /c

CXXFLAGS_STLDEBUG_static=$(FLAGS_COMMON_static) /MTd /Zi /Yd /Gm /Od  /D "_DEBUG"  /D "__STL_DEBUG" /Fo"$(STLDEBUG_OBJDIR_static)\\" /Fd"$(STLDEBUG_OBJDIR_static)\\"  /YXstlport_prefix.h /Fp$(STLDEBUG_OBJDIR_static)\stlport.pch /c 

CXXFLAGS_STLDEBUG_dynamic=$(FLAGS_COMMON_dynamic) /MDd /Zi /Yd /Gm /Od  /D "_DEBUG"  /D "__STL_DEBUG" /Fo"$(STLDEBUG_OBJDIR_dynamic)\\" /Fd"$(STLDEBUG_OBJDIR_dynamic)\\"  /YXstlport_prefix.h /Fp$(STLDEBUG_OBJDIR_dynamic)\stlport.pch /c 

LDFLAGS_DEBUG_static=$(LDFLAGS_COMMON_static) /NODEFAULTLIB:MTD /DEBUGTYPE:CV
LDFLAGS_DEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) /DEBUG /DEBUGTYPE:CV /implib:"$(OUTDIR)\$(DEBUG_NAME).$(STEXT)" 

LDFLAGS_STLDEBUG_static=$(LDFLAGS_COMMON_static) /NODEFAULTLIB:MTD /DEBUGTYPE:CV
LDFLAGS_STLDEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) /DEBUG /DEBUGTYPE:CV /implib:"$(OUTDIR)\$(STLDEBUG_NAME).$(STEXT)" 

CXXFLAGS_RELEASE_static=$(FLAGS_COMMON_static) /O2 /MT /D "NDEBUG" /Fo"$(RELEASE_OBJDIR_static)\\" /Fd"$(RELEASE_OBJDIR_static)\\"  /YXstlport_prefix.h /Fp$(RELEASE_OBJDIR_static)\stlport.pch /c 

CXXFLAGS_RELEASE_dynamic=$(FLAGS_COMMON_dynamic) /O2 /MD /D "NDEBUG" /Fo"$(RELEASE_OBJDIR_dynamic)\\" /Fd"$(RELEASE_OBJDIR_dynamic)\\" /YXstlport_prefix.h /Fp$(RELEASE_OBJDIR_dynamic)\stlport.pch /c 

LDFLAGS_RELEASE_static=$(LDFLAGS_COMMON_static)
LDFLAGS_RELEASE_dynamic=$(LDFLAGS_COMMON_dynamic) /implib:"$(OUTDIR)\$(RELEASE_NAME).$(STEXT)" 

RESFILE=$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)stlport.res
RESFILE_debug=$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)stlport.res
RESFILE_stldebug=$(STLDEBUG_OBJDIR_dynamic)$(PATH_SEP)stlport.res


#
# Rules
#

!include common_rules.mak

!include nmake_common.mak


[-- Attachment #1.3: dos_lineends.patch --]
[-- Type: text/plain, Size: 3677 bytes --]

*** ./unxsols3.pro/misc/STLport-4.0/src/vc_common.mak	Fri Jul 14 03:53:26 2000
--- build/unxsols3.pro/STLport-4.0/src/vc_common.mak	Fri Oct  5 15:34:10 2001
***************
*** 42,48 ****
  
  
  LDFLAGS_COMMON_static=/nologo /machine:I386
! LDFLAGS_COMMON_dynamic=/nologo /dll /incremental:no /machine:I386
  
  CXXFLAGS_DEBUG_static=$(FLAGS_COMMON_static) /MTd /Zi /Yd /Gm /Od  /D "_DEBUG"  /Fo"$(DEBUG_OBJDIR_static)\\" /Fd"$(DEBUG_OBJDIR_static)\\" /YXstlport_prefix.h /Fp$(DEBUG_OBJDIR_static)\stlport.pch /c
  
--- 42,48 ----
  
  
  LDFLAGS_COMMON_static=/nologo /machine:I386
! LDFLAGS_COMMON_dynamic=/nologo /nodefaultlib oldnames.lib kernel32.lib /dll /incremental:no /machine:I386
  
  CXXFLAGS_DEBUG_static=$(FLAGS_COMMON_static) /MTd /Zi /Yd /Gm /Od  /D "_DEBUG"  /Fo"$(DEBUG_OBJDIR_static)\\" /Fd"$(DEBUG_OBJDIR_static)\\" /YXstlport_prefix.h /Fp$(DEBUG_OBJDIR_static)\stlport.pch /c
  
***************
*** 53,62 ****
  CXXFLAGS_STLDEBUG_dynamic=$(FLAGS_COMMON_dynamic) /MDd /Zi /Yd /Gm /Od  /D "_DEBUG"  /D "__STL_DEBUG" /Fo"$(STLDEBUG_OBJDIR_dynamic)\\" /Fd"$(STLDEBUG_OBJDIR_dynamic)\\"  /YXstlport_prefix.h /Fp$(STLDEBUG_OBJDIR_dynamic)\stlport.pch /c 
  
  LDFLAGS_DEBUG_static=$(LDFLAGS_COMMON_static) /NODEFAULTLIB:MTD /DEBUGTYPE:CV
! LDFLAGS_DEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) /DEBUG /DEBUGTYPE:CV /implib:"$(OUTDIR)\$(DEBUG_NAME).$(STEXT)" 
  
  LDFLAGS_STLDEBUG_static=$(LDFLAGS_COMMON_static) /NODEFAULTLIB:MTD /DEBUGTYPE:CV
! LDFLAGS_STLDEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) /DEBUG /DEBUGTYPE:CV /implib:"$(OUTDIR)\$(STLDEBUG_NAME).$(STEXT)" 
  
  CXXFLAGS_RELEASE_static=$(FLAGS_COMMON_static) /O2 /MT /D "NDEBUG" /Fo"$(RELEASE_OBJDIR_static)\\" /Fd"$(RELEASE_OBJDIR_static)\\"  /YXstlport_prefix.h /Fp$(RELEASE_OBJDIR_static)\stlport.pch /c 
  
--- 53,62 ----
  CXXFLAGS_STLDEBUG_dynamic=$(FLAGS_COMMON_dynamic) /MDd /Zi /Yd /Gm /Od  /D "_DEBUG"  /D "__STL_DEBUG" /Fo"$(STLDEBUG_OBJDIR_dynamic)\\" /Fd"$(STLDEBUG_OBJDIR_dynamic)\\"  /YXstlport_prefix.h /Fp$(STLDEBUG_OBJDIR_dynamic)\stlport.pch /c 
  
  LDFLAGS_DEBUG_static=$(LDFLAGS_COMMON_static) /NODEFAULTLIB:MTD /DEBUGTYPE:CV
! LDFLAGS_DEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) msvcrtd.lib /DEBUG /DEBUGTYPE:CV /implib:"$(OUTDIR)\$(DEBUG_NAME).$(STEXT)" 
  
  LDFLAGS_STLDEBUG_static=$(LDFLAGS_COMMON_static) /NODEFAULTLIB:MTD /DEBUGTYPE:CV
! LDFLAGS_STLDEBUG_dynamic=$(LDFLAGS_COMMON_dynamic) msvcrtd.lib /DEBUG /DEBUGTYPE:CV /implib:"$(OUTDIR)\$(STLDEBUG_NAME).$(STEXT)" 
  
  CXXFLAGS_RELEASE_static=$(FLAGS_COMMON_static) /O2 /MT /D "NDEBUG" /Fo"$(RELEASE_OBJDIR_static)\\" /Fd"$(RELEASE_OBJDIR_static)\\"  /YXstlport_prefix.h /Fp$(RELEASE_OBJDIR_static)\stlport.pch /c 
  
***************
*** 63,69 ****
  CXXFLAGS_RELEASE_dynamic=$(FLAGS_COMMON_dynamic) /O2 /MD /D "NDEBUG" /Fo"$(RELEASE_OBJDIR_dynamic)\\" /Fd"$(RELEASE_OBJDIR_dynamic)\\" /YXstlport_prefix.h /Fp$(RELEASE_OBJDIR_dynamic)\stlport.pch /c 
  
  LDFLAGS_RELEASE_static=$(LDFLAGS_COMMON_static)
! LDFLAGS_RELEASE_dynamic=$(LDFLAGS_COMMON_dynamic) /implib:"$(OUTDIR)\$(RELEASE_NAME).$(STEXT)" 
  
  RESFILE=$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)stlport.res
  RESFILE_debug=$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)stlport.res
--- 63,69 ----
  CXXFLAGS_RELEASE_dynamic=$(FLAGS_COMMON_dynamic) /O2 /MD /D "NDEBUG" /Fo"$(RELEASE_OBJDIR_dynamic)\\" /Fd"$(RELEASE_OBJDIR_dynamic)\\" /YXstlport_prefix.h /Fp$(RELEASE_OBJDIR_dynamic)\stlport.pch /c 
  
  LDFLAGS_RELEASE_static=$(LDFLAGS_COMMON_static)
! LDFLAGS_RELEASE_dynamic=$(LDFLAGS_COMMON_dynamic) msvcrt.lib /implib:"$(OUTDIR)\$(RELEASE_NAME).$(STEXT)" 
  
  RESFILE=$(RELEASE_OBJDIR_dynamic)$(PATH_SEP)stlport.res
  RESFILE_debug=$(DEBUG_OBJDIR_dynamic)$(PATH_SEP)stlport.res


[-- Attachment #2: Type: application/pgp-signature, Size: 251 bytes --]

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2003-09-15  2:39 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2003-09-06 15:02 Problem with patch 2.5.8-7 Volker Quetschke
2003-09-06 20:12 ` Corinna Vinschen
2003-09-06 20:52   ` Volker Quetschke
2003-09-06 21:22     ` Igor Pechtchanski
2003-09-06 21:47     ` Volker Quetschke
2003-09-07  8:29     ` Corinna Vinschen
2003-09-15  2:39 Volker Quetschke
2003-09-15  2:39 Volker Quetschke
2003-09-15  2:39 Volker Quetschke

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).