summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Heaven <tristan@gentoo.org>2008-12-10 11:39:39 +0000
committerTristan Heaven <tristan@gentoo.org>2008-12-10 11:39:39 +0000
commit4dd0af074f41d4850485c352cdc69bf663fe25bb (patch)
tree07ed7b35f1a9bfd47877b6e77dae1bbe6de5306d /app-crypt
parentJoined the previous fixes with the corrections from bug #222819 and #245545. (diff)
downloadhistorical-4dd0af074f41d4850485c352cdc69bf663fe25bb.tar.gz
historical-4dd0af074f41d4850485c352cdc69bf663fe25bb.tar.bz2
historical-4dd0af074f41d4850485c352cdc69bf663fe25bb.zip
Fix linking with --as-needed, bug #246865
Package-Manager: portage-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/Manifest10
-rw-r--r--app-crypt/md5deep/files/md5deep-3.1-as-needed.patch15
3 files changed, 22 insertions, 9 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/Manifest b/app-crypt/md5deep/Manifest
index f6978931bcfc..c49928d9e452 100644
--- a/app-crypt/md5deep/Manifest
+++ b/app-crypt/md5deep/Manifest
@@ -3,19 +3,19 @@ Hash: SHA1
AUX md5deep-2.0.1-install.patch 401 RMD160 76336decc4481ae00c8bfcc9a1229952bfae46cb SHA1 56e36ef66cdd882e69ca3dfbd90e03230c0f673f SHA256 c5682f1e32318954d58f644d9abd76da6d2e41bdb1e3d41f4e6ce608944c5ee4
AUX md5deep-3.0-install.patch 424 RMD160 d65ac7d723cfda6164e806d5662b917d36c987f5 SHA1 452c6358add3ffe7258e4c40f27f304baa68b5f3 SHA256 d423e9af784921c76f55c342b4535350033d1a9b5d1aed0e367eeef63b33b833
-AUX md5deep-3.1-as-needed.patch 384 RMD160 e0715916949a92a7fd42979170d2af06ade94d36 SHA1 c7d80fe786cf79f02a000a9df9b1baf8a992e27e SHA256 7f241bef530621c9552b819bf3679ca63a83601e1d53891f6143e9d41bedbc82
+AUX md5deep-3.1-as-needed.patch 747 RMD160 09530d45ba6347227c1515f7fc1535eb07cf596e SHA1 bb0cf0c0e9af68761ad08f05c4a42ac6a9d71143 SHA256 ed4edffb3bb12982f1b3a88eb26e29942e1f5681855355c8337b36912198e5ad
DIST md5deep-2.0.1-001.tar.gz 203211 RMD160 13646aa1b85f56988d3079c9c4686dcedd8999a4 SHA1 25b831e4db3190d5613b768f50407bc5c7a9d6e1 SHA256 7ea4ba5257a1e08beb1f05430bf33a9ac311048ed0920dcf6450dad1a75f146d
DIST md5deep-3.0.tar.gz 233803 RMD160 e9b1a2b10c906694834f0e367b1963cc5b7a5d65 SHA1 50a439b08a911e804f0acae30607a2f8940f0d99 SHA256 7af9ca3b271434713b1051776807c570d127a77743c818aef93232800e2201f4
DIST md5deep-3.1.tar.gz 224897 RMD160 1358f04890aa64c158f962a55e9474241f330aac SHA1 aa9743023fa53c7e8d9ed99558684d1d08b3188a SHA256 fdcfaa469923248b0412b4a1afab39f5c26ea778edaab51af2d97eed46bcf2af
EBUILD md5deep-2.0.1-r1.ebuild 748 RMD160 20dcc372778b78597f7b6d2b15daf2235b533e5b SHA1 e3df813a083a05b5270cd38157f1a6e82b02ba9b SHA256 93b8380a1df724349c0adb82a64cc34ff0a4ad32524720ae808316151c16388b
EBUILD md5deep-3.0.ebuild 705 RMD160 4f707ea0ffdaf078a88b8750c342a687fe176613 SHA1 d95bfc7bffb9e043c34f0027b0059ae84a3682a8 SHA256 2368cd9c4378caea7a58d8b98cd4eedf2dcc0633510cf20a73059b10010990f4
EBUILD md5deep-3.1.ebuild 707 RMD160 c27697cefcccf8a212de99e8ec48972754928a6e SHA1 d1d41ea51889b68a628f480a4f4caa433d8ac584 SHA256 3a7f8c29d81d05942feb54ef284902725c8476f68d54eafc21d992c49a1dd281
-MISC ChangeLog 5072 RMD160 8bc9f20bd65cca6fd360e3258983ec923212ddc7 SHA1 c1e281c1d22f44e608735565aa8f08d65efa6c2c SHA256 68cfb914ad5fb0ec507e0075b6b6596653ea8cf556aab03e2da8544bc879c561
+MISC ChangeLog 5202 RMD160 4c2286f1563f2a615339e3731de4b765a03a3e47 SHA1 c40863653353dd4ead56679b8eae06e216c531bd SHA256 fe034856f888f2c9be75453e7241ce91fa58136e1409d4e0a9712aa7288ff9b8
MISC metadata.xml 253 RMD160 33155d552badd3133f93e25bfcd82b62d296deb9 SHA1 b30245f00aae656e7a024b2ab4b8ad8e5549250f SHA256 2ddc2634b7e897546998869bcf0803bfbf4940cb75da9e45a2a8f421b4dabfd3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (GNU/Linux)
-iEYEARECAAYFAkk72S0ACgkQdz7hIScOUREIXwCg8JbGpf7M3cVVvNwPd9l47724
-LxYAn20BTbPtMLj5fBIjscsivrnN/BCn
-=AooX
+iEYEARECAAYFAkk/qoIACgkQdz7hIScOUREEoACg3TANIvW75B2lWV/dddzUTmil
+CRwAnAgnzKEI//Vw7T44fdSXnntuW7+1
+=Zhg8
-----END PGP SIGNATURE-----
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 @@