diff options
| author | jlam <jlam> | 2004-09-23 03:59:01 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-09-23 03:59:01 +0000 |
| commit | 3ffa9ca0be2d2f322f400ab808b2fe9b828c0ab0 (patch) | |
| tree | ac3f94253979b95734df6c91fbb622178944f3ba | |
| parent | fbb0bdefa81c6c6ea661723254cf0303ffefc291 (diff) | |
| download | pkgsrc-3ffa9ca0be2d2f322f400ab808b2fe9b828c0ab0.tar.gz | |
Move @_WRAP_TRANSFORM_SED@ from the logic script into wrapper.sh so that
it can be customized per wrappee. This fixes the imake wrapper script to
not do any transformations to -I... options.
| -rw-r--r-- | mk/wrapper/bsd.wrapper.mk | 5 | ||||
| -rw-r--r-- | mk/wrapper/logic | 4 | ||||
| -rw-r--r-- | mk/wrapper/wrapper.sh | 3 |
3 files changed, 7 insertions, 5 deletions
diff --git a/mk/wrapper/bsd.wrapper.mk b/mk/wrapper/bsd.wrapper.mk index 9450dea4756..6582a04488f 100644 --- a/mk/wrapper/bsd.wrapper.mk +++ b/mk/wrapper/bsd.wrapper.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.wrapper.mk,v 1.1 2004/09/21 15:01:41 jlam Exp $ +# $NetBSD: bsd.wrapper.mk,v 1.2 2004/09/23 03:59:01 jlam Exp $ # # Copyright (c) 2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -78,6 +78,7 @@ PREPEND_PATH+= ${WRAPPER_BINDIR} WRAPPER_DEBUG?= yes CONFIGURE_ENV+= WRAPPER_DEBUG="${WRAPPER_DEBUG}" MAKE_ENV+= WRAPPER_DEBUG="${WRAPPER_DEBUG}" +SCRIPTS_ENV+= WRAPPER_DEBUG="${WRAPPER_DEBUG}" # The caching code, which greatly speeds up the build process, doesn't # work correctly on certain platforms. @@ -293,6 +294,7 @@ _WRAP_SUBST_SED.${_wrappee_}= \ -e "s|@_WRAP_SCAN@|${_WRAP_SCAN.${_wrappee_}:Q}|g" \ -e "s|@_WRAP_SKIP_TRANSFORM@|${_WRAP_SKIP_TRANSFORM.${_wrappee_}:Q}|g" \ -e "s|@_WRAP_TRANSFORM@|${_WRAP_TRANSFORM.${_wrappee_}:Q}|g" \ + -e "s|@_WRAP_TRANSFORM_SED@|${_WRAP_TRANSFORM_SED.${_wrappee_}:Q}|g" \ ${_WRAP_SUBST_SED} _WRAP_COOKIE.${_wrappee_}= ${WRAPPER_DIR}/.wrapper_${_wrappee_}_done @@ -532,7 +534,6 @@ ${_WRAP_CMD_SINK.${_wrappee_}}: ${WRAPPER_SRCDIR}/cmd-sink ${_WRAP_LOGIC.${_wrappee_}}: ${WRAPPER_SRCDIR}/logic ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H} ${_PKG_SILENT}${_PKG_DEBUG}${CAT} ${.ALLSRC} \ - | ${SED} -e "s|@_WRAP_TRANSFORM_SED@|${_WRAP_TRANSFORM_SED.${_wrappee_}:Q}|g" \ | ${_WRAP_SH_CRUNCH_FILTER} > ${.TARGET} . endif .endfor # _WRAPPEES diff --git a/mk/wrapper/logic b/mk/wrapper/logic index 7b9de8f0f32..080c34e4ecf 100644 --- a/mk/wrapper/logic +++ b/mk/wrapper/logic @@ -1,4 +1,4 @@ -# $NetBSD: logic,v 1.3 2004/09/22 23:17:47 jlam Exp $ +# $NetBSD: logic,v 1.4 2004/09/23 03:59:01 jlam Exp $ # # Copyright (c) 2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -202,7 +202,7 @@ while ! queue_is_empty argbuf; do shquote "$arg"; cachearg="$shquoted" case $arg in -*|/*) - arg=`$echo "X$arg" | $Xsed @_WRAP_TRANSFORM_SED@` + arg=`$echo "X$arg" | $Xsed $transform_sed` $debug_log $wrapperlog " (logic) to: $arg" addtocache=yes ;; diff --git a/mk/wrapper/wrapper.sh b/mk/wrapper/wrapper.sh index 32c8a5a31ba..37be69e51fa 100644 --- a/mk/wrapper/wrapper.sh +++ b/mk/wrapper/wrapper.sh @@ -1,6 +1,6 @@ #! @WRAPPER_SHELL@ # -# $NetBSD: wrapper.sh,v 1.2 2004/09/22 17:56:31 jlam Exp $ +# $NetBSD: wrapper.sh,v 1.3 2004/09/23 03:59:01 jlam Exp $ # # Copyright (c) 2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -49,6 +49,7 @@ reorderlibs="@_WRAP_REORDERLIBS@" shell_lib="@_WRAP_SHELL_LIB@" scan="@_WRAP_SCAN@" transform="@_WRAP_TRANSFORM@" +transform_sed="@_WRAP_TRANSFORM_SED@" wrapperlog="${WRAPPER_LOG-@_WRAP_LOG@}" skip_transform="${WRAPPER_SKIP_TRANSFORM-@_WRAP_SKIP_TRANSFORM@}" debug="${WRAPPER_DEBUG-no}" |