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

#ifdef HOSTPROG then explicitly use {major,minor,makedev}_netbsd 

macros from pack_dev.h instead of the native versions.
Fixes [toolchain/20051] by Valeriy E. Ushakov.
This commit is contained in:
lukem 2003-05-09 01:09:13 +00:00
parent f703f13276
commit 17887a5d2c
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bin/pax/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.27 2002/11/30 03:12:55 lukem Exp $
# $NetBSD: Makefile,v 1.28 2003/05/09 01:09:13 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 5/31/93
# To install on versions prior to BSD 4.4 the following may have to be
@ -32,7 +32,7 @@ SRCS= ar_io.c ar_subs.c buf_subs.c cpio.c file_subs.c ftree.c\
gen_subs.c getoldopt.c options.c pat_rep.c pax.c sel_subs.c tables.c\
tar.c tty_subs.c
.ifdef SMALLPROG
.if defined(SMALLPROG)
CPPFLAGS+= -DSMALL
.else
SRCS+= getid.c spec.c misc.c stat_flags.c pack_dev.c
@ -46,13 +46,15 @@ CPPFLAGS+= -I${NETBSDSRCDIR}/usr.sbin/mtree \
MAN= pax.1 tar.1 cpio.1
.if !defined(HOSTPROG)
.if defined(HOSTPROG)
CPPFLAGS+= -DHOSTPROG
.else # { ! HOSTPROG
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
NOHTML=doc2html-error

16
bin/pax/pax.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: pax.h,v 1.17 2002/10/17 00:42:02 christos Exp $ */
/* $NetBSD: pax.h,v 1.18 2003/05/09 01:09:13 lukem Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@ -246,9 +246,17 @@ typedef struct oplist {
#ifndef MIN
#define MIN(a,b) (((a)<(b))?(a):(b))
#endif
#define MAJOR(x) major(x)
#define MINOR(x) minor(x)
#define TODEV(x, y) makedev(x, y)
#ifdef HOSTPROG
# include "pack_dev.h" /* explicitly use NetBSD's macros */
# define MAJOR(x) major_netbsd(x)
# define MINOR(x) minor_netbsd(x)
# define TODEV(x, y) makedev_netbsd((x), (y))
#else
# define MAJOR(x) major(x)
# define MINOR(x) minor(x)
# define TODEV(x, y) makedev((x), (y))
#endif
/*
* General Defines