diff options
| author | ghen <ghen@pkgsrc.org> | 2007-07-09 14:10:57 +0000 |
|---|---|---|
| committer | ghen <ghen@pkgsrc.org> | 2007-07-09 14:10:57 +0000 |
| commit | ba912ffa2f0fdc7f7708516ffc0a7e275db50630 (patch) | |
| tree | b14e883e6c38b0863c5142f157aa909573683d72 /bootstrap | |
| parent | 43f317f69cb08657498404197e71706964cc6438 (diff) | |
| download | pkgsrc-ba912ffa2f0fdc7f7708516ffc0a7e275db50630.tar.gz | |
Pullup ticket 2127 - requested by tnn
build fix for bootstrap
- pkgsrc/bootstrap/bootstrap 1.99
- pkgsrc/pkgtools/bootstrap-extras/Makefile 1.3
- pkgsrc/pkgtools/bootstrap-extras/PLIST 1.2
- pkgsrc/pkgtools/bootstrap-extras/files/xargs-sh 1.1
Module Name: pkgsrc
Committed By: tnn
Date: Sun Jul 1 23:27:43 UTC 2007
Modified Files:
pkgsrc/bootstrap: bootstrap
pkgsrc/pkgtools/bootstrap-extras: Makefile PLIST
Added Files:
pkgsrc/pkgtools/bootstrap-extras/files: xargs-sh
Log Message:
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-x | bootstrap/bootstrap | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap index 01a6ff3a7bf..7a4e2d45eb7 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.98.2.1 2007/07/09 14:10:57 ghen 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)" |