From 5c2538ffca02c69fdda77e646c95e3c40bc776cf Mon Sep 17 00:00:00 2001 From: Thomas Sachau Date: Mon, 21 Jul 2008 10:24:06 +0000 Subject: [PATCH] net-libs/nativebiginteger: Add workaround for system-vm=jre svn path=/sunrise/; revision=6537 --- net-libs/nativebiginteger/ChangeLog | 4 ++++ net-libs/nativebiginteger/Manifest | 4 ++-- .../nativebiginteger-0.6.1.31.ebuild | 24 +++++++++++++++++-- 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/net-libs/nativebiginteger/ChangeLog b/net-libs/nativebiginteger/ChangeLog index 76d2745c5..6c37e789d 100644 --- a/net-libs/nativebiginteger/ChangeLog +++ b/net-libs/nativebiginteger/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 21 Jul 2008; Thomas Sachau (Tommy[D]) + nativebiginteger-0.6.1.31.ebuild: + Add workaround for system-vm=jre + 20 Apr 2008; Thomas Sachau (Tommy[D]) nativebiginteger-0.6.1.31.ebuild: Add blocker for previous location diff --git a/net-libs/nativebiginteger/Manifest b/net-libs/nativebiginteger/Manifest index d56bf2f15..5778a19d5 100644 --- a/net-libs/nativebiginteger/Manifest +++ b/net-libs/nativebiginteger/Manifest @@ -1,5 +1,5 @@ AUX Makefile 1630 RMD160 bd7b0da52fb19bd77e6421955110988add37920d SHA1 adf654b466862dd9422126c47aac2941f27125f5 SHA256 faf56c00f18d2ccb8f893016474787f536f40cd33ce0065b6732443e76c8206a DIST nativebiginteger-0.6.1.31.tar.bz2 9176 RMD160 2a877fd07fa8ff2023a3496b753473769b85a255 SHA1 342d70cecb5fba311c99ee76ade9dfe0b55ae981 SHA256 ee506b2b4d7088ca4434c895025abebf8a306a0dc9e8b39136ec129e2527d186 -EBUILD nativebiginteger-0.6.1.31.ebuild 788 RMD160 79b1585ab87e3bf1cb9a985503f599c2811d6e48 SHA1 bbe93131365c51ead7c2371634153902c1655e77 SHA256 568eb5eaeb2d5586d272aca07d7c56e09440e9a0c2bcb498327fc16b6599f123 -MISC ChangeLog 968 RMD160 58fbe6e8e965631afae71a3a4534853f7b97c1a7 SHA1 cf3c349f0ddad0629f2e1c307fe9cbcec8fb1435 SHA256 9f9529345d7736bf805d497af46d07b9fb59542d7394eab63a8523b79950233a +EBUILD nativebiginteger-0.6.1.31.ebuild 1445 RMD160 d4b092c21c9296a54c9e5101eca492c95aa3ad73 SHA1 6e05fe15e99d64788a109d050e92575248dd3aaf SHA256 ae439a46c5b2012ac199a3f1d5fbc9d045a0877fd1d5a22dbfeb5aac0788c968 +MISC ChangeLog 1099 RMD160 721ccba4f4453bda3055596fcc8aea3fb30a60b4 SHA1 3a7636d5878ad46b7b0af36d5404bcbb652d947d SHA256 9ee92b283a33edf3a4295821f26e17367eefbfe4beaeccc334a24ce0414cc6d6 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 diff --git a/net-libs/nativebiginteger/nativebiginteger-0.6.1.31.ebuild b/net-libs/nativebiginteger/nativebiginteger-0.6.1.31.ebuild index cd305dbf0..716666168 100644 --- a/net-libs/nativebiginteger/nativebiginteger-0.6.1.31.ebuild +++ b/net-libs/nativebiginteger/nativebiginteger-0.6.1.31.ebuild @@ -24,9 +24,29 @@ src_compile() { append-flags -fPIC tc-export CC cp "${FILESDIR}"/Makefile . - make libjbigi || die + + #workaround, if current system-vm is a jre + if has_version =dev-java/sun-jdk-1.6*; then + einfo "Using sun-jdk-1.6" + GENTOO_VM="sun-jdk-1.6" make libjbigi || die + elif has_version =dev-java/sun-jdk-1.5*; then + einfo "Using sun-jdk-1.5" + GENTOO_VM="sun-jdk-1.5" make libjbigi || die + else + ewarn "Using system vm, make sure it is a JDK!!!" + make libjbigi || die + fi use amd64 || filter-flags -fPIC - make libjcpuid || die + if has_version =dev-java/sun-jdk-1.6*; then + einfo "Using sun-jdk-1.6" + GENTOO_VM="sun-jdk-1.6" make libjcpuid || die + elif has_version =dev-java/sun-jdk-1.5*; then + einfo "Using sun-jdk-1.5" + GENTOO_VM="sun-jdk-1.5" make libjcpuid || die + else + ewarn "Using system vm, make sure it is a JDK!!!" + make libjcpuid || die + fi } src_install() { -- 2.43.2