CVS commit: pkgsrc/mk

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Thu Nov 10 20:58:46 UTC 2016

Modified Files:
        pkgsrc/mk: bsd.pkg.use.mk
        pkgsrc/mk/tools: tools.NetBSD.mk

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


To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 pkgsrc/mk/bsd.pkg.use.mk
cvs rdiff -u -r1.58 -r1.59 pkgsrc/mk/tools/tools.NetBSD.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/bsd.pkg.use.mk
diff -u pkgsrc/mk/bsd.pkg.use.mk:1.62 pkgsrc/mk/bsd.pkg.use.mk:1.63
--- pkgsrc/mk/bsd.pkg.use.mk:1.62       Sun Jun 19 20:03:09 2016
+++ pkgsrc/mk/bsd.pkg.use.mk    Thu Nov 10 20:58:46 2016
@@ -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

Index: pkgsrc/mk/tools/tools.NetBSD.mk
diff -u pkgsrc/mk/tools/tools.NetBSD.mk:1.58 pkgsrc/mk/tools/tools.NetBSD.mk:1.59
--- pkgsrc/mk/tools/tools.NetBSD.mk:1.58        Thu May 26 16:03:04 2016
+++ pkgsrc/mk/tools/tools.NetBSD.mk     Thu Nov 10 20:58:46 2016
@@ -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.chown?=               /usr/sbin/chown
 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