Attachment 142170 Details for Bug 189156 – file.txt

file.txt

file.txt (text/plain), 1.83 KB, created by Enji Cooper on 2014-05-01 01:00:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Enji Cooper

Created: 2014-05-01 01:00:00 UTC

Size: 1.83 KB

patch

obsolete

>From c4b596a590b8687cbef6d2d6e4c19e9a5f88f8a5 Mon Sep 17 00:00:00 2001
>From: Garrett Cooper <yanegomi@gmail.com>
>Date: Wed, 30 Apr 2014 16:55:25 -0700
>Subject: [PATCH] Make include/Makefile honor MK_GSSAPI == no
>
>Add necessary entries to OptionalObsoleteFiles.inc
>---
> include/Makefile                         | 9 +++++++--
> tools/build/mk/OptionalObsoleteFiles.inc | 3 +++
> 2 files changed, 10 insertions(+), 2 deletions(-)
>
>diff --git a/include/Makefile b/include/Makefile
>index fd2940e..247ed1a 100644
>--- a/include/Makefile
>+++ b/include/Makefile
>@@ -6,11 +6,11 @@
> .include <bsd.own.mk>
> 
> CLEANFILES= osreldate.h version vers.c
>-SUBDIR= arpa gssapi protocols rpcsvc rpc xlocale
>+SUBDIR= arpa protocols rpcsvc rpc xlocale
> INCS=	a.out.h ar.h assert.h bitstring.h complex.h cpio.h _ctype.h ctype.h \
> 	db.h \
> 	dirent.h dlfcn.h elf.h elf-hints.h err.h fmtmsg.h fnmatch.h fstab.h \
>-	fts.h ftw.h getopt.h glob.h grp.h gssapi.h \
>+	fts.h ftw.h getopt.h glob.h grp.h \
> 	ieeefp.h ifaddrs.h \
> 	inttypes.h iso646.h kenv.h langinfo.h libgen.h limits.h link.h \
> 	locale.h malloc.h malloc_np.h memory.h monetary.h mpool.h mqueue.h \
>@@ -62,6 +62,11 @@ LSUBSUBDIRS=	dev/mpt/mpilib
> _dev_powermac_nvram=	dev/powermac_nvram
> .endif
> 
>+.if ${MK_GSSAPI} != "no"
>+SUBDIR+=	gssapi
>+INCS+=		gssapi.h
>+.endif
>+
> .if ${MK_GPIB} != "no"
> _dev_ieee488=	dev/ieee488
> .endif
>diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
>index d787cb9..0932037 100644
>--- a/tools/build/mk/OptionalObsoleteFiles.inc
>+++ b/tools/build/mk/OptionalObsoleteFiles.inc
>@@ -1833,6 +1833,9 @@ OLD_DIRS+=usr/share/tmac
> .endif
> 
> .if ${MK_GSSAPI} == no
>+OLD_FILES+=usr/include/gssapi.h
>+OLD_FILES+=usr/include/gssapi/gssapi.h
>+OLD_DIRS+=usr/include/gssapi
> OLD_FILES+=usr/lib/libgssapi.a
> OLD_FILES+=usr/lib/libgssapi.so
> OLD_LIBS+=usr/lib/libgssapi.so.10
>-- 
>1.8.5.2

Actions: View

Attachments on bug 189156: 142170