fix PIC problem as per bug #107958

Package-Manager: portage-2.0.53_rc7

4 files changed, 43 insertions, 16 deletions

diff --git a/app-crypt/bestcrypt/ChangeLog b/app-crypt/bestcrypt/ChangeLog
index 5cf112369732..1672fd0c5785 100644
--- a/app-crypt/bestcrypt/ChangeLog
+++ b/app-crypt/bestcrypt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/bestcrypt
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/ChangeLog,v 1.36 2005/09/27 21:56:37 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/ChangeLog,v 1.37 2005/11/10 18:56:09 dragonheart Exp $
+
+  10 Nov 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/bestcrypt-1.6_p1-kgsha256makefile_fix.patch,
+  bestcrypt-1.6_p1-r2.ebuild:
+  fix PIC problem as per bug #107958 thank to Wraith
 
 *bestcrypt-1.6_p1-r2 (27 Sep 2005)
 
diff --git a/app-crypt/bestcrypt/Manifest b/app-crypt/bestcrypt/Manifest
index cfe1d8bc22c6..aecc75de4a1c 100644
--- a/app-crypt/bestcrypt/Manifest
+++ b/app-crypt/bestcrypt/Manifest
@@ -1,17 +1,28 @@
-MD5 01fa3fab9cef0bcfe01671f972ba1052 bestcrypt-1.5_p11.ebuild 3130
-MD5 647e65173bc7229527e94aea50a6f3fd bestcrypt-1.6_p1.ebuild 3317
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5b8fda8e824903e5a1241e8f134fb5c1 ChangeLog 7529
 MD5 e30c17c4efee41b1ed3f849680d9cdfa bestcrypt-1.5_p10.ebuild 2974
-MD5 8dcf940430c4916eec795612a8273ec0 bestcrypt-1.6_p1-r2.ebuild 3257
+MD5 01fa3fab9cef0bcfe01671f972ba1052 bestcrypt-1.5_p11.ebuild 3130
 MD5 3c2d03aae97763035f173f2bb94dee06 bestcrypt-1.6_p1-r1.ebuild 3080
-MD5 a8e7acdec10895ce130fa0c98721fc86 ChangeLog 7337
-MD5 566cf4f89e44670d0aba4a745913d748 metadata.xml 224
+MD5 dbc881283e69a96c6b64f474e7ad732b bestcrypt-1.6_p1-r2.ebuild 3368
+MD5 647e65173bc7229527e94aea50a6f3fd bestcrypt-1.6_p1.ebuild 3317
+MD5 063ae0f67213da39ed4dd75a594b3b07 files/bcrypt3 3246
+MD5 e9585e8f08138f46bdda7b88ddd81cd8 files/bestcrypt-1.5_p10-makefile_fix.patch 1136
+MD5 009cee9a408478ebf4f7c1a381c7e8b2 files/bestcrypt-1.5_p11-makefile_fix.patch 1148
+MD5 6827793707b540d0174ef30904e3ded1 files/bestcrypt-1.6_p1-kgsha256makefile_fix.patch 313
+MD5 e4fb0265d55a570daf750fa7c0b8414c files/bestcrypt-1.6_p1-makefile_fix.patch 1367
+MD5 01225cc87eee84cf54232c86b04e8c93 files/bestcrypt.devfs 1673
 MD5 c9fdd7c76eb3731a6166cc9ff17bf722 files/digest-bestcrypt-1.5_p10 137
 MD5 0f4e6e0c1442b612832726753739f6b2 files/digest-bestcrypt-1.5_p11 208
-MD5 e4fb0265d55a570daf750fa7c0b8414c files/bestcrypt-1.6_p1-makefile_fix.patch 1367
+MD5 dee6aa8c71224187da9fbc2b2a6fc167 files/digest-bestcrypt-1.6_p1 136
 MD5 6a91a7867c21eaa1be5ac4b829ae34d9 files/digest-bestcrypt-1.6_p1-r1 207
 MD5 6a91a7867c21eaa1be5ac4b829ae34d9 files/digest-bestcrypt-1.6_p1-r2 207
