diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2012-09-29 17:01:47 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2012-09-29 17:01:47 +0000 |
| commit | 3d44ac5ed07f5aa9123f4cad0bdcbb6ac9efda06 (patch) | |
| tree | 06c15a436dccf2d3d874465d9955c6f8f029107a /dev-java | |
| parent | alpha/ia64/m68k/s390/sh/sparc stable wrt #434288 (diff) | |
| download | gentoo-2-3d44ac5ed07f5aa9123f4cad0bdcbb6ac9efda06.tar.gz gentoo-2-3d44ac5ed07f5aa9123f4cad0bdcbb6ac9efda06.tar.bz2 gentoo-2-3d44ac5ed07f5aa9123f4cad0bdcbb6ac9efda06.zip | |
Fix thinkos that triggered invalid install_names when installing on x64-macos
(Portage version: 2.2.01.21143-prefix/cvs/Darwin i386)
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/soylatte-jdk-bin/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/soylatte-jdk-bin/soylatte-jdk-bin-1.0.3.ebuild | 10 |
2 files changed, 11 insertions, 5 deletions
diff --git a/dev-java/soylatte-jdk-bin/ChangeLog b/dev-java/soylatte-jdk-bin/ChangeLog index ff6365643cda..61750726eabf 100644 --- a/dev-java/soylatte-jdk-bin/ChangeLog +++ b/dev-java/soylatte-jdk-bin/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/soylatte-jdk-bin # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/soylatte-jdk-bin/ChangeLog,v 1.1 2012/09/29 11:08:58 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/soylatte-jdk-bin/ChangeLog,v 1.2 2012/09/29 17:01:47 grobian Exp $ + + 29 Sep 2012; Fabian Groffen <grobian@gentoo.org> + soylatte-jdk-bin-1.0.3.ebuild: + Fix thinkos that triggered invalid install_names when installing on x64-macos *soylatte-jdk-bin-1.0.3 (29 Sep 2012) diff --git a/dev-java/soylatte-jdk-bin/soylatte-jdk-bin-1.0.3.ebuild b/dev-java/soylatte-jdk-bin/soylatte-jdk-bin-1.0.3.ebuild index d109e8a74afc..2d42ff02c774 100644 --- a/dev-java/soylatte-jdk-bin/soylatte-jdk-bin-1.0.3.ebuild +++ b/dev-java/soylatte-jdk-bin/soylatte-jdk-bin-1.0.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/soylatte-jdk-bin/soylatte-jdk-bin-1.0.3.ebuild,v 1.1 2012/09/29 11:08:58 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/soylatte-jdk-bin/soylatte-jdk-bin-1.0.3.ebuild,v 1.2 2012/09/29 17:01:47 grobian Exp $ EAPI="3" @@ -30,7 +30,9 @@ S=${WORKDIR}/${MY_P} src_prepare() { # fix install_names - local original_root=/data/Users/landonf/Documents/Code/Java/javasrc_1_6_jrl_darwin_stable/control/build/bsd-i586 + local arch=i586 + use x64-macos && arch=amd64 + local original_root=/data/Users/landonf/Documents/Code/Java/javasrc_1_6_jrl_darwin_stable/control/build/bsd-${arch} local original_demo=${original_root}/demo local original_lib=${original_root}/lib for dir in demo jre ; do @@ -53,10 +55,10 @@ src_prepare() { ${dynamic_lib} ;; libjvm.dylib) - # default to client JVM + # 64-bits binary has no client, so default to server JVM install_name_tool -change \ ${linked_against} \ - "${EPREFIX}"/opt/${P}/jre/lib/$(use x86-macos && echo i386 || echo amd64)/client/libjvm.dylib \ + "${EPREFIX}"/opt/${P}/jre/lib/$(use x86-macos && echo i386/client || echo amd64/server)/libjvm.dylib \ ${dynamic_lib} ;; */libodbc*.dylib) |