freetds AT lists.ibiblio.org
Subject: FreeTDS Development Group
List archive
- From: "D. J. Hagberg" <dhagberg AT millibits.com>
- To: freetds AT franklin.oit.unc.edu
- Subject: Re: Patch syntax help!
- Date: Fri, 22 Dec 2000 06:02:52 +0000
Hi John. What this looks like is that your patch got mangled by email
or some other transport that stripped leading spaces off the lines in
the patch. Patches created from a "unified diff" will have a leading
space on all lines except those being directly patched. This will
typically be 2 or 3 lines on either side of the lines of interest -- in
your case the lines beginning with -LIBS and +#LIBS. The other lines
should begin " echo $ac_n", " else", " ac_save", " cat", and " #line".
You should probably try to download whatever patch this is via some
other mechanism.
-=- D. J.
"Westerdale, John" wrote:
> Am trying to patch PHP-4.03, for proper compile for SGI 6.5.9m using gcc,
> and FreeTDS and am running into basic patch problems...
>
> the patch file starts off with:
>
> ------------ ---------------
> ganglion 6# more php.4.0.3pl1_freetds.patch
> diff -u -r php-4.0.3pl1/configure php-4.0.3pl1-patched/configure
> --- php-4.0.3pl1/configure Sun Oct 15 08:47:10 2000
> +++ php-4.0.3pl1-patched/configure Mon Nov 13 21:55:17 2000
> @@ -16720,7 +16720,7 @@
> echo $ac_n "(cached) $ac_c" 1>&6
> else
> ac_save_LIBS="$LIBS"
> -LIBS="-lintl $LIBS"
> +#LIBS="-lintl $LIBS"
> cat > conftest.$ac_ext <<EOF
> #line 16726 "configure"
> ....
> ----------------------------------------------
> but gives me this output:
> ----------------------------------------------
> ganglion 7# patch -p0 < php.4.0.3pl1_freetds.patch
> Hmm... Looks like a unified diff to me...
> The text leading up to this was:
> --------------------------
> |diff -u -r php-4.0.3pl1/configure php-4.0.3pl1-patched/configure
> |--- php-4.0.3pl1/configure Sun Oct 15 08:47:10 2000
> |+++ php-4.0.3pl1-patched/configure Mon Nov 13 21:55:17 2000
> --------------------------
> Patching file php-4.0.3pl1/configure using Plan A...
> patch: **** malformed patch at line 5: echo $ac_n "(cached) $ac_c" 1>&6
> ganglion 8#
> ---------------------------------------------
>
> Can anyone advise on the issue here?
>
> ---------------------------------------------
> ls -ls /usr2/local
>
> ganglion 10# ls -ls /usr2/local/php-4.0.3pl1/
> total 4200
> 0 -rw-rw-r-- 1 root sys 0 Dec 19 15:29 .deps
> 0 drwxrwxr-x 3 root sys 29 Dec 19 15:40 .libs
> 16 -rw-r--r-- 1 510 100 6219 Sep 10 17:07
> CODING_STANDARDS
> 8 -rw-r--r-- 1 510 100 95 Oct 5 18:22 CREDITS
> 32 -rw-r--r-- 1 510 100 14920 Sep 7 17:28 EXTENSIONS
>
> --------------------------------------------
>
> etc.... So it looks like the right place....
>
> Thanks!
>
> John Westerdale
>
> ---
> You are currently subscribed to freetds as: [dhagberg AT millibits.com]
> To unsubscribe, forward this message to $subst('Email.Unsub')
-
Patch syntax help!,
Westerdale, John, 12/21/2000
- <Possible follow-up(s)>
- Re: Patch syntax help!, D. J. Hagberg, 12/22/2000
Archive powered by MHonArc 2.6.24.