[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b

[Török Edvin]

The following commit has been merged in the debian/unstable branch:
commit d29df4cf2d499717dde976c27fa293470cfcf114
Author: Török Edvin <edwin at clamav.net>
Date:   Fri Jan 29 18:38:43 2010 +0200

    Don't use clamdscan.map, it fails on some versions of Solaris.
    
    On Solaris with GNU ld 2.17, a program which does a simple malloc(56)
    dumps core if that linker map is used (which only exports main).
    So just don't use that linker map for clamdscan at all.

diff --git a/clamdscan/Makefile.am b/clamdscan/Makefile.am
index c7ca3c6..e1602c0 100644
--- a/clamdscan/Makefile.am
+++ b/clamdscan/Makefile.am
@@ -36,9 +36,6 @@ clamdscan_SOURCES = \
     proto.h \
     client.c \
     client.h
-if VERSIONSCRIPT
-LDFLAGS += -Wl, at VERSIONSCRIPTFLAG@, at top_srcdir@/clamdscan/clamdscan.map
-endif
 endif
 
 
diff --git a/clamdscan/Makefile.in b/clamdscan/Makefile.in
index 44c46b7..4003d9f 100644
--- a/clamdscan/Makefile.in
+++ b/clamdscan/Makefile.in
@@ -54,7 +54,6 @@ build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 @BUILD_CLAMD_TRUE at bin_PROGRAMS = clamdscan$(EXEEXT)
- at BUILD_CLAMD_TRUE@@VERSIONSCRIPT_TRUE at am__append_1 = -Wl, at VERSIONSCRIPTFLAG@, at top_srcdir@/clamdscan/clamdscan.map
 subdir = clamdscan
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -172,7 +171,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LCOV = @LCOV@
 LD = @LD@
-LDFLAGS = @LDFLAGS@ $(am__append_1)
+LDFLAGS = @LDFLAGS@
 LIBADD_DL = @LIBADD_DL@
 LIBADD_DLD_LINK = @LIBADD_DLD_LINK@
 LIBADD_DLOPEN = @LIBADD_DLOPEN@

-- 
Debian repository for ClamAV