diff options
| author | tv <tv@pkgsrc.org> | 2004-10-08 17:26:45 +0000 |
|---|---|---|
| committer | tv <tv@pkgsrc.org> | 2004-10-08 17:26:45 +0000 |
| commit | 1f62dde17e3e6d620b43f3482d31bbe92a8d4c24 (patch) | |
| tree | 9ccdcd1a81d3797c861c4b2cad2698793eb1cb2a /bootstrap | |
| parent | 6bac155031054f0de169a9982fb4d2f88f375bd2 (diff) | |
| download | pkgsrc-1f62dde17e3e6d620b43f3482d31bbe92a8d4c24.tar.gz | |
Revert part of rev 1.19:
There's one place where you absolutely *must* use bmake: when building
pkg_install. Otherwise its Makefiles will attempt to get $(MACHINE_ARCH)
from the system make, which is not likely to be correct on several
platforms.
Diffstat (limited to 'bootstrap')
| -rwxr-xr-x | bootstrap/bootstrap | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap index 0cec8ca234c..f8f85637fa5 100755 --- a/bootstrap/bootstrap +++ b/bootstrap/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh -# $NetBSD: bootstrap,v 1.20 2004/08/27 06:48:58 jlam Exp $ +# $NetBSD: bootstrap,v 1.21 2004/10/08 17:26:45 tv Exp $ # # # Copyright (c) 2001-2002 Alistair G. Crooks. All rights reserved. @@ -577,7 +577,7 @@ env DIGESTPROG=$prefix/bin/digest PKG_DIGEST=md5 PKG_DBDIR=$pkgdbdir \ case "$need_pax" in yes) echo_msg "Installing pax" copy_src ../archivers/pax/files pax - run_cmd "(cd $wrkdir/pax; env $BSTRAP_ENV CPPFLAGS='-I../libnbcompat' LDFLAGS='-L../libnbcompat' LIBS='-lnbcompat' $shprog ./configure -C --prefix=$prefix --sysconfdir=$sysconfdir && make && make install)" + run_cmd "(cd $wrkdir/pax; env $BSTRAP_ENV CPPFLAGS='-I../libnbcompat' LDFLAGS='-L../libnbcompat' LIBS='-lnbcompat' $shprog ./configure -C --prefix=$prefix --sysconfdir=$sysconfdir && $prefix/bin/bmake && $prefix/bin/bmake install)" echo "PAX=$prefix/bin/pax" >> ${MKCONF_EXAMPLE} pkg_install_args="$pkg_install_args --with-pax=$prefix/bin/pax --with-tar=$prefix/bin/tar" ;; @@ -590,7 +590,7 @@ esac case "$need_mtree" in yes) echo_msg "Installing mtree" copy_src ../pkgtools/mtree/files mtree - run_cmd "(cd $wrkdir/mtree; env $BSTRAP_ENV CPPFLAGS='-I../libnbcompat' LDFLAGS='-L../libnbcompat' LIBS='-lnbcompat' $shprog ./configure -C --prefix=$prefix --sysconfdir=$sysconfdir && make && make install)" + run_cmd "(cd $wrkdir/mtree; env $BSTRAP_ENV CPPFLAGS='-I../libnbcompat' LDFLAGS='-L../libnbcompat' LIBS='-lnbcompat' $shprog ./configure -C --prefix=$prefix --sysconfdir=$sysconfdir && $prefix/bin/bmake && $prefix/bin/bmake install)" pkg_install_args="$pkg_install_args --with-mtree=$prefix/sbin/mtree" ;; *) pkg_install_args="$pkg_install_args --with-mtree=$mtreeprog" @@ -614,7 +614,7 @@ pkg_install_mandir="$prefix/man" if [ "$prefix" = "/usr" ]; then pkg_install_mandir="$prefix/share/man" fi -run_cmd "(cd $wrkdir/pkg_install; env $BSTRAP_ENV CPPFLAGS='-I../libnbcompat -I../../libnbcompat' LDFLAGS='-L../libnbcompat -L../../libnbcompat' LIBS='-lnbcompat' $shprog ./configure -C --prefix=$prefix --sysconfdir=$sysconfdir --with-pkgdbdir=$pkgdbdir --mandir=$pkg_install_mandir $pkg_install_args && make && make install)" +run_cmd "(cd $wrkdir/pkg_install; env $BSTRAP_ENV CPPFLAGS='-I../libnbcompat -I../../libnbcompat' LDFLAGS='-L../libnbcompat -L../../libnbcompat' LIBS='-lnbcompat' $shprog ./configure -C --prefix=$prefix --sysconfdir=$sysconfdir --with-pkgdbdir=$pkgdbdir --mandir=$pkg_install_mandir $pkg_install_args && $prefix/bin/bmake && $prefix/bin/bmake install)" # all's ready, install the man page echo_msg "Installing packages(7) man page" |