diff options
| author | jperkin <jperkin@pkgsrc.org> | 2015-04-27 19:38:03 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2015-04-27 19:38:03 +0000 |
| commit | 5000019aeddac237ac2996c5b99d57242576de7e (patch) | |
| tree | b3711469c9147ee1227e7770924667470cc3d1af | |
| parent | aa3c0a3d6fa18459b23363cf8a5e17316c664b9c (diff) | |
| download | pkgsrc-5000019aeddac237ac2996c5b99d57242576de7e.tar.gz | |
Remove ECHO_WRAPPER_MSG and just use ECHO_BUILDLINK_MSG, which was set
to the same value anyway. Also removes a comment from 2005 which was
possibly wrong at the time it was committed, given the same construct
has been used in bsd.buildlink3.mk unchanged since 2004.
| -rw-r--r-- | mk/buildlink3/bsd.buildlink3.mk | 4 | ||||
| -rw-r--r-- | mk/wrapper/bsd.wrapper.mk | 19 |
2 files changed, 7 insertions, 16 deletions
diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk index dede51f62f1..fc0279d4e7f 100644 --- a/mk/buildlink3/bsd.buildlink3.mk +++ b/mk/buildlink3/bsd.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.buildlink3.mk,v 1.234 2015/03/15 21:18:32 joerg Exp $ +# $NetBSD: bsd.buildlink3.mk,v 1.235 2015/04/27 19:38:03 jperkin Exp $ # # Copyright (c) 2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -77,7 +77,7 @@ .if ${PKG_DEBUG_LEVEL} > 0 ECHO_BUILDLINK_MSG?= ${ECHO} .else -ECHO_BUILDLINK_MSG?= ${ECHO_WRAPPER_MSG} +ECHO_BUILDLINK_MSG?= ${TRUE} .endif BUILDLINK_DIR= ${WRKDIR}/.buildlink BUILDLINK_BINDIR= ${BUILDLINK_DIR}/bin diff --git a/mk/wrapper/bsd.wrapper.mk b/mk/wrapper/bsd.wrapper.mk index 25022318d0d..f2e9416e5f7 100644 --- a/mk/wrapper/bsd.wrapper.mk +++ b/mk/wrapper/bsd.wrapper.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.wrapper.mk,v 1.91 2014/11/25 18:27:49 joerg Exp $ +# $NetBSD: bsd.wrapper.mk,v 1.92 2015/04/27 19:38:03 jperkin Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -49,15 +49,6 @@ .include "../../mk/wrapper/wrapper-defs.mk" -# pkgsrc bmake does not (yet) correctly handle ${VAR} > 0 because -# ${VAR} is treated as a string, so we must use a string comparison -# operator. -.if ${PKG_DEBUG_LEVEL} != "0" || defined(PKG_VERBOSE) -ECHO_WRAPPER_MSG?= ${ECHO} -.else -ECHO_WRAPPER_MSG?= ${TRUE} -.endif - .PHONY: generate-wrappers .include "../../mk/buildlink3/bsd.buildlink3.mk" @@ -451,8 +442,8 @@ ${_WRAP_COOKIE.${_wrappee_}}: \ ${_WRAP_TRANSFORM.${_wrappee_}} ${RUN} \ wrapper="${WRAPPER_${_wrappee_}:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//}"; \ - if [ -x "$$wrapper" ]; then ${ECHO_WRAPPER_MSG} "=> $$wrapper already exists. Skipping"; exit 0; fi; \ - ${ECHO_WRAPPER_MSG} "=> Creating ${_wrappee_} wrapper: $$wrapper"; \ + if [ -x "$$wrapper" ]; then ${ECHO_BUILDLINK_MSG} "=> $$wrapper already exists. Skipping"; exit 0; fi; \ + ${ECHO_BUILDLINK_MSG} "=> Creating ${_wrappee_} wrapper: $$wrapper"; \ gen_wrapper=yes; \ wrappee="${PKG_${_wrappee_}:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//}"; \ case $$wrappee in \ @@ -476,7 +467,7 @@ ${_WRAP_COOKIE.${_wrappee_}}: \ IFS="$$save_IFS"; \ if ${TEST} ! -x "$$wrappee"; then \ gen_wrapper=no; \ - ${ECHO_WRAPPER_MSG} "Warning: unable to generate ${_wrappee_} wrapper script: \`$$wrappee'"; \ + ${ECHO_BUILDLINK_MSG} "Warning: unable to generate ${_wrappee_} wrapper script: \`$$wrappee'"; \ fi; \ ;; \ esac; \ @@ -500,7 +491,7 @@ ${_alias_}: ${_WRAP_COOKIE.${_wrappee_}} ${RUN} \ wrapper="${WRAPPER_${_wrappee_}:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//}"; \ if [ ! -x ${.TARGET} -a -x $$wrapper ]; then \ - ${ECHO_WRAPPER_MSG} "=> Linking ${_wrappee_} wrapper: ${.TARGET}"; \ + ${ECHO_BUILDLINK_MSG} "=> Linking ${_wrappee_} wrapper: ${.TARGET}"; \ ${LN} -f${WRAPPER_USE_SYMLINK:Ds} $$wrapper ${.TARGET}; \ fi . endif |