summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Heaven <nyhm@gentoo.org>2008-12-10 11:39:39 +0000
committerTristan Heaven <nyhm@gentoo.org>2008-12-10 11:39:39 +0000
commitfbd755ad8db6a3d9e3e4a7dcdee465df77a4e4b6 (patch)
treed6a00059b662fdce85baa57ab61a955911aafd7a /app-crypt
parentJoined the previous fixes with the corrections from bug #222819 and #245545. (diff)
downloadgentoo-2-fbd755ad8db6a3d9e3e4a7dcdee465df77a4e4b6.tar.gz
gentoo-2-fbd755ad8db6a3d9e3e4a7dcdee465df77a4e4b6.tar.bz2
gentoo-2-fbd755ad8db6a3d9e3e4a7dcdee465df77a4e4b6.zip
Fix linking with --as-needed, bug #246865
(Portage version: 2.2_rc17/cvs/Linux 2.6.27.7 i686)
Diffstat (limited to 'app-crypt')
-rw-r--r--app-crypt/md5deep/ChangeLog6
-rw-r--r--app-crypt/md5deep/files/md5deep-3.1-as-needed.patch15
2 files changed, 17 insertions, 4 deletions
diff --git a/app-crypt/md5deep/ChangeLog b/app-crypt/md5deep/ChangeLog
index aae74c8e286c..7d4e08ede249 100644
--- a/app-crypt/md5deep/ChangeLog
+++ b/app-crypt/md5deep/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-crypt/md5deep
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/md5deep/ChangeLog,v 1.42 2008/12/07 14:09:41 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/md5deep/ChangeLog,v 1.43 2008/12/10 11:39:39 nyhm Exp $
+
+ 10 Dec 2008; Tristan Heaven <nyhm@gentoo.org>
+ files/md5deep-3.1-as-needed.patch:
+ Fix linking with --as-needed, bug #246865
*md5deep-3.1 (07 Dec 2008)
diff --git a/app-crypt/md5deep/files/md5deep-3.1-as-needed.patch b/app-crypt/md5deep/files/md5deep-3.1-as-needed.patch
index f24635330cd4..dc1f87de5f9a 100644
--- a/app-crypt/md5deep/files/md5deep-3.1-as-needed.patch
+++ b/app-crypt/md5deep/files/md5deep-3.1-as-needed.patch
@@ -1,12 +1,21 @@
--- hashdeep/Makefile.am
+++ hashdeep/Makefile.am
-@@ -1,5 +1,5 @@
- # The math library is required for floor()
+@@ -1,5 +1,3 @@
+-# The math library is required for floor()
-AM_LDFLAGS = -lm
-+LDADD = -lm
INCLUDES = -I@top_srcdir@/include
COMMON_DIR = @top_srcdir@/common
+@@ -26,7 +24,8 @@
+ # don't have it yet (e.g. OpenSolaris). We if don't have strsep
+ # we compile it ourselves using a local copy.
+ EXTRA_hashdeep_SOURCES = lib-strsep.c
+-hashdeep_LDADD = ${EXTRA_HASHDEEP}
++# The math library is required for floor()
++hashdeep_LDADD = ${EXTRA_HASHDEEP} -lm
+ hashdeep_DEPENDENCIES = ${EXTRA_HASHDEEP}
+
+ EXTRA_DIST = main.h strsep.h ${man_MANS}
--- md5deep/Makefile.am
+++ md5deep/Makefile.am
@@ -1,5 +1,5 @@