PERFORCE change 77828 for review

[Andrew Reisse]

http://perforce.freebsd.org/chv.cgi?CH=77828

Change 77828 by areisse at areisse_ibook on 2005/06/01 15:25:38

	Checkpolicy changes for building on Darwin:
	-Use our makefile infrastructure
	-ipv6 structure fields

Affected files ...

.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/Makefile#3 edit
.. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/policy_parse.y#5 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/Makefile#3 (text+ko) ====

@@ -1,16 +1,13 @@
 include ../../../Makeconfig
 
-vpath %.c $(SOURCE_ROOT)/sedarwin/sedarwin/ss
-
 PROG= checkpolicy
 
-OBJS = checkpolicy.o write.o policy_parse.o policy_scan.o services.o \
-       hashtab.o avtab.o ebitmap.o queue.o sidtab.o symtab.o policydb.o
+OBJS = checkpolicy.o y.tab.o policy_scan.o queue.o
 
-CFLAGS+= -I$(SOURCE_ROOT)/sedarwin/sedarwin/ss
-CFLAGS+= -I$(SOURCE_ROOT)/sedarwin
-LDADD+= -L$(SOURCE_ROOT)/sedarwin/libsedarwin
-LDADD+= -lsebsd -lfl
+CFLAGS+= -I$(SOURCE_ROOT)/sedarwin/libsepol/include
+CFLAGS+= -I$(SOURCE_ROOT)/sedarwin/libselinux/include
+LDADD+= -L$(SOURCE_ROOT)/sedarwin/libselinux/src -L$(SOURCE_ROOT)/sedarwin/libsepol/src
+LDADD+= -lselinux -lsepol -lfl
 
 all: $(PROG)
 
@@ -21,7 +18,7 @@
 	install -m 555 $(PROG) $(DESTDIR)/usr/bin
 
 clean:
-	rm -f $(OBJS) $(PROG) policy_parse.c policy_scan.c policy_parse.h
+	rm -f $(OBJS) $(PROG) y.tab.* policy_scan.c
 
-policy_parse.c policy_parse.h: policy_parse.y
-	$(YACC) $(YFLAGS) -d -o policy_parse.c policy_parse.y
+y.tab.c y.tab.h: policy_parse.y
+	$(YACC) $(YFLAGS) -d policy_parse.y

==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/programs/checkpolicy/policy_parse.y#5 (text+ko) ====

@@ -4438,6 +4438,8 @@
 	return 0;
 }
 
+#define s6_addr32 __u6_addr.__u6_addr32
+
 static int define_ipv6_node_context(void)
 {
 	char *id;
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message