[pkgsrc/trunk]: pkgsrc/mk Handle optional ctfmerge/ctfconvert presence on Net...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cd22f25dcb53
branches:  trunk
changeset: 354796:cd22f25dcb53
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Nov 10 20:58:46 2016 +0000

description:
Handle optional ctfmerge/ctfconvert presence on NetBSD by explicitly
passing down NOCTF when they don't exist.

diffstat:

 mk/bsd.pkg.use.mk        |  5 ++++-
 mk/tools/tools.NetBSD.mk |  8 +++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diffs (41 lines):

diff -r 45e2d012b2c9 -r cd22f25dcb53 mk/bsd.pkg.use.mk
--- a/mk/bsd.pkg.use.mk Thu Nov 10 20:25:50 2016 +0000
+++ b/mk/bsd.pkg.use.mk Thu Nov 10 20:58:46 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.use.mk,v 1.62 2016/06/19 20:03:09 wiz Exp $
+#      $NetBSD: bsd.pkg.use.mk,v 1.63 2016/11/10 20:58:46 joerg Exp $
 #
 # Turn USE_* macros into proper depedency logic.  Included near the top of
 # bsd.pkg.mk, after bsd.prefs.mk.
@@ -21,6 +21,9 @@
 
 .if defined(USE_BSD_MAKEFILE)
 MAKE_ENV+=             ${BSD_MAKE_ENV} INSTALL=${TOOLS_INSTALL:Q}
+.  if !defined(TOOLS_PLATFORM.ctfconvert) && !defined(TOOLS_PLATFORM.ctfmerge)
+MAKE_ENV+=             NOCTF=yes
+.  endif
 .  if defined(HAVE_LLVM)
 MAKE_ENV+=             HAVE_LLVM=${HAVE_LLVM:Q}
 .  endif
diff -r 45e2d012b2c9 -r cd22f25dcb53 mk/tools/tools.NetBSD.mk
--- a/mk/tools/tools.NetBSD.mk  Thu Nov 10 20:25:50 2016 +0000
+++ b/mk/tools/tools.NetBSD.mk  Thu Nov 10 20:58:46 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: tools.NetBSD.mk,v 1.58 2016/05/26 16:03:04 khorben Exp $
+# $NetBSD: tools.NetBSD.mk,v 1.59 2016/11/10 20:58:46 joerg Exp $
 #
 # System-supplied tools for the NetBSD operating system.
 
@@ -17,6 +17,12 @@
 TOOLS_PLATFORM.cmp?=           /usr/bin/cmp
 TOOLS_PLATFORM.cp?=            /bin/cp
 TOOLS_PLATFORM.csh?=           /bin/csh
+.if exists(/usr/bin/ctfconvert)
+TOOLS_PLATFORM.ctfconvert?=    /usr/bin/ctfconvert
+.endif
+.if exists(/usr/bin/ctfmerge)
+TOOLS_PLATFORM.ctfmerge?=      /usr/bin/ctfmerge
+.endif
 TOOLS_PLATFORM.cut?=           /usr/bin/cut
 TOOLS_PLATFORM.date?=          /bin/date
 TOOLS_PLATFORM.diff?=          /usr/bin/diff