d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow boostrapping xinstall on Linux

Browse Source 
Linux does not have st_flags so we have to avoid using it there.

Reviewed By:	emaste, imp
Differential Revision: https://reviews.freebsd.org/D22446
This commit is contained in:
arichardson 2019-11-20 17:24:49 +00:00
parent d5e1f75eda
commit 7779043081
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
usr.bin/xinstall/Makefile
View File

@ -11,7 +11,6 @@ MAN= install.1
.PATH: ${SRCTOP}/contrib/mtree .PATH: ${SRCTOP}/contrib/mtree
CFLAGS+= -I${SRCTOP}/contrib/mtree CFLAGS+= -I${SRCTOP}/contrib/mtree
CFLAGS+= -I${SRCTOP}/lib/libnetbsd CFLAGS+= -I${SRCTOP}/lib/libnetbsd
CFLAGS+= -DHAVE_STRUCT_STAT_ST_FLAGS=1
LIBADD= md LIBADD= md

11
usr.bin/xinstall/xinstall.c
View File

@ -75,6 +75,17 @@ __FBSDID("$FreeBSD$");
#include "mtree.h" #include "mtree.h"
/*
* We need to build xinstall during the bootstrap stage when building on a
* non-FreeBSD system. Linux does not have the st_flags and st_birthtime
* members in struct stat so we need to omit support for changing those fields.
*/
#ifdef UF_SETTABLE
#define HAVE_STRUCT_STAT_ST_FLAGS 1
#else
#define HAVE_STRUCT_STAT_ST_FLAGS 0
#endif
#define MAX_CMP_SIZE (16 * 1024 * 1024) #define MAX_CMP_SIZE (16 * 1024 * 1024)
#define LN_ABSOLUTE 0x01 #define LN_ABSOLUTE 0x01