| 1 |
commit: 5321db4aed716bfe5e638808c874469392e2c524 |
| 2 |
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Oct 8 01:29:59 2016 +0000 |
| 4 |
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Oct 8 01:29:59 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5321db4a |
| 7 |
|
| 8 |
dev-libs/crypto++: set CXX also for install |
| 9 |
|
| 10 |
Bug: 596500 |
| 11 |
|
| 12 |
Package-Manager: portage-2.3.0 |
| 13 |
|
| 14 |
dev-libs/crypto++/crypto++-5.6.4-r1.ebuild | 22 ++++++++++------------ |
| 15 |
1 file changed, 10 insertions(+), 12 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-libs/crypto++/crypto++-5.6.4-r1.ebuild b/dev-libs/crypto++/crypto++-5.6.4-r1.ebuild |
| 18 |
index 6444560..ef46487 100644 |
| 19 |
--- a/dev-libs/crypto++/crypto++-5.6.4-r1.ebuild |
| 20 |
+++ b/dev-libs/crypto++/crypto++-5.6.4-r1.ebuild |
| 21 |
@@ -18,11 +18,17 @@ IUSE="static-libs" |
| 22 |
DEPEND="app-arch/unzip" |
| 23 |
|
| 24 |
S="${WORKDIR}" |
| 25 |
+ |
| 26 |
PATCHES=( |
| 27 |
- # Building with -march=native breaks when one wants to build for older CPUs. |
| 28 |
"${FILESDIR}/${P}-nonative.patch" |
| 29 |
) |
| 30 |
|
| 31 |
+pkg_setup() { |
| 32 |
+ export CXX="$(tc-getCXX)" |
| 33 |
+ export LIBDIR="${EPREFIX}/usr/$(get_libdir)" |
| 34 |
+ export PREFIX="${EPREFIX}/usr" |
| 35 |
+} |
| 36 |
+ |
| 37 |
src_configure() { |
| 38 |
cp config.recommend config.h || die |
| 39 |
} |
| 40 |
@@ -33,11 +39,7 @@ src_compile() { |
| 41 |
# ASM isn't Darwin/Mach-O ready, #479554, buildsys doesn't grok CPPFLAGS |
| 42 |
[[ ${CHOST} == *-darwin* ]] && append-flags -DCRYPTOPP_DISABLE_X86ASM |
| 43 |
|
| 44 |
- CXX="$(tc-getCXX)" \ |
| 45 |
- emake -f GNUmakefile \ |
| 46 |
- LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ |
| 47 |
- PREFIX="${EPREFIX}/usr" \ |
| 48 |
- all shared |
| 49 |
+ emake -f GNUmakefile all shared |
| 50 |
} |
| 51 |
|
| 52 |
src_test() { |
| 53 |
@@ -47,7 +49,7 @@ src_test() { |
| 54 |
edos2unix "${file}" |
| 55 |
done |
| 56 |
|
| 57 |
- if ! CXX="$(tc-getCXX)" emake test ; then |
| 58 |
+ if ! emake test; then |
| 59 |
eerror "Crypto++ self-tests failed." |
| 60 |
eerror "Try to remove some optimization flags and reemerge Crypto++." |
| 61 |
die "emake test failed" |
| 62 |
@@ -55,11 +57,7 @@ src_test() { |
| 63 |
} |
| 64 |
|
| 65 |
src_install() { |
| 66 |
- emake \ |
| 67 |
- DESTDIR="${ED}" \ |
| 68 |
- PREFIX="${EPREFIX}/usr" \ |
| 69 |
- LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ |
| 70 |
- install |
| 71 |
+ emake DESTDIR="${ED}" install |
| 72 |
|
| 73 |
# remove leftovers as build system sucks |
| 74 |
rm -fr "${ED}"/usr/bin "${ED}"/usr/share/cryptopp |
Archives