Mailing-List:	contact cygwin-help AT cygwin DOT com; run by ezmlm
List-Subscribe:	<mailto:cygwin-subscribe AT cygwin DOT com>
List-Archive:	<http://sources.redhat.com/ml/cygwin/>
List-Post:	<mailto:cygwin AT cygwin DOT com>
List-Help:	<mailto:cygwin-help AT cygwin DOT com>, <http://sources.redhat.com/ml/#faqs>
Sender:	cygwin-owner AT cygwin DOT com
Mail-Followup-To:	cygwin AT cygwin DOT com
Delivered-To:	mailing list cygwin AT cygwin DOT com
Message-ID:	<6c7d01c37b31$f7a3b1a0$1602a8c0@geoinformex.com>
Importance:	normal
MIME-Version:	1.0
Subject:	Problem with patch 2.5.8-7
X-OriginalArrivalTime:	06 Sep 2003 15:00:34.0874 (UTC) FILETIME=[9FE8B1A0:01C37487]
X-MimeOLE:	Produced By Microsoft MimeOLE V5.50.4927.1200
Date:	Mon, 15 Sep 2003 10:35:03 +0800
X-MS-Has-Attach:	yes
X-MS-TNEF-Correlator:
From:	"Volker Quetschke" <quetschke AT scytek DOT de>
To:	<cygwin AT cygwin DOT com>

--------------enigAD42B7A91382E2ACBBB40840
Content-Type: multipart/mixed;
	boundary="------------080009050205040802080502"


--------------080009050205040802080502
Content-Type: text/plain;
	format=flowed;
	charset="iso-8859-1"
Content-Transfer-Encoding: 7bit

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


--------------080009050205040802080502
Content-Type: text/plain;
	name="vc_common.mak"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
	filename="vc_common.mak"

#
#

!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


--------------080009050205040802080502
Content-Type: text/plain;
	name="dos_lineends.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
	filename="dos_lineends.patch"

*** ./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


--------------080009050205040802080502--

--------------enigAD42B7A91382E2ACBBB40840
Content-Transfer-Encoding: 7bit
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.2 (MingW32)
Comment: Using GnuPG with Netscape - http://enigmail.mozdev.org

iD8DBQE/WffePTXJup+KeF0RAgw+AKChiEYexdNglA5Q7V2ERuYrHLomlwCgqK4V
DddZi4eKvg+g/Arucv+VO9Y=
=Xp5J
-----END PGP SIGNATURE-----

--------------enigAD42B7A91382E2ACBBB40840--

- Raw text -