diff options
| author | tron <tron@pkgsrc.org> | 2014-09-03 12:47:37 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2014-09-03 12:47:37 +0000 |
| commit | fb5ccd2e172dfa73a4f87d79b7d68e5b01a49abc (patch) | |
| tree | 52ce0249c26e897bcabe6afe33cdfda86a8fc286 /lang/sun-jdk7 | |
| parent | b4111a17dad400836bb3bb2a7a28bb4f56b27700 (diff) | |
| download | pkgsrc-fb5ccd2e172dfa73a4f87d79b7d68e5b01a49abc.tar.gz | |
Add support for Oracle Java 7 (manually installed via Mac OS X builtin
mechanism) under Mac OS X Mavericks.
Patches contributed by J. Lewis Muir via "pkgsrc-users" mailing list.
Diffstat (limited to 'lang/sun-jdk7')
| -rw-r--r-- | lang/sun-jdk7/builtin.mk | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/lang/sun-jdk7/builtin.mk b/lang/sun-jdk7/builtin.mk index 1f62bd13a73..a85eb7a970a 100644 --- a/lang/sun-jdk7/builtin.mk +++ b/lang/sun-jdk7/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.2 2013/10/16 16:48:55 richard Exp $ +# $NetBSD: builtin.mk,v 1.3 2014/09/03 12:47:37 tron Exp $ BUILTIN_PKG:= sun-jdk7 @@ -7,6 +7,24 @@ BUILTIN_FIND_FILES.JDK7= \ /System/Library/Frameworks/JavaVM.framework/Versions/1.7/Commands/javac\ /usr/jdk/instances/jdk1.7.0/bin/javac +### +### On Darwin, there are no 1.7 symlinks that would enable us to find a +### 1.7 JDK. Instead, the best method is to use the java_home system +### program to find the default 1.7 JDK if it exists. +### +.if ${OPSYS} == "Darwin" +_JAVA_HOME_ANSWER!= \ + if [ -x /usr/libexec/java_home ]; then \ + result=`/usr/libexec/java_home -v 1.7 2> /dev/null`; \ + if [ $$? -eq 0 ]; then \ + echo "$$result"; \ + else \ + echo; \ + fi; \ + fi +BUILTIN_FIND_FILES.JDK7+= ${_JAVA_HOME_ANSWER}/bin/javac +.endif + .include "../../mk/buildlink3/bsd.builtin.mk" ### |