diff options
| author | jlam <jlam> | 2005-05-14 21:15:07 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2005-05-14 21:15:07 +0000 |
| commit | dccbe63852579184bdafa2f8f0d3c286502aaa72 (patch) | |
| tree | abb61edb38473cf587b49a23812a600f1d00bca9 /mk/tools/bootstrap.mk | |
| parent | d40d4322eb90f14f593c1eb27b2051fdea70ca1f (diff) | |
| download | pkgsrc-dccbe63852579184bdafa2f8f0d3c286502aaa72.tar.gz | |
Consider ${TAR} differently from ${GTAR}. Currently, mark pkgsrc down
as needing both (no impact since they're both satisfied by the tar
binary installed by the bootstrap kit). There's some funniness in
the extraction code where we check for pax or GNU tar that needs to
be resolved. Remove the TAR=${GTAR} hack since it's no longer needed
after these changes.
XXX Later, a sweep needs to be made to see where we actually need GTAR
XXX and where we only need TAR, probably triggered by whether we call it
XXX with the "z" option or not. Packages that need GTAR should explicitly
XXX add USE_TOOLS+=gtar to the package Makefile.
Diffstat (limited to 'mk/tools/bootstrap.mk')
| -rw-r--r-- | mk/tools/bootstrap.mk | 41 |
1 files changed, 27 insertions, 14 deletions
diff --git a/mk/tools/bootstrap.mk b/mk/tools/bootstrap.mk index 845fef098cf..a1eaa34e320 100644 --- a/mk/tools/bootstrap.mk +++ b/mk/tools/bootstrap.mk @@ -1,4 +1,4 @@ -# $NetBSD: bootstrap.mk,v 1.1 2005/04/27 17:15:13 jlam Exp $ +# $NetBSD: bootstrap.mk,v 1.2 2005/05/14 21:15:07 jlam Exp $ # # bootstrap.mk contains settings matching the contents of # pkgsrc/bootstrap/bootstrap. Where we install the bootstrap versions @@ -12,81 +12,94 @@ # .if ${OPSYS} == "AIX" -TOOLS_PLATFORM.gtar?= ${LOCALBASE}/bin/tar +TOOLS_PLATFORM.gtar?= ${TOOLS_PLATFORM.tar} TOOLS_PLATFORM.install?= ${LOCALBASE}/bin/install-sh TOOLS_PLATFORM.mtree?= ${LOCALBASE}/sbin/mtree TOOLS_PLATFORM.pax?= ${LOCALBASE}/bin/pax TOOLS_PLATFORM.sed?= ${LOCALBASE}/bin/nbsed TOOLS_PLATFORM.strip?= ${LOCALBASE}/bin/strip +TOOLS_PLATFORM.tar?= ${LOCALBASE}/bin/tar .elif ${OPSYS} == "Darwin" -TOOLS_PLATFORM.gtar?= ${LOCALBASE}/bin/tar +TOOLS_PLATFORM.gtar?= ${TOOLS_PLATFORM.tar} TOOLS_PLATFORM.pax?= ${LOCALBASE}/bin/pax +TOOLS_PLATFORM.tar?= ${LOCALBASE}/bin/tar .elif ${OPSYS} == "DragonFly" -TOOLS_PLATFORM.gtar?= ${LOCALBASE}/bin/tar +TOOLS_PLATFORM.gtar?= ${TOOLS_PLATFORM.tar} TOOLS_PLATFORM.pax?= ${LOCALBASE}/bin/pax +TOOLS_PLATFORM.tar?= ${LOCALBASE}/bin/tar .elif ${OPSYS} == "FreeBSD" -TOOLS_PLATFORM.gtar?= ${LOCALBASE}/bin/tar +TOOLS_PLATFORM.gtar?= ${TOOLS_PLATFORM.tar} TOOLS_PLATFORM.mtree?= ${LOCALBASE}/sbin/mtree TOOLS_PLATFORM.pax?= ${LOCALBASE}/bin/pax +TOOLS_PLATFORM.tar?= ${LOCALBASE}/bin/tar .elif ${OPSYS} == "HPUX" -TOOLS_PLATFORM.gtar?= ${LOCALBASE}/bin/tar +TOOLS_PLATFORM.gtar?= ${TOOLS_PLATFORM.tar} TOOLS_PLATFORM.mtree?= ${LOCALBASE}/sbin/mtree TOOLS_PLATFORM.pax?= ${LOCALBASE}/bin/pax TOOLS_PLATFORM.sed?= ${LOCALBASE}/bin/nbsed +TOOLS_PLATFORM.tar?= ${LOCALBASE}/bin/tar .elif ${OPSYS} == "Interix" -TOOLS_PLATFORM.gtar?= ${LOCALBASE}/bin/tar +TOOLS_PLATFORM.gtar?= ${TOOLS_PLATFORM.tar} TOOLS_PLATFORM.install?= ${LOCALBASE}/bin/install-sh TOOLS_PLATFORM.mtree?= ${LOCALBASE}/sbin/mtree TOOLS_PLATFORM.pax?= ${LOCALBASE}/bin/pax TOOLS_PLATFORM.sed?= ${LOCALBASE}/bin/nbsed +TOOLS_PLATFORM.tar?= ${LOCALBASE}/bin/tar .elif ${OPSYS} == "IRIX" -TOOLS_PLATFORM.gtar?= ${LOCALBASE}/bin/tar +TOOLS_PLATFORM.gtar?= ${TOOLS_PLATFORM.tar} TOOLS_PLATFORM.install?= ${LOCALBASE}/bin/install-sh TOOLS_PLATFORM.mtree?= ${LOCALBASE}/sbin/mtree TOOLS_PLATFORM.pax?= ${LOCALBASE}/bin/pax TOOLS_PLATFORM.sed?= ${LOCALBASE}/bin/nbsed +TOOLS_PLATFORM.tar?= ${LOCALBASE}/bin/tar .elif ${OPSYS} == "Linux" -TOOLS_PLATFORM.gtar?= ${LOCALBASE}/bin/tar +TOOLS_PLATFORM.gtar?= ${TOOLS_PLATFORM.tar} TOOLS_PLATFORM.mtree?= ${LOCALBASE}/sbin/mtree TOOLS_PLATFORM.pax?= ${LOCALBASE}/bin/pax +TOOLS_PLATFORM.tar?= ${LOCALBASE}/bin/tar .elif ${OPSYS} == "NetBSD" # NetBSD has everything. .elif ${OPSYS} == "OpenBSD" -TOOLS_PLATFORM.gtar?= ${LOCALBASE}/bin/tar +TOOLS_PLATFORM.gtar?= ${TOOLS_PLATFORM.tar} TOOLS_PLATFORM.pax?= ${LOCALBASE}/bin/pax +TOOLS_PLATFORM.tar?= ${LOCALBASE}/bin/tar .elif ${OPSYS} == "OSF1" -TOOLS_PLATFORM.gtar?= ${LOCALBASE}/bin/tar +TOOLS_PLATFORM.gtar?= ${TOOLS_PLATFORM.tar} TOOLS_PLATFORM.install?= ${LOCALBASE}/bin/install-sh TOOLS_PLATFORM.mtree?= ${LOCALBASE}/sbin/mtree TOOLS_PLATFORM.pax?= ${LOCALBASE}/bin/pax TOOLS_PLATFORM.sed?= ${LOCALBASE}/bin/nbsed +TOOLS_PLATFORM.tar?= ${LOCALBASE}/bin/tar .elif ${OPSYS} == "SunOS" -TOOLS_PLATFORM.gtar?= ${LOCALBASE}/bin/tar +TOOLS_PLATFORM.gtar?= ${TOOLS_PLATFORM.tar} TOOLS_PLATFORM.mtree?= ${LOCALBASE}/sbin/mtree TOOLS_PLATFORM.pax?= ${LOCALBASE}/bin/pax TOOLS_PLATFORM.sed?= ${LOCALBASE}/bin/nbsed +TOOLS_PLATFORM.tar?= ${LOCALBASE}/bin/tar .elif ${OPSYS} == "UnixWare" -TOOLS_PLATFORM.gtar?= ${LOCALBASE}/bin/tar +TOOLS_PLATFORM.gtar?= ${TOOLS_PLATFORM.tar} TOOLS_PLATFORM.mkdir?= ${LOCALBASE}/sbin/mkdir-sh TOOLS_PLATFORM.mtree?= ${LOCALBASE}/sbin/mtree TOOLS_PLATFORM.pax?= ${LOCALBASE}/bin/pax TOOLS_PLATFORM.sed?= ${LOCALBASE}/bin/nbsed +TOOLS_PLATFORM.tar?= ${LOCALBASE}/bin/tar .else -TOOLS_PLATFORM.gtar?= ${LOCALBASE}/bin/tar +TOOLS_PLATFORM.gtar?= ${TOOLS_PLATFORM.tar} TOOLS_PLATFORM.mtree?= ${LOCALBASE}/sbin/mtree TOOLS_PLATFORM.pax?= ${LOCALBASE}/bin/pax TOOLS_PLATFORM.sed?= ${LOCALBASE}/bin/nbsed +TOOLS_PLATFORM.tar?= ${LOCALBASE}/bin/tar .endif |