diff options
| author | joerg <joerg@pkgsrc.org> | 2016-11-10 20:58:46 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2016-11-10 20:58:46 +0000 |
| commit | 7732f0530c7433cf066cc6f95a74065638d03199 (patch) | |
| tree | 617065a78fe9b24606492ed26d9a83ba6d2888de /mk | |
| parent | 92cf17a3f9d98fd120905b2c8b45e4989a1f241c (diff) | |
| download | pkgsrc-7732f0530c7433cf066cc6f95a74065638d03199.tar.gz | |
Handle optional ctfmerge/ctfconvert presence on NetBSD by explicitly
passing down NOCTF when they don't exist.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.use.mk | 5 | ||||
| -rw-r--r-- | mk/tools/tools.NetBSD.mk | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/mk/bsd.pkg.use.mk b/mk/bsd.pkg.use.mk index 9c6683b1057..6a38c8a8791 100644 --- a/mk/bsd.pkg.use.mk +++ b/mk/bsd.pkg.use.mk @@ -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 --git a/mk/tools/tools.NetBSD.mk b/mk/tools/tools.NetBSD.mk index 063d06cc4e3..94c309dbfcd 100644 --- a/mk/tools/tools.NetBSD.mk +++ b/mk/tools/tools.NetBSD.mk @@ -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 |