DragonFly BSD
DragonFly users List (threaded) for 2005-04
[Date Prev][Date Next]  [Thread Prev][Thread Next]  [Date Index][Thread Index]

Re: wine port problem (File to patch:)

From: YONETANI Tomokazu <qhwt+dfly@xxxxxxxxxx>
Date: Sun, 10 Apr 2005 18:45:33 +0900

On Sun, Apr 10, 2005 at 08:37:39AM +0000, Johannes Hofmann wrote:
> Thanks Andreas, I already have an older version of qemu running. I was 
> just wondering why the patch command fails for some ports and not for 
> others. The patches look fine to me.

That comes from how FreeBSD-patch(GNU one?) and OpenBSD-patch(what we have)
treat the "Index:" line. The failing patch is files/patch-tools.
The beginning of the patch looks like this:

  Index: tools/makedep.c
  RCS file: /home/wine/wine/tools/makedep.c,v
  retrieving revision 1.17
  diff -u -3 -p -r1.17 makedep.c
  --- makedep.c	20 Jun 2003 21:31:13 -0000	1.17
  +++ makedep.c	23 Feb 2004 22:36:23 -0000
  @@ -67,7 +67,8 @@ static const char Usage[] =
       "   -Idir   Search for include files in directory 'dir'\n"
       "   -Cdir   Search for source files in directory 'dir'\n"

The "Index:" line says the patch should be applied to tools/makedep.c,
and "---" or "+++" line says the file exists in the cwd. The FreeBSD-patch
honors the "Index:" line and tries to patch tools/makedep.c, but our patch
tries to patch the latter and fails, unless an environment variable
POSIXLY_CORRECT is set or "--posix" option is given. So an easy workaround
for now is to do something like this:
# make PATCH='patch --posix'
(yeah, you can probably set POSIXLY_CORRECT, but it might have more
side-effect than we expect).

[Date Prev][Date Next]  [Thread Prev][Thread Next]  [Date Index][Thread Index]