CVS commit: pkgsrc/mk

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

Module Name:    pkgsrc
Committed By:   joerg
Date:           Thu May  4 18:30:56 UTC 2017

Modified Files:
        pkgsrc/mk: bsd.pkg.mk cwrappers.mk

Log Message:
Simplify PATH handling. Use full pkgsrc path for cwrappers, but skip the
cwrapper directory itself.


To generate a diff of this commit:
cvs rdiff -u -r1.2021 -r1.2022 pkgsrc/mk/bsd.pkg.mk
cvs rdiff -u -r1.27 -r1.28 pkgsrc/mk/cwrappers.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.mk
diff -u pkgsrc/mk/bsd.pkg.mk:1.2021 pkgsrc/mk/bsd.pkg.mk:1.2022
--- pkgsrc/mk/bsd.pkg.mk:1.2021 Fri Aug 26 16:51:56 2016
+++ pkgsrc/mk/bsd.pkg.mk        Thu May  4 18:30:56 2017
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.2021 2016/08/26 16:51:56 joerg Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.2022 2017/05/04 18:30:56 joerg Exp $
 #
 # This file is in the public domain.
 #
@@ -431,16 +431,8 @@ _PATH_ORIG:=               ${PATH}
 MAKEFLAGS+=            _PATH_ORIG=${_PATH_ORIG:Q}
 .endif
 
-.if !empty(PREPEND_PATH:M*)
-# This is very Special.  Because PREPEND_PATH is set with += in reverse order,
-# this command reverses the order again (since bootstrap bmake doesn't
-# yet support the :[-1..1] construct).
-_PATH_CMD= \
-       path=${_PATH_ORIG:Q};                                           \
-       for i in ${PREPEND_PATH}; do path="$$i:$$path"; done;           \
-       ${ECHO} "$$path"
-PATH=  ${_PATH_CMD:sh} # DOES NOT use :=, to defer evaluation
-.endif
+_PATH_COMPONENTS=      ${PREPEND_PATH:[-1..1]} ${_PATH_ORIG:C,:, ,}
+PATH=  ${_PATH_COMPONENTS:ts:}
 
 ################################################################
 # Many ways to disable a package.

Index: pkgsrc/mk/cwrappers.mk
diff -u pkgsrc/mk/cwrappers.mk:1.27 pkgsrc/mk/cwrappers.mk:1.28
--- pkgsrc/mk/cwrappers.mk:1.27 Wed Oct  5 12:46:43 2016
+++ pkgsrc/mk/cwrappers.mk      Thu May  4 18:30:56 2017
@@ -1,4 +1,4 @@
-# $NetBSD: cwrappers.mk,v 1.27 2016/10/05 12:46:43 joerg Exp $
+# $NetBSD: cwrappers.mk,v 1.28 2017/05/04 18:30:56 joerg Exp $
 #
 # This Makefile fragment implements integration of pkgtools/cwrappers.
 
@@ -67,7 +67,7 @@ generate-cwrappers:
 .for wrappee in as cxx cc cpp f77 imake ld libtool shlibtool
        ${RUN}echo worklog=${WRKLOG:Q} > ${CWRAPPERS_CONFIG_DIR}/${CWRAPPERS_CONFIG.${wrappee}}
        ${RUN}echo wrksrc=${WRKSRC:Q} >> ${CWRAPPERS_CONFIG_DIR}/${CWRAPPERS_CONFIG.${wrappee}}
-       ${RUN}case ${wrappee} in *libtool) ;; *) echo path=${_PATH_ORIG:Q} >> ${CWRAPPERS_CONFIG_DIR}/${CWRAPPERS_CONFIG.${wrappee}};; esac
+       ${RUN}case ${wrappee} in *libtool) ;; *) echo path=${_PATH_COMPONENTS:N${WRAPPER_BINDIR}:ts::Q} >> ${CWRAPPERS_CONFIG_DIR}/${CWRAPPERS_CONFIG.${wrappee}};; esac
        ${RUN}echo exec_path=${WRAPPER_BINDIR}/${CWRAPPERS_ALIASES.${wrappee}:[1]} >> ${CWRAPPERS_CONFIG_DIR}/${CWRAPPERS_CONFIG.${wrappee}}
        ${RUN}echo exec=${CWRAPPERS_WRAPPEE.${wrappee}:Q} >> ${CWRAPPERS_CONFIG_DIR}/${CWRAPPERS_CONFIG.${wrappee}}
 .  for cmd in ${WRAPPER_REORDER_CMDS}