cvs commit: patches/cvs cvs-1.11.6-zlib.patch

tushar at linuxfromscratch.org tushar at linuxfromscratch.org
Sat Oct 4 10:09:05 PDT 2003


tushar      03/10/04 11:09:05

  Added:       cvs      cvs-1.11.6-zlib.patch
  Log:
  Added cvs-1.11.6-zlib.patch
  
  Revision  Changes    Path
  1.1                  patches/cvs/cvs-1.11.6-zlib.patch
  
  Index: cvs-1.11.6-zlib.patch
  ===================================================================
  Submitted By: BLFS Book <blfs-book at linuxfromscratch.org>
  Date: 2003-10-04
  Initial Package Version: 1.11.2
  Origin: BLFS Dev Post
  Description: Links against system zlib instead of the internal zlib.
  --- cvs-1.11.6/src/Makefile.in.orig	2003-08-25 07:26:06.000000000 +0000
  +++ cvs-1.11.6/src/Makefile.in	2003-08-25 07:26:38.000000000 +0000
  @@ -146,7 +146,7 @@
   # some namespace hackery going on that maybe shouldn't be.  Long term fix is to
   # try and remove naming ocnflicts and fix Automake to allow particular includes
   # to be attached only to particular object files.  Short term fix is either or.
  -INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff -I$(top_srcdir)/zlib $(includeopt)
  +INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff $(includeopt)
   
   bin_PROGRAMS = cvs
   bin_SCRIPTS = cvsbug
  @@ -225,7 +225,7 @@
   cvs_LDADD = \
   	../diff/libdiff.a \
   	../lib/libcvs.a \
  -	../zlib/libz.a
  +	-lz
   
   
   # extra clean targets
  @@ -268,7 +268,7 @@
   	update.$(OBJEXT) version.$(OBJEXT) vers_ts.$(OBJEXT) \
   	watch.$(OBJEXT) wrapper.$(OBJEXT) zlib.$(OBJEXT)
   cvs_OBJECTS = $(am_cvs_OBJECTS)
  -cvs_DEPENDENCIES = ../diff/libdiff.a ../lib/libcvs.a ../zlib/libz.a
  +cvs_DEPENDENCIES = ../diff/libdiff.a ../lib/libcvs.a
   cvs_LDFLAGS =
   SCRIPTS = $(bin_SCRIPTS)
   
  --- cvs-1.11.6/src/zlib.c.orig	2003-08-25 07:26:13.000000000 +0000
  +++ cvs-1.11.6/src/zlib.c	2003-08-25 07:26:38.000000000 +0000
  @@ -22,7 +22,7 @@
   
   #if defined (SERVER_SUPPORT) || defined (CLIENT_SUPPORT)
   
  -#include "zlib.h"
  +#include <zlib.h>
   
   /* OS/2 doesn't have EIO.  FIXME: this whole notion of turning
      a different error into EIO strikes me as pretty dubious.  */
  
  
  



More information about the patches mailing list