pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/ghc90 Do not include ../../lang/llvm/buildlink3.mk



details:   https://anonhg.NetBSD.org/pkgsrc/rev/61386c611a73
branches:  trunk
changeset: 453067:61386c611a73
user:      pho <pho%pkgsrc.org@localhost>
date:      Sun May 23 06:33:23 2021 +0000

description:
Do not include ../../lang/llvm/buildlink3.mk

GHC only needs bin/opt and bin/llc but not libLLVM, so inheriting its dependencies does not make sense.

diffstat:

 lang/ghc90/options.mk |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (33 lines):

diff -r cd22f5f5e795 -r 61386c611a73 lang/ghc90/options.mk
--- a/lang/ghc90/options.mk     Sat May 22 23:35:30 2021 +0000
+++ b/lang/ghc90/options.mk     Sun May 23 06:33:23 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2021/05/21 01:45:00 pho Exp $
+# $NetBSD: options.mk,v 1.2 2021/05/23 06:33:23 pho Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.ghc
 
@@ -20,12 +20,12 @@
 .endif
 
 .if !empty(PKG_OPTIONS:Mllvm) || ${GHC_LLVM_REQUIRED} == "yes"
-.  include "../../lang/llvm/buildlink3.mk"
-.  include "../../lang/llvm/version.mk"
+DEPENDS+=      llvm-[0-9]*:../../lang/llvm
 CONFIGURE_ENV+=        LLC=${PREFIX:Q}/bin/llc
 CONFIGURE_ENV+=        OPT=${PREFIX:Q}/bin/opt
 
 # Maybe GHC doesn't like this but it's the only option available to us.
+.  include "../../lang/llvm/version.mk"
 SUBST_CLASSES+=                llvm
 SUBST_STAGE.llvm=      post-extract
 SUBST_MESSAGE.llvm=    Accept whichever version of LLVM installed via pkgsrc
@@ -35,7 +35,7 @@
 # Clang is also required on Darwin.
 # See compiler/GHC/SysTools/Tasks.hs (runClang).
 .  if ${OPSYS} == "Darwin"
-.    include "../../lang/clang/buildlink3.mk"
+DEPENDS+=      clang-[0-9]*:../../lang/clang
 CONFIGURE_ENV+=        CLANG=${PREFIX:Q}/bin/clang
 .  else
 CONFIGURE_ENV+=        CLANG=${FALSE}



Home | Main Index | Thread Index | Old Index