-MD5 dee6aa8c71224187da9fbc2b2a6fc167 files/digest-bestcrypt-1.6_p1 136
-MD5 e9585e8f08138f46bdda7b88ddd81cd8 files/bestcrypt-1.5_p10-makefile_fix.patch 1136
-MD5 063ae0f67213da39ed4dd75a594b3b07 files/bcrypt3 3246
-MD5 009cee9a408478ebf4f7c1a381c7e8b2 files/bestcrypt-1.5_p11-makefile_fix.patch 1148
-MD5 01225cc87eee84cf54232c86b04e8c93 files/bestcrypt.devfs 1673
+MD5 566cf4f89e44670d0aba4a745913d748 metadata.xml 224
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFDc5fWmdTrptrqvGERAqgxAJ4+k2/Kkigg5HZa4Rtmp+kKOke5PgCfQDAo
+aAkmqykySqeESuOqm+RDqAo=
+=uS4a
+-----END PGP SIGNATURE-----
diff --git a/app-crypt/bestcrypt/bestcrypt-1.6_p1-r2.ebuild b/app-crypt/bestcrypt/bestcrypt-1.6_p1-r2.ebuild
index 23d8de994e36..389ad709e217 100644
--- a/app-crypt/bestcrypt/bestcrypt-1.6_p1-r2.ebuild
+++ b/app-crypt/bestcrypt/bestcrypt-1.6_p1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/bestcrypt-1.6_p1-r2.ebuild,v 1.1 2005/09/27 21:56:37 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/bestcrypt/bestcrypt-1.6_p1-r2.ebuild,v 1.2 2005/11/10 18:56:09 dragonheart Exp $
 
 inherit flag-o-matic eutils linux-mod toolchain-funcs
 
@@ -38,6 +38,7 @@ MODULE_NAMES="bc(block:"${S}"/mod)
 src_unpack() {
 	unpack ${A}
 	epatch "${FILESDIR}"/${P}-makefile_fix.patch
+	epatch "${FILESDIR}"/${P}-kgsha256makefile_fix.patch
 
 	if use x86;
 	then
@@ -50,9 +51,9 @@ src_unpack() {
 src_compile() {
 	filter-flags -fforce-addr
 
-	emake -C kgsha EXTRA_CXXFLAGS="${CXXFLAGS} -fPIC" || die "library compile failed"
-	emake -C kgsha256 EXTRA_CXXFLAGS="${CXXFLAGS} -fPIC" || die "library compile failed"
-	emake -C src EXTRA_CFLAGS="${CFLAGS} -I../kgsha256" || die "bctool compile failed"
+	emake -C kgsha CPP="$(tc-getCXX)" EXTRA_CXXFLAGS="${CXXFLAGS} -fPIC" || die "library compile failed"
+	emake -C kgsha256 CPP="$(tc-getCXX)" EXTRA_CXXFLAGS="${CXXFLAGS} -fPIC" || die "library compile failed"
+	emake -C src CC="$(tc-getCC)"  EXTRA_CFLAGS="${CFLAGS} -I../kgsha256" || die "bctool compile failed"
 
 	# Don't put stack protection in the kernel - it just is bad
 	append-flags -fno-stack-protector-all -fno-stack-protector
diff --git a/app-crypt/bestcrypt/files/bestcrypt-1.6_p1-kgsha256makefile_fix.patch b/app-crypt/bestcrypt/files/bestcrypt-1.6_p1-kgsha256makefile_fix.patch
new file mode 100644
index 000000000000..88503277ae1f
--- /dev/null
+++ b/app-crypt/bestcrypt/files/bestcrypt-1.6_p1-kgsha256makefile_fix.patch
@@ -0,0 +1,10 @@
+--- bcrypt/kgsha256/Makefile.orig	2005-11-11 05:44:50.000000000 +1100
++++ bcrypt/kgsha256/Makefile	2005-11-11 05:45:20.000000000 +1100
+@@ -20,6 +20,7 @@
+ 
+ CPP=g++
+ CPPFLAGS = -Wall -Werror -fno-strength-reduce -I../include 
++CPPFLAGS += $(EXTRA_CXXFLAGS)
+ 
+ TARGET = libkgsha256.so
+ HEADERS = kg_defs.h kblock.h