diff options
| author | richard <richard> | 2013-10-16 16:48:55 +0000 |
|---|---|---|
| committer | richard <richard> | 2013-10-16 16:48:55 +0000 |
| commit | 3f68854bc1c777cb4dad2b6be926057e8f15ea47 (patch) | |
| tree | a890751e1771a58f008147a8bfb9c86d58100b6c /lang/sun-jdk7 | |
| parent | e44b48ea2236ee55342369c21c7263d1dc27cfc7 (diff) | |
| download | pkgsrc-3f68854bc1c777cb4dad2b6be926057e8f15ea47.tar.gz | |
improve builtin versioning and update BUILDLINK_DEPMETHOD correctly for sun-jdk7
Diffstat (limited to 'lang/sun-jdk7')
| -rw-r--r-- | lang/sun-jdk7/buildlink3.mk | 3 | ||||
| -rw-r--r-- | lang/sun-jdk7/builtin.mk | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/lang/sun-jdk7/buildlink3.mk b/lang/sun-jdk7/buildlink3.mk index a7db3d02e18..ca0d4efa39f 100644 --- a/lang/sun-jdk7/buildlink3.mk +++ b/lang/sun-jdk7/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2013/03/06 16:58:57 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2013/10/16 16:48:55 richard Exp $ BUILDLINK_TREE+= sun-jdk7 @@ -24,6 +24,7 @@ BUILDLINK_CPPFLAGS.sun-jdk7= \ -I${BUILDLINK_JAVA_PREFIX.sun-jre7}/include/linux .endif +BUILDLINK_DEPMETHOD.sun-jre7?= ${BUILDLINK_DEPMETHOD.sun-jdk7} .include "../../lang/sun-jre7/buildlink3.mk" .endif # SUN_JDK7_BUILDLINK3_MK diff --git a/lang/sun-jdk7/builtin.mk b/lang/sun-jdk7/builtin.mk index 99a75af456d..1f62bd13a73 100644 --- a/lang/sun-jdk7/builtin.mk +++ b/lang/sun-jdk7/builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: builtin.mk,v 1.1 2012/12/11 14:51:33 ryoon Exp $ +# $NetBSD: builtin.mk,v 1.2 2013/10/16 16:48:55 richard Exp $ BUILTIN_PKG:= sun-jdk7 @@ -30,8 +30,9 @@ MAKEVARS+= IS_BUILTIN.sun-jdk7 !empty(IS_BUILTIN.sun-jdk7:M[yY][eE][sS]) && \ empty(JDK7:M__nonexistent__) -BUILTIN_VERSION.sun-jdk7!= ${JDK7} -version 2>&1 | ${HEAD} -1 | \ - ${AWK} '{print $$2}' +BUILTIN_VERSION.sun-jdk7!= ${JDK7} -version 2>&1 | \ + ${AWK} '{print $$2; exit}' | \ + ${AWK} '{sub(/^1\./,"");sub(/_/,".");print $$1}' BUILTIN_PKG.sun-jdk7= sun-jdk7-${BUILTIN_VERSION.sun-jdk7} .endif |