Page MenuHomeFreeBSD

D22446.diff
No OneTemporary

D22446.diff

Index: head/usr.bin/xinstall/Makefile
===================================================================
--- head/usr.bin/xinstall/Makefile
+++ head/usr.bin/xinstall/Makefile
@@ -11,7 +11,6 @@
.PATH: ${SRCTOP}/contrib/mtree
CFLAGS+= -I${SRCTOP}/contrib/mtree
CFLAGS+= -I${SRCTOP}/lib/libnetbsd
-CFLAGS+= -DHAVE_STRUCT_STAT_ST_FLAGS=1
LIBADD= md
Index: head/usr.bin/xinstall/xinstall.c
===================================================================
--- head/usr.bin/xinstall/xinstall.c
+++ head/usr.bin/xinstall/xinstall.c
@@ -75,6 +75,17 @@
#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 LN_ABSOLUTE 0x01

File Metadata

Mime Type
text/plain
Expires
Wed, Dec 25, 10:16 PM (11 h, 54 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15599000
Default Alt Text
D22446.diff (1000 B)

Event Timeline