diff options
| author | tnn <tnn@pkgsrc.org> | 2015-03-04 17:01:02 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2015-03-04 17:01:02 +0000 |
| commit | 6a5fd1d74bec0834cfaf97a92313275fcd4c65b6 (patch) | |
| tree | d6ee732e8ac4f475b369de3637d8ca16a9d60713 | |
| parent | 3554136526f2b47b76bb5bb1046c1c8263dc65d1 (diff) | |
| download | pkgsrc-6a5fd1d74bec0834cfaf97a92313275fcd4c65b6.tar.gz | |
change clang dependency to libLLVM for zeroshark option
(doesn't work because it only supports llvm 3.4 and we have 3.6)
| -rw-r--r-- | lang/openjdk7/options.mk | 4 | ||||
| -rw-r--r-- | lang/openjdk8/options.mk | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/lang/openjdk7/options.mk b/lang/openjdk7/options.mk index d8319cf5d8b..9239973eb70 100644 --- a/lang/openjdk7/options.mk +++ b/lang/openjdk7/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.10 2015/02/21 10:44:14 tnn Exp $ +# $NetBSD: options.mk,v 1.11 2015/03/04 17:01:02 tnn Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.openjdk7 PKG_OPTIONS_OPTIONAL_GROUPS= variant @@ -93,5 +93,5 @@ PLIST.native= yes .endif .if !empty(PKG_OPTIONS:Mjdk-zeroshark-vm) MAKE_ENV+= SHARK_BUILD=true -.include "../../lang/clang/buildlink3.mk" +.include "../../lang/libLLVM/buildlink3.mk" .endif diff --git a/lang/openjdk8/options.mk b/lang/openjdk8/options.mk index baa7c2ff5ad..6a4e33c2d5d 100644 --- a/lang/openjdk8/options.mk +++ b/lang/openjdk8/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2015/02/21 09:36:31 tnn Exp $ +# $NetBSD: options.mk,v 1.3 2015/03/04 17:01:02 tnn Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.openjdk8 PKG_OPTIONS_OPTIONAL_GROUPS= variant @@ -93,7 +93,8 @@ BUILD_VARIANT= zero .elif !empty(PKG_OPTIONS:Mjdk-zeroshark-vm) BUILD_VARIANT= zeroshark .include "../../devel/libffi/buildlink3.mk" -.include "../../lang/clang/buildlink3.mk" +.include "../../lang/libLLVM/buildlink3.mk" +CONFIGURE_ENV+= LLVM_CONFIG=${LLVM_CONFIG_PATH} .else BUILD_VARIANT= server PLIST.native= yes |