diff options
| author | tv <tv@pkgsrc.org> | 2005-03-24 16:47:34 +0000 |
|---|---|---|
| committer | tv <tv@pkgsrc.org> | 2005-03-24 16:47:34 +0000 |
| commit | 432b696c8e6b375c0ec9e63837f43474c0dfe41c (patch) | |
| tree | 6774d368a43d1b2f92e706e484aade37401e7f66 | |
| parent | fc65b0338df4ee506699e24f75d8b585d6e2d60b (diff) | |
| download | pkgsrc-432b696c8e6b375c0ec9e63837f43474c0dfe41c.tar.gz | |
Correctly pass ${SORT} to tflat. Interix needs something other than the
OS-supplied one (currently, it will use gsort from coreutils).
| -rw-r--r-- | mk/bulk/bsd.bulk-pkg.mk | 6 | ||||
| -rwxr-xr-x | mk/bulk/tflat | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/mk/bulk/bsd.bulk-pkg.mk b/mk/bulk/bsd.bulk-pkg.mk index e864d112f7e..8a170486b31 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.76 2005/03/17 22:49:15 dmcmahill Exp $ +# $NetBSD: bsd.bulk-pkg.mk,v 1.77 2005/03/24 16:47:34 tv Exp $ # # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@NetBSD.org> @@ -191,8 +191,8 @@ bulk-cache: @${ECHO_MSG} "BULK> Sorting build order." ${TSORT} ${DEPENDSTREEFILE} > ${ORDERFILE} @${ECHO_MSG} "BULK> Generating up and down dependency files." - ${AWK} -f ${PKGSRCDIR}/mk/bulk/tflat up ${DEPENDSTREEFILE} > ${SUPPORTSFILE} - ${AWK} -f ${PKGSRCDIR}/mk/bulk/tflat down ${DEPENDSTREEFILE} > ${DEPENDSFILE} + ${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} # remove the bulk cache files clean-bulk-cache: diff --git a/mk/bulk/tflat b/mk/bulk/tflat index 8764b05d63c..a9743946e74 100755 --- a/mk/bulk/tflat +++ b/mk/bulk/tflat @@ -1,4 +1,4 @@ -# $NetBSD: tflat,v 1.13 2004/04/09 18:43:14 jschauma Exp $ +# $NetBSD: tflat,v 1.14 2005/03/24 16:47:35 tv Exp $ # # Copyright (c) 2001 The NetBSD Foundation, Inc. # All rights reserved. @@ -99,7 +99,7 @@ BEGIN { } for (x in alldepends){ - print x depstr alldepends[x] | "sort"; + print x depstr alldepends[x] | "${SORT-sort}"; } printf("\n"); |