diff options
| author | richard <richard@pkgsrc.org> | 2013-10-16 16:47:29 +0000 |
|---|---|---|
| committer | richard <richard@pkgsrc.org> | 2013-10-16 16:47:29 +0000 |
| commit | d7334db97d532abd7b7ef2cf8b741436152ace53 (patch) | |
| tree | ae33b10f080ff7ed7bdb5aa7af7e549d186243a3 /lang/sun-jre7 | |
| parent | bcb950d2d60a36d6059f9bf23d8e3a33c77599e4 (diff) | |
| download | pkgsrc-d7334db97d532abd7b7ef2cf8b741436152ace53.tar.gz | |
improve builtin versioning and update BUILDLINK_JAVA_PREFIX accordingly for sun-jre7
Diffstat (limited to 'lang/sun-jre7')
| -rw-r--r-- | lang/sun-jre7/buildlink3.mk | 11 | ||||
| -rw-r--r-- | lang/sun-jre7/builtin.mk | 7 |
2 files changed, 14 insertions, 4 deletions
diff --git a/lang/sun-jre7/buildlink3.mk b/lang/sun-jre7/buildlink3.mk index 13d70493329..0a4c138e94f 100644 --- a/lang/sun-jre7/buildlink3.mk +++ b/lang/sun-jre7/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2012/12/11 14:47:17 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2013/10/16 16:47:29 richard Exp $ BUILDLINK_TREE+= sun-jre7 @@ -8,7 +8,16 @@ SUN_JRE7_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.sun-jre7+= sun-jre7-[0-9]* BUILDLINK_ABI_DEPENDS.sun-jre7+= sun-jre7>=7.0.9 BUILDLINK_PKGSRCDIR.sun-jre7?= ../../lang/sun-jre7 + +CHECK_BUILTIN.sun-jre7:= yes +.include "../../lang/sun-jre7/builtin.mk" +CHECK_BUILTIN.sun-jre7:= no + +.if !empty(USE_BUILTIN.sun-jre7:M[yY][eE][sS]) +BUILDLINK_JAVA_PREFIX.sun-jre7= ${JAVAVM7} +.else BUILDLINK_JAVA_PREFIX.sun-jre7= ${PREFIX}/java/sun-7 +.endif UNLIMIT_RESOURCES+= datasize # Must be at least 131204 .endif # SUN_JRE7_BUILDLINK3_MK diff --git a/lang/sun-jre7/builtin.mk b/lang/sun-jre7/builtin.mk index 94b449f39d5..394914bedad 100644 --- a/lang/sun-jre7/builtin.mk +++ b/lang/sun-jre7/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.1 2012/12/11 14:47:17 ryoon Exp $ +# $NetBSD: builtin.mk,v 1.2 2013/10/16 16:47:29 richard Exp $ BUILTIN_PKG:= sun-jre7 @@ -30,8 +30,9 @@ MAKEVARS+= IS_BUILTIN.sun-jre7 !empty(IS_BUILTIN.sun-jre7:M[yY][eE][sS]) && \ empty(JAVAVM7:M__nonexistent__) -BUILTIN_VERSION.sun-jre7!= ${JAVAVM7}/bin/java -version 2>&1 | ${HEAD} -1 | \ - ${AWK} -F \" '{print $$2}' | ${AWK} -F _ '{print $$1}' +BUILTIN_VERSION.sun-jre7!= ${JAVAVM7}/bin/java -version 2>&1 | \ + ${AWK} -F \" '{print $$2; exit}' | \ + ${AWK} '{sub(/^1\./,"");sub(/_/,".");print $$1}' BUILTIN_PKG.sun-jre7= sun-jre7-${BUILTIN_VERSION.sun-jre7} .endif |