Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add MKBSDTAR, defaulting to no. It switching cpio and tar to the 

libarchive based frontends.
This commit is contained in:
joerg 2010-04-23 19:41:02 +00:00
parent 5b61593723
commit 22c838d332
6 changed files with 38 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/pax/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.38 2009/02/03 05:22:40 dbj Exp $
# $NetBSD: Makefile,v 1.39 2010/04/23 19:41:02 joerg Exp $
# @(#)Makefile 8.1 (Berkeley) 5/31/93
.include <bsd.own.mk>
@ -32,11 +32,13 @@ CPPFLAGS+= -DHOSTPROG
# XXX: Interix does not have it; we need a conditional for it.
CPPFLAGS+= -DHAVE_SYS_MTIO_H
.if ${MKBSDTAR} == "no"
LINKS+= ${BINDIR}/pax ${BINDIR}/tar
SYMLINKS+=${BINDIR}/tar /usr/bin/tar
LINKS+= ${BINDIR}/pax ${BINDIR}/cpio
SYMLINKS+=${BINDIR}/cpio /usr/bin/cpio
.endif
.endif # } ! HOSTPROG
.if !defined(HOSTPROG) && !defined(SMALLPROG)

10
external/bsd/libarchive/bin/Makefile vendored
View File

@ -1,5 +1,11 @@
# $NetBSD: Makefile,v 1.1 2008/09/19 22:01:25 joerg Exp $
# $NetBSD: Makefile,v 1.2 2010/04/23 19:41:03 joerg Exp $
SUBDIR= # cpio tar
.include <bsd.own.mk>
SUBDIR=
.if ${MKBSDTAR} == "yes"
SUBDIR+= cpio tar
.endif
.include <bsd.subdir.mk>

11
external/bsd/libarchive/bin/cpio/Makefile vendored
View File

@ -1,10 +1,17 @@
# $NetBSD: Makefile,v 1.2 2010/02/20 02:55:53 joerg Exp $
# $NetBSD: Makefile,v 1.3 2010/04/23 19:41:03 joerg Exp $
PROG= bsdcpio
PROG= cpio
SRCS= cmdline.c cpio.c
.include <bsd.init.mk>
.PATH: ${LIBARCHIVEDIR}/cpio
CLEANFILES+= cpio.1
cpio.1: ${LIBARCHIVEDIR}/cpio/bsdcpio.1
${TOOL_CAT} ${LIBARCHIVEDIR}/cpio/bsdcpio.1 > $@
SYMLINKS+=${BINDIR}/cpio /usr/bin/cpio
.include <bsd.prog.mk>

11
external/bsd/libarchive/bin/tar/Makefile vendored
View File

@ -1,10 +1,17 @@
# $NetBSD: Makefile,v 1.2 2010/02/20 02:55:53 joerg Exp $
# $NetBSD: Makefile,v 1.3 2010/04/23 19:41:03 joerg Exp $
PROG= bsdtar
PROG= tar
SRCS= bsdtar.c cmdline.c getdate.c read.c subst.c tree.c util.c write.c
.include <bsd.init.mk>
.PATH: ${LIBARCHIVEDIR}/tar
CLEANFILES+= tar.1
tar.1: ${LIBARCHIVEDIR}/tar/bsdtar.1
${TOOL_CAT} ${LIBARCHIVEDIR}/tar/bsdtar.1 > $@
SYMLINKS+=${BINDIR}/tar /usr/bin/tar
.include <bsd.prog.mk>

9
share/mk/bsd.README
View File

@ -1,4 +1,4 @@
# $NetBSD: bsd.README,v 1.265 2010/02/22 12:33:22 njoly Exp $
# $NetBSD: bsd.README,v 1.266 2010/04/23 19:41:03 joerg Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD
@ -119,9 +119,14 @@ MKATF If "no", don't build libatf-c, libatf-c++ libraries associated
MKBFD Obsolete, use MKBINUTILS
MKBINUTILS If "no", don't build binutils (gas, ld, etc and libbfd, libopcodes)
MKBINUTILS If "no", don't build binutils (gas, ld, etc and libbfd,
libopcodes)
Default: yes
MKBSDTAR If "yes", use the libarchive based cpio and tar instead of
the pax frontends.
Default: no
MKCATPAGES If "no", don't build or install the catman pages.
Default: yes

4
share/mk/bsd.own.mk
View File

@ -1,4 +1,4 @@
# $NetBSD: bsd.own.mk,v 1.624 2010/03/22 03:35:26 mrg Exp $
# $NetBSD: bsd.own.mk,v 1.625 2010/04/23 19:41:03 joerg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@ -721,7 +721,7 @@ MKKMOD= no
# default for some platforms, see above.
#
_MKVARS.no= \
MKCRYPTO_IDEA MKCRYPTO_MDC2 MKCRYPTO_RC5 MKDEBUG MKDEBUGLIB \
MKBSDTAR MKCRYPTO_IDEA MKCRYPTO_MDC2 MKCRYPTO_RC5 MKDEBUG MKDEBUGLIB \
MKDTRACE MKEXTSRC \
MKMANDOC MKMANZ MKOBJDIRS \
MKPCC MKPCCCMDS \