| 1 |
grobian 12/09/29 17:01:47 |
| 2 |
|
| 3 |
Modified: soylatte-jdk-bin-1.0.3.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Fix thinkos that triggered invalid install_names when installing on x64-macos |
| 6 |
|
| 7 |
(Portage version: 2.2.01.21143-prefix/cvs/Darwin i386) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 dev-java/soylatte-jdk-bin/soylatte-jdk-bin-1.0.3.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/soylatte-jdk-bin/soylatte-jdk-bin-1.0.3.ebuild?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/soylatte-jdk-bin/soylatte-jdk-bin-1.0.3.ebuild?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/soylatte-jdk-bin/soylatte-jdk-bin-1.0.3.ebuild?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: soylatte-jdk-bin-1.0.3.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/soylatte-jdk-bin/soylatte-jdk-bin-1.0.3.ebuild,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- soylatte-jdk-bin-1.0.3.ebuild 29 Sep 2012 11:08:58 -0000 1.1 |
| 23 |
+++ soylatte-jdk-bin-1.0.3.ebuild 29 Sep 2012 17:01:47 -0000 1.2 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2012 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $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 $ |
| 28 |
+# $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 $ |
| 29 |
|
| 30 |
EAPI="3" |
| 31 |
|
| 32 |
@@ -30,7 +30,9 @@ |
| 33 |
|
| 34 |
src_prepare() { |
| 35 |
# fix install_names |
| 36 |
- local original_root=/data/Users/landonf/Documents/Code/Java/javasrc_1_6_jrl_darwin_stable/control/build/bsd-i586 |
| 37 |
+ local arch=i586 |
| 38 |
+ use x64-macos && arch=amd64 |
| 39 |
+ local original_root=/data/Users/landonf/Documents/Code/Java/javasrc_1_6_jrl_darwin_stable/control/build/bsd-${arch} |
| 40 |
local original_demo=${original_root}/demo |
| 41 |
local original_lib=${original_root}/lib |
| 42 |
for dir in demo jre ; do |
| 43 |
@@ -53,10 +55,10 @@ |
| 44 |
${dynamic_lib} |
| 45 |
;; |
| 46 |
libjvm.dylib) |
| 47 |
- # default to client JVM |
| 48 |
+ # 64-bits binary has no client, so default to server JVM |
| 49 |
install_name_tool -change \ |
| 50 |
${linked_against} \ |
| 51 |
- "${EPREFIX}"/opt/${P}/jre/lib/$(use x86-macos && echo i386 || echo amd64)/client/libjvm.dylib \ |
| 52 |
+ "${EPREFIX}"/opt/${P}/jre/lib/$(use x86-macos && echo i386/client || echo amd64/server)/libjvm.dylib \ |
| 53 |
${dynamic_lib} |
| 54 |
;; |
| 55 |
*/libodbc*.dylib) |
| 56 |
|
| 57 |
|
| 58 |
|
| 59 |
1.2 dev-java/soylatte-jdk-bin/ChangeLog |
| 60 |
|
| 61 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/soylatte-jdk-bin/ChangeLog?rev=1.2&view=markup |
| 62 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/soylatte-jdk-bin/ChangeLog?rev=1.2&content-type=text/plain |
| 63 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/soylatte-jdk-bin/ChangeLog?r1=1.1&r2=1.2 |
| 64 |
|
| 65 |
Index: ChangeLog |
| 66 |
=================================================================== |
| 67 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/soylatte-jdk-bin/ChangeLog,v |
| 68 |
retrieving revision 1.1 |
| 69 |
retrieving revision 1.2 |
| 70 |
diff -u -r1.1 -r1.2 |
| 71 |
--- ChangeLog 29 Sep 2012 11:08:58 -0000 1.1 |
| 72 |
+++ ChangeLog 29 Sep 2012 17:01:47 -0000 1.2 |
| 73 |
@@ -1,6 +1,10 @@ |
| 74 |
# ChangeLog for dev-java/soylatte-jdk-bin |
| 75 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 76 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/soylatte-jdk-bin/ChangeLog,v 1.1 2012/09/29 11:08:58 grobian Exp $ |
| 77 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/soylatte-jdk-bin/ChangeLog,v 1.2 2012/09/29 17:01:47 grobian Exp $ |
| 78 |
+ |
| 79 |
+ 29 Sep 2012; Fabian Groffen <grobian@g.o> |
| 80 |
+ soylatte-jdk-bin-1.0.3.ebuild: |
| 81 |
+ Fix thinkos that triggered invalid install_names when installing on x64-macos |
| 82 |
|
| 83 |
*soylatte-jdk-bin-1.0.3 (29 Sep 2012) |
Archives