pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk/bulk Correctly pass ${SORT} to tflat. Interix need...
details: https://anonhg.NetBSD.org/pkgsrc/rev/2b67cad9f181
branches: trunk
changeset: 491477:2b67cad9f181
user: tv <tv%pkgsrc.org@localhost>
date: Thu Mar 24 16:47:34 2005 +0000
description:
Correctly pass ${SORT} to tflat. Interix needs something other than the
OS-supplied one (currently, it will use gsort from coreutils).
diffstat:
mk/bulk/bsd.bulk-pkg.mk | 6 +++---
mk/bulk/tflat | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diffs (38 lines):
diff -r 0573b966f966 -r 2b67cad9f181 mk/bulk/bsd.bulk-pkg.mk
--- a/mk/bulk/bsd.bulk-pkg.mk Thu Mar 24 16:30:45 2005 +0000
+++ b/mk/bulk/bsd.bulk-pkg.mk Thu Mar 24 16:47:34 2005 +0000
@@ -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@localhost>
@@ -191,8 +191,8 @@
@${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 -r 0573b966f966 -r 2b67cad9f181 mk/bulk/tflat
--- a/mk/bulk/tflat Thu Mar 24 16:30:45 2005 +0000
+++ b/mk/bulk/tflat Thu Mar 24 16:47:34 2005 +0000
@@ -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 @@
}
for (x in alldepends){
- print x depstr alldepends[x] | "sort";
+ print x depstr alldepends[x] | "${SORT-sort}";
}
printf("\n");
Home |
Main Index |
Thread Index |
Old Index