summaryrefslogtreecommitdiff
path: root/bootstrap
diff options
context:
space:
mode:
authortnn <tnn@pkgsrc.org>2007-07-01 23:27:43 +0000
committertnn <tnn@pkgsrc.org>2007-07-01 23:27:43 +0000
commit0234d40e0a6d9ba2108fc86e59a50c72ad5afa5d (patch)
tree607f4ce224778db6ffb3444a06c639ad9cfaf82d /bootstrap
parent79dab0a3c6935eee35c736b291385490eadbcdfa (diff)
downloadpkgsrc-0234d40e0a6d9ba2108fc86e59a50c72ad5afa5d.tar.gz
xargs(1) on Interix is broken. It executes the utility on the command line
even if standard input is the empty string. Install a wrapper script bundled with pkgtools/bootstrap-extras to deal with this. This is an attempt at a permanent workaround for the problem described in PR pkg/25777 which has regressed since it was initially fixed. We can now bootstrap again on Interix 3.5.
Diffstat (limited to 'bootstrap')
-rwxr-xr-xbootstrap/bootstrap10
1 files changed, 9 insertions, 1 deletions
diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap
index 01a6ff3a7bf..29b1dc670da 100755
--- a/bootstrap/bootstrap
+++ b/bootstrap/bootstrap
@@ -1,6 +1,6 @@
#! /bin/sh
-# $NetBSD: bootstrap,v 1.98 2007/05/30 01:42:59 schmonz Exp $
+# $NetBSD: bootstrap,v 1.99 2007/07/01 23:27:43 tnn Exp $
#
#
# Copyright (c) 2001-2002 Alistair G. Crooks. All rights reserved.
@@ -489,6 +489,7 @@ Interix)
need_awk=yes
need_sed=yes
set_opsys=no
+ need_xargs=yes
# only used for unprivileged builds
groupsprog="id -gn"
# for bootstrap only; pkgsrc uses CPPFLAGS
@@ -771,6 +772,13 @@ if [ "$need_mkdir" = "yes" -a -z "$MKDIR" ]; then
need_extras=yes
fi
+if [ "$need_xargs" = "yes" ]; then
+ echo_msg "Installing fixed xargs script"
+ run_cmd "$install_sh -c -o $user -g $group -m 755 $pkgsrcdir/pkgtools/bootstrap-extras/files/xargs-sh $prefix/bin/xargs"
+ echo "TOOLS_PLATFORM.xargs?= $prefix/bin/xargs" >> ${MKCONF_EXAMPLE}
+ need_extras=yes
+fi
+
echo_msg "Installing bmake"
copy_src $pkgsrcdir/devel/bmake/files bmake
run_cmd "(cd $wrkdir/bmake && env CPPFLAGS='$CPPFLAGS -I../../libnbcompat' LDFLAGS='$LDFLAGS -L../../libnbcompat' LIBS='-lnbcompat' $bmakexenv $shprog ./boot-strap $configure_quiet_flags -q -o $opsys --prefix=$prefix --sysconfdir=$sysconfdir --mksrc none --with-default-sys-path="$prefix/share/mk" $bmakexargs)"