diff options
Diffstat (limited to 'mk/bulk/bsd.bulk-pkg.mk')
| -rw-r--r-- | mk/bulk/bsd.bulk-pkg.mk | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/mk/bulk/bsd.bulk-pkg.mk b/mk/bulk/bsd.bulk-pkg.mk index 4cb48295957..54b4a595d7e 100644 --- a/mk/bulk/bsd.bulk-pkg.mk +++ b/mk/bulk/bsd.bulk-pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.bulk-pkg.mk,v 1.86 2005/10/16 17:35:25 tv Exp $ +# $NetBSD: bsd.bulk-pkg.mk,v 1.87 2005/10/26 16:54:04 tv Exp $ # # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@NetBSD.org> @@ -47,13 +47,6 @@ TEE?= tee WC?= wc TO_HTML?= ${SED} -e 's,&,\&,g' -e 's,<,\<,g' -e 's,>,\>,g' -# A sort(1) capable of very long lines is needed for full builds in "tflat". -# Some platforms (namely, Interix) may not provide one, so override here. -.if ${OPSYS} == "Interix" -_SORT= ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}sort -.endif -_SORT?= ${SORT} - # This variable is set to 'yes' by the pkgsrc/mk/bulk/build script. It enables # the use of several cache files (DEPENDSTREEFILE, DEPENDSFILE, SUPPORTSFILE, # and INDEXFILE) for speeding up the processing of dependencies. If we're not @@ -199,15 +192,17 @@ bulk-cache: }} END{ \ for(pkg in pkgs) {if( pkg in listed ) {} else{ print pkg " " pkg;}} \ }' \ - ${BULK_DBFILE} | ${_SORT} -u > ${DEPENDSTREEFILE} + ${BULK_DBFILE} | ${SORT} -u > ${DEPENDSTREEFILE} @${ECHO_MSG} "BULK> Extracting package name <=> package directory cross reference file" ${AWK} '/^index/ {print $$2 " " $$3 " "}' ${BULK_DBFILE} > ${INDEXFILE} .endif @${ECHO_MSG} "BULK> Sorting build order." ${TSORT} ${DEPENDSTREEFILE} > ${ORDERFILE} @${ECHO_MSG} "BULK> Generating up and down dependency files." - ${SETENV} SORT=${_SORT:Q} ${AWK} -f ${PKGSRCDIR}/mk/bulk/tflat up ${DEPENDSTREEFILE} > ${SUPPORTSFILE} - ${SETENV} SORT=${_SORT:Q} ${AWK} -f ${PKGSRCDIR}/mk/bulk/tflat down ${DEPENDSTREEFILE} > ${DEPENDSFILE} + ${LOCALBASE}/bin/perl ${PKGSRCDIR}/mk/bulk/tflat ${SUPPORTSFILE} ${DEPENDSFILE} < ${DEPENDSTREEFILE} + +# note explicit pathname on "perl" above, so that we do NOT auto-set +# USE_TOOLS=perl (which may be undesirable for package building) # remove the bulk cache files clean-bulk-cache: |