blob: 869a3645ed3375e8faeb4ecc5cb90a63b7e97d6e (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
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
--- cvs-1.11.18.orig/src/Makefile.in 2004-11-11 18:17:20.000000000 +0000
+++ cvs-1.11.18/src/Makefile.in 2004-11-12 19:58:14.962293296 +0000
@@ -86,7 +86,7 @@
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
binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
SCRIPTS = $(bin_SCRIPTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
@@ -199,7 +199,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_SCRIPTS = cvsbug
# The cvs executable
@@ -278,7 +278,7 @@
cvs_LDADD = \
../diff/libdiff.a \
../lib/libcvs.a \
- ../zlib/libz.a
+ -lz
# extra clean targets
diff -Naur cvs-1.11.18.orig/src/zlib.c cvs-1.11.18/src/zlib.c
--- cvs-1.11.18.orig/src/zlib.c 2004-03-19 19:18:57.000000000 +0000
+++ cvs-1.11.18/src/zlib.c 2004-11-12 19:58:55.531125896 +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. */
|
