Attachment 153590 Details for Bug 198078 – Fix for geom library dependency changes

[patch] Fix for geom library dependency changes

src.geom.diff (text/plain), 6.50 KB, created by Eir Nym on 2015-02-27 17:45:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Eir Nym

Created: 2015-02-27 17:45:26 UTC

Size: 6.50 KB

patch

obsolete

>Index: sbin/bsdlabel/Makefile
>===================================================================
>--- sbin/bsdlabel/Makefile	(revision 279278)
>+++ sbin/bsdlabel/Makefile	(working copy)
>@@ -12,6 +12,6 @@
> MLINKS=	bsdlabel.8 disklabel.8
> .endif
> 
>-LIBADD=	geom
>+LIBADD=	geom bsdxml sbuf
> 
> .include <bsd.prog.mk>
>Index: sbin/ccdconfig/Makefile
>===================================================================
>--- sbin/ccdconfig/Makefile	(revision 279278)
>+++ sbin/ccdconfig/Makefile	(working copy)
>@@ -3,6 +3,6 @@
> PROG=	ccdconfig
> MAN=	ccdconfig.8
> 
>-LIBADD=	geom
>+LIBADD=	geom bsdxml sbuf
> 
> .include <bsd.prog.mk>
>Index: sbin/fdisk/Makefile
>===================================================================
>--- sbin/fdisk/Makefile	(revision 279278)
>+++ sbin/fdisk/Makefile	(working copy)
>@@ -7,7 +7,7 @@
> 
> .PATH:	${.CURDIR}/../../sys/geom
> 
>-LIBADD=	geom
>+LIBADD=	geom bsdxml sbuf
> 
> .include <bsd.prog.mk>
> 
>Index: sbin/fdisk_pc98/Makefile
>===================================================================
>--- sbin/fdisk_pc98/Makefile	(revision 279278)
>+++ sbin/fdisk_pc98/Makefile	(working copy)
>@@ -7,6 +7,6 @@
> 
> .PATH:	${.CURDIR}/../../sys/geom
> 
>-LIBADD=	geom
>+LIBADD=	geom bsdxml sbuf
> 
> .include <bsd.prog.mk>
>Index: sbin/gbde/Makefile
>===================================================================
>--- sbin/gbde/Makefile	(revision 279278)
>+++ sbin/gbde/Makefile	(working copy)
>@@ -20,7 +20,7 @@
> CLEANFILES+= template.c
> 
> MAN=	gbde.8
>-LIBADD=	md util geom
>+LIBADD=	md util geom bsdxml sbuf
> 
> template.c: template.txt
> 	file2c 'const char template[] = {' ',0};' \
>Index: sbin/geom/Makefile
>===================================================================
>--- sbin/geom/Makefile	(revision 279278)
>+++ sbin/geom/Makefile	(working copy)
>@@ -14,7 +14,7 @@
> WARNS?=	2
> CFLAGS+=-I${.CURDIR} -I${.CURDIR}/core -DSTATIC_GEOM_CLASSES
> 
>-LIBADD=	geom util
>+LIBADD=	geom util bsdxml sbuf
> 
> .include <bsd.prog.mk>
> 
>Index: sbin/geom/core/Makefile
>===================================================================
>--- sbin/geom/core/Makefile	(revision 279278)
>+++ sbin/geom/core/Makefile	(working copy)
>@@ -11,6 +11,6 @@
> CFLAGS+= -DGEOM_CLASS_DIR=\"${GEOM_CLASS_DIR}\"
> CFLAGS+= -I${.CURDIR}/../../../sys -I${.CURDIR} -I${.CURDIR}/..
> 
>-LIBADD=	geom util
>+LIBADD=	geom util bsdxml sbuf
> 
> .include <bsd.prog.mk>
>Index: sbin/ggate/ggatec/Makefile
>===================================================================
>--- sbin/ggate/ggatec/Makefile	(revision 279278)
>+++ sbin/ggate/ggatec/Makefile	(working copy)
>@@ -10,6 +10,6 @@
> CFLAGS+= -DLIBGEOM
> CFLAGS+= -I${.CURDIR}/../shared
> 
>-LIBADD=	geom util pthread
>+LIBADD=	geom util pthread bsdxml sbuf
> 
> .include <bsd.prog.mk>
>Index: sbin/ggate/ggatel/Makefile
>===================================================================
>--- sbin/ggate/ggatel/Makefile	(revision 279278)
>+++ sbin/ggate/ggatel/Makefile	(working copy)
>@@ -9,6 +9,6 @@
> CFLAGS+= -DLIBGEOM
> CFLAGS+= -I${.CURDIR}/../shared
> 
>-LIBADD=	geom util
>+LIBADD=	geom util bsdxml sbuf
> 
> .include <bsd.prog.mk>
>Index: sbin/gvinum/Makefile
>===================================================================
>--- sbin/gvinum/Makefile	(revision 279278)
>+++ sbin/gvinum/Makefile	(working copy)
>@@ -7,7 +7,7 @@
> WARNS?=	2
> CFLAGS+=	-I${.CURDIR}/../../sys -I${DESTDIR}/${INCLUDEDIR}/edit
> 
>-LIBADD=	edit geom
>+LIBADD=	edit geom bsdxml sbuf
> 
> .PATH: ${.CURDIR}/../../sys/geom/vinum
> 
>Index: sbin/hastd/Makefile
>===================================================================
>--- sbin/hastd/Makefile	(revision 279278)
>+++ sbin/hastd/Makefile	(working copy)
>@@ -30,7 +30,7 @@
> CFLAGS+=-DINET6
> .endif
> 
>-LIBADD=	geom pthread util
>+LIBADD=	geom pthread util bsdxml sbuf
> .if ${MK_OPENSSL} != "no"
> LIBADD+=	crypto
> CFLAGS+=-DHAVE_CRYPTO
>Index: sbin/mdconfig/Makefile
>===================================================================
>--- sbin/mdconfig/Makefile	(revision 279278)
>+++ sbin/mdconfig/Makefile	(working copy)
>@@ -5,7 +5,7 @@
> PROG=		mdconfig
> MAN=		mdconfig.8
> 
>-LIBADD=		util geom
>+LIBADD=		util geom bsdxml sbuf
> 
> .if ${MK_TESTS} != "no"
> SUBDIR+=    tests
>Index: sbin/newfs_nandfs/Makefile
>===================================================================
>--- sbin/newfs_nandfs/Makefile	(revision 279278)
>+++ sbin/newfs_nandfs/Makefile	(working copy)
>@@ -3,6 +3,6 @@
> PROG=	newfs_nandfs
> MAN=	newfs_nandfs.8
> 
>-LIBADD=	geom
>+LIBADD=	geom bsdxml sbuf
> 
> .include <bsd.prog.mk>
>Index: sbin/sunlabel/Makefile
>===================================================================
>--- sbin/sunlabel/Makefile	(revision 279278)
>+++ sbin/sunlabel/Makefile	(working copy)
>@@ -11,7 +11,7 @@
> MLINKS=	sunlabel.8 disklabel.8
> .endif
> 
>-LIBADD=	geom
>+LIBADD=	geom bsdxml sbuf
> 
> .include <bsd.prog.mk>
> 
>Index: usr.sbin/boot0cfg/Makefile
>===================================================================
>--- usr.sbin/boot0cfg/Makefile	(revision 279278)
>+++ usr.sbin/boot0cfg/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> PROG=	boot0cfg
> MAN=	boot0cfg.8
> 
>-LIBADD=	geom
>+LIBADD=	geom bsdxml sbuf
> 
> NO_WCAST_ALIGN=
> 
>Index: usr.sbin/boot98cfg/Makefile
>===================================================================
>--- usr.sbin/boot98cfg/Makefile	(revision 279278)
>+++ usr.sbin/boot98cfg/Makefile	(working copy)
>@@ -5,6 +5,6 @@
> 
> WARNS?=	2
> 
>-LIBADD=	geom
>+LIBADD=	geom bsdxml sbuf
> 
> .include <bsd.prog.mk>
>Index: usr.sbin/bsdinstall/partedit/Makefile
>===================================================================
>--- usr.sbin/bsdinstall/partedit/Makefile	(revision 279278)
>+++ usr.sbin/bsdinstall/partedit/Makefile	(working copy)
>@@ -5,7 +5,7 @@
> LINKS= ${BINDIR}/partedit ${BINDIR}/autopart \
>        ${BINDIR}/partedit ${BINDIR}/scriptedpart
> SYMLINKS= ${BINDIR}/partedit /usr/sbin/sade
>-LIBADD+=	geom ncursesw util dialog m
>+LIBADD+=	geom ncursesw util dialog m bsdxml sbuf
> 
> PARTEDIT_ARCH= ${MACHINE}
> .if ${MACHINE} == "i386" || ${MACHINE} == "amd64"
>Index: usr.sbin/gstat/Makefile
>===================================================================
>--- usr.sbin/gstat/Makefile	(revision 279278)
>+++ usr.sbin/gstat/Makefile	(working copy)
>@@ -2,6 +2,6 @@
> 
> PROG=	gstat
> MAN=	gstat.8
>-LIBADD=	devstat geom edit ncursesw
>+LIBADD=	devstat geom edit ncursesw bsdxml sbuf
> 
> .include <bsd.prog.mk>
>Index: usr.sbin/nandtool/Makefile
>===================================================================
>--- usr.sbin/nandtool/Makefile	(revision 279278)
>+++ usr.sbin/nandtool/Makefile	(working copy)
>@@ -4,7 +4,7 @@
> SRCS=	nandtool.c nand_read.c nand_write.c nand_erase.c nand_info.c
> SRCS+=	nand_readoob.c nand_writeoob.c
> BINDIR=	/usr/sbin
>-LIBADD=	geom
>+LIBADD=	geom bsdxml sbuf
> MAN=	nandtool.8
> 
> .include <bsd.prog.mk>

Actions: View | Diff

Attachments on bug 198078: 153590