summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mk/bulk/bsd.bulk-pkg.mk15
-rw-r--r--mk/platform/Interix.mk5
2 files changed, 12 insertions, 8 deletions
diff --git a/mk/bulk/bsd.bulk-pkg.mk b/mk/bulk/bsd.bulk-pkg.mk
index 8a170486b31..e4980034b42 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.77 2005/03/24 16:47:34 tv Exp $
+# $NetBSD: bsd.bulk-pkg.mk,v 1.78 2005/03/28 15:04:07 tv Exp $
#
# Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@NetBSD.org>
@@ -45,6 +45,13 @@
LS?= ls
WC?= wc
+# 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
@@ -184,15 +191,15 @@ 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}
+ ${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/platform/Interix.mk b/mk/platform/Interix.mk
index 914491ab22b..1388152f2dc 100644
--- a/mk/platform/Interix.mk
+++ b/mk/platform/Interix.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Interix.mk,v 1.29 2005/03/24 16:21:48 tv Exp $
+# $NetBSD: Interix.mk,v 1.30 2005/03/28 15:04:07 tv Exp $
#
# Variable definitions for the Interix operating system.
@@ -47,9 +47,6 @@ AWK?= ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}awk
.if exists(${LOCALBASE}/bin/gtar)
GTAR?= ${LOCALBASE}/bin/gtar
.endif
-.if exists(${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}sort)
-SORT?= ${LOCALBASE}/bin/${GNU_PROGRAM_PREFIX}sort
-.endif
AWK?= /usr/contrib/bin/gawk
BASENAME?= /bin/basename