Ticket #2581: cvs-1.11.23-zlib-1.patch

File cvs-1.11.23-zlib-1.patch, 2.0 KB (added by thomas, 15 years ago)

  • src/Makefile.in 

    Submitted By:            Matthew Burgess <matthew@linuxfromscratch.org>
Date:                    2004-11-12
Initial Package Version: 1.11.2
Upstream Status:         Not submitted
Origin:                  BLFS Dev Post
Description:             Links against system zlib instead of the
                         internal zlib.

$LastChangedBy: igor $
$Date: 2005-10-28 09:20:09 -0500 (Fri, 28 Oct 2005) $

diff -Naur cvs-1.11.18.orig/src/Makefile.in cvs-1.11.18/src/Makefile.in
    old new  
    8686        version.$(OBJEXT) vers_ts.$(OBJEXT) watch.$(OBJEXT) \
    8787        wrapper.$(OBJEXT) zlib.$(OBJEXT)
    8888cvs_OBJECTS = $(am_cvs_OBJECTS)
    89 cvs_DEPENDENCIES = ../diff/libdiff.a ../lib/libcvs.a ../zlib/libz.a
     89cvs_DEPENDENCIES = ../diff/libdiff.a ../lib/libcvs.a
    9090binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
    9191SCRIPTS = $(bin_SCRIPTS)
    9292DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
    … …  
    199199# some namespace hackery going on that maybe shouldn't be.  Long term fix is to
    200200# try and remove naming ocnflicts and fix Automake to allow particular includes
    201201# to be attached only to particular object files.  Short term fix is either or.
    202 INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff -I$(top_srcdir)/zlib $(includeopt)
     202INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff $(includeopt)
    203203bin_SCRIPTS = cvsbug
    204204
    205205# The cvs executable
    … …  
    278278cvs_LDADD = \
    279279        ../diff/libdiff.a \
    280280        ../lib/libcvs.a \
    281         ../zlib/libz.a
     281        -lz
    282282
    283283
    284284# extra clean targets

  • src/zlib.c 

    diff -Naur cvs-1.11.18.orig/src/zlib.c cvs-1.11.18/src/zlib.c
    old new  
    2222
    2323#if defined (SERVER_SUPPORT) || defined (CLIENT_SUPPORT)
    2424
    25 #include "zlib.h"
     25#include <zlib.h>
    2626
    2727/* OS/2 doesn't have EIO.  FIXME: this whole notion of turning
    2828   a different error into EIO strikes me as pretty dubious.  */