diff options
| -rw-r--r-- | mk/bsd.pkg.mk | 9 | ||||
| -rw-r--r-- | mk/check/check-stripped.mk | 5 |
2 files changed, 11 insertions, 3 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 8160c51ae49..1158f3878c6 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1989 2013/05/09 23:37:25 riastradh Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1990 2013/05/12 06:17:50 obache Exp $ # # This file is in the public domain. # @@ -371,7 +371,7 @@ _BUILD_DEFS+= PKG_SYSCONFBASEDIR PKG_SYSCONFDIR # USE_TOOLS+= \ [ awk basename cat chgrp chmod chown cmp cp cut dirname echo \ - egrep env false file find grep head hostname id install ln ls \ + egrep env false find grep head hostname id install ln ls \ mkdir mv printf pwd rm rmdir sed sh sort \ tail test touch tr true wc xargs @@ -383,6 +383,11 @@ USE_TOOLS+= expr USE_TOOLS+= tee tsort .endif +# scripts/shlib-type +.if ${_OPSYS_SHLIB_TYPE} == "ELF/a.out" +USE_TOOLS+= file +.endif + # INSTALL/DEINSTALL script framework .include "pkginstall/bsd.pkginstall.mk" diff --git a/mk/check/check-stripped.mk b/mk/check/check-stripped.mk index f84c9916913..60d64685e33 100644 --- a/mk/check/check-stripped.mk +++ b/mk/check/check-stripped.mk @@ -1,4 +1,4 @@ -# $NetBSD: check-stripped.mk,v 1.4 2010/08/24 19:08:29 bad Exp $ +# $NetBSD: check-stripped.mk,v 1.5 2013/05/12 06:17:50 obache Exp $ # # This file checks that after installation, all binaries conform to the # setting of INSTALL_UNSTRIPPED. @@ -31,6 +31,9 @@ _CHECK_STRIPPED_FILELIST_CMD?= ${SED} -e '/^@/d' ${PLIST} .if !empty(CHECK_STRIPPED:M[Yy][Ee][Ss]) privileged-install-hook: _check-stripped +. if empty(USE_TOOLS:Mfile) +USE_TOOLS+= file +. endif .endif _check-stripped: error-check .PHONY |