NOSHARED -> NO_SHARED

2004-12-21 09:59:45 +00:00 · 2004-12-21 09:59:45 +00:00 · 83c7ade90a
commit 83c7ade90a
parent 00fbd40770
34 changed files with 34 additions and 33 deletions
--- a/2
+++ b/2
@ -232,7 +232,7 @@ MMAKEENV=	MAKEOBJDIRPREFIX=${MAKEPATH} \
 		INSTALL="sh ${.CURDIR}/tools/install.sh"
 MMAKE=		${MMAKEENV} make \
 		-D_UPGRADING \
-		-DNOMAN -DNO_MAN -DNOSHARED \
+		-DNOMAN -DNO_MAN -DNOSHARED -DNO_SHARED \
 		-DNO_CPU_CFLAGS -DNO_WERROR

 make: .PHONY
--- a/Makefile.inc1
+++ b/Makefile.inc1
@ -183,7 +183,7 @@ BMAKE=		MAKEOBJDIRPREFIX=${WORLDTMP} \
 		DESTDIR= \
 		BOOTSTRAPPING=${OSRELDATE} \
 		-DNOHTML -DNO_INFO -DNO_LINT -DNO_MAN -DNO_PIC -DNO_PROFILE \
-		-DNOSHARED -DNO_CPU_CFLAGS -DNO_WARNS
+		-DNO_SHARED -DNO_CPU_CFLAGS -DNO_WARNS

 # build-tools stage
 TMAKE=		MAKEOBJDIRPREFIX=${OBJTREE} \
--- a/bin/Makefile.inc
+++ b/bin/Makefile.inc
@ -5,5 +5,5 @@ BINDIR?=	/bin
 WARNS?=		6

 .if defined(NO_DYNAMICROOT)
-NOSHARED?=	YES
+NO_SHARED?=	YES
 .endif
--- a/bin/rmail/Makefile
+++ b/bin/rmail/Makefile
@ -5,7 +5,7 @@ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
 .PATH:	${SENDMAIL_DIR}/rmail

 # Not much point this being static. It calls a shared sendmail...
-NOSHARED?= NO
+NO_SHARED?= NO

 PROG=	rmail
 SRCS=	rmail.c
--- a/gnu/usr.bin/binutils/ar/Makefile
+++ b/gnu/usr.bin/binutils/ar/Makefile
@ -10,7 +10,7 @@ CFLAGS+= -D_GNU_SOURCE
 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
 CFLAGS+= -I${SRCDIR}/binutils
 CFLAGS+= -I${SRCDIR}/bfd
-NOSHARED?= yes
+NO_SHARED?= yes
 DPADD=	${RELTOP}/libbinutils/libbinutils.a
 DPADD+=	${RELTOP}/libbfd/libbfd.a
 DPADD+=	${RELTOP}/libiberty/libiberty.a
--- a/gnu/usr.bin/binutils/as/Makefile
+++ b/gnu/usr.bin/binutils/as/Makefile
@ -43,7 +43,7 @@ CFLAGS+= -D_GNU_SOURCE
 CFLAGS+= -I${SRCDIR}/gas -I${SRCDIR}/gas/config -I${SRCDIR}
 CFLAGS+= -I${.CURDIR} -I${.CURDIR}/${TARGET_ARCH}-freebsd

-NOSHARED?=	yes
+NO_SHARED?=	yes

 DPADD=	${RELTOP}/libbfd/libbfd.a
 DPADD+=	${RELTOP}/libiberty/libiberty.a
--- a/gnu/usr.bin/binutils/gdb/Makefile
+++ b/gnu/usr.bin/binutils/gdb/Makefile
@ -16,7 +16,7 @@ GDB_CPU=	i386
 GDB_CPU=	${TARGET_ARCH}
 .endif

-NOSHARED?=yes
+NO_SHARED?=yes
 PROG=	gdb
 XSRCS=	annotate.c arch-utils.c ax-general.c ax-gdb.c bcache.c		\
 	blockframe.c breakpoint.c buildsym.c complaints.c completer.c	\
--- a/gnu/usr.bin/binutils/ld/Makefile
+++ b/gnu/usr.bin/binutils/ld/Makefile
@ -19,7 +19,7 @@ CFLAGS+= -DBINDIR=\"${BINDIR}\" -DTARGET_SYSTEM_ROOT=\"${TOOLS_PREFIX}\"
 CFLAGS+= -DTOOLBINDIR=\"${TOOLS_PREFIX}/${BINDIR}/libexec\"
 CFLAGS+= -D_GNU_SOURCE
 CFLAGS+= -I${SRCDIR}/ld -I${SRCDIR}/bfd
-NOSHARED?= yes
+NO_SHARED?= yes
 DPADD=	${RELTOP}/libbfd/libbfd.a
 DPADD+=	${RELTOP}/libiberty/libiberty.a
 LDADD=	${DPADD}
--- a/gnu/usr.bin/binutils/ranlib/Makefile
+++ b/gnu/usr.bin/binutils/ranlib/Makefile
@ -10,7 +10,7 @@ CFLAGS+= -D_GNU_SOURCE
 CFLAGS+= -I${.CURDIR}/${RELTOP}/libbinutils
 CFLAGS+= -I${SRCDIR}/binutils
 CFLAGS+= -I${SRCDIR}/bfd
-NOSHARED?= yes
+NO_SHARED?= yes
 DPADD=	${RELTOP}/libbinutils/libbinutils.a
 DPADD+=	${RELTOP}/libbfd/libbfd.a
 DPADD+=	${RELTOP}/libiberty/libiberty.a
--- a/gnu/usr.bin/cc/cc/Makefile
+++ b/gnu/usr.bin/cc/cc/Makefile
@ -8,7 +8,7 @@
 PROG=	cc
 MAN=	gcc.1
 SRCS=	gcc.c gccspec.c
-NOSHARED?=yes
+NO_SHARED?=yes

 LINKS=	${BINDIR}/cc ${BINDIR}/gcc
 MLINKS=	gcc.1 cc.1 gcc.1 c++.1 gcc.1 g++.1 gcc.1 CC.1
--- a/gnu/usr.bin/cc/cc1/Makefile
+++ b/gnu/usr.bin/cc/cc1/Makefile
@ -8,7 +8,7 @@ PROG=	cc1
 SRCS=	main.c c-parse+%DIKED.c c-lang.c stub-objc.c
 BINDIR=	/usr/libexec
 NO_MAN=
-NOSHARED?=yes
+NO_SHARED?=yes

 CFLAGS+= -I.

--- a/gnu/usr.bin/cc/cc1obj/Makefile
+++ b/gnu/usr.bin/cc/cc1obj/Makefile
@ -8,7 +8,7 @@ PROG=	cc1obj
 SRCS=	main.c objc-parse+DIKED.c objc-act.c objc-lang.c c-decl.c
 BINDIR=	/usr/libexec
 NO_MAN=
-NOSHARED?=yes
+NO_SHARED?=yes

 CFLAGS+= -I${GCCDIR}/objc -I.

--- a/gnu/usr.bin/cc/cc1plus/Makefile
+++ b/gnu/usr.bin/cc/cc1plus/Makefile
@ -13,7 +13,7 @@ SRCS+=	main.c cp-lang.c c-opts.c call.c class.c cvt.c cxx-pretty-print.c \

 BINDIR=	/usr/libexec
 NO_MAN=
-NOSHARED?=yes
+NO_SHARED?=yes

 CFLAGS+= -I${GCCDIR}/cp -I.

--- a/release/Makefile
+++ b/release/Makefile
@ -472,7 +472,7 @@ release rerelease:
 	NOCDROM \
 	NODOC \
 	NOPORTS \
-	NOSHARED \
+	NO_SHARED \
 	NOSRC \
 	NO_CPU_CFLAGS \
 	NO_CPU_COPTFLAGS \
--- a/sbin/Makefile.inc
+++ b/sbin/Makefile.inc
@ -5,5 +5,5 @@ BINDIR?=	/sbin
 WARNS?=	2

 .if defined(NO_DYNAMICROOT)
-NOSHARED?=	YES
+NO_SHARED?=	YES
 .endif
--- a/sbin/devd/Makefile
+++ b/sbin/devd/Makefile
@ -5,7 +5,7 @@ SRCS=	devd.cc token.l parse.y y.tab.h
 MAN=	devd.8 devd.conf.5
 WARNS?=	1

-NOSHARED?=YES
+NO_SHARED?=YES

 DPADD=	${LIBL}
 LDADD=	-ll
--- a/sbin/geom/core/Makefile
+++ b/sbin/geom/core/Makefile
@ -6,7 +6,7 @@ PROG=	geom
 MAN=	geom.8
 SRCS=	geom.c subr.c

-NOSHARED=NO
+NO_SHARED=NO

 CFLAGS+= -DCLASS_DIR=\"${CLASS_DIR}\"
 CFLAGS+= -I${.CURDIR}/../../../sys -I${.CURDIR} -I${.CURDIR}/..
--- a/sbin/init/Makefile
+++ b/sbin/init/Makefile
@ -12,6 +12,6 @@ WARNS?=	0
 DPADD=	${LIBUTIL} ${LIBCRYPT}
 LDADD=	-lutil -lcrypt

-NOSHARED?=	YES
+NO_SHARED?=	YES

 .include <bsd.prog.mk>
--- a/sbin/mount_cd9660/Makefile
+++ b/sbin/mount_cd9660/Makefile
@ -13,7 +13,7 @@ WARNS?=	0

 # Needs to be dynamically linked for optional dlopen() access to
 # userland libiconv
-NOSHARED?=	NO
+NO_SHARED?=	NO

 .PATH:	${MOUNT}

--- a/sbin/mount_msdosfs/Makefile
+++ b/sbin/mount_msdosfs/Makefile
@ -14,7 +14,7 @@ WARNS?=	2

 # Needs to be dynamically linked for optional dlopen() access to
 # userland libiconv
-NOSHARED?=	NO
+NO_SHARED?=	NO

 .PATH:	${MOUNT}

--- a/sbin/mount_ntfs/Makefile
+++ b/sbin/mount_ntfs/Makefile
@ -14,7 +14,7 @@ WARNS?=	0

 # Needs to be dynamically linked for optional dlopen() access to
 # userland libiconv
-NOSHARED?=	NO
+NO_SHARED?=	NO

 .PATH:	${MOUNT}

--- a/sbin/mount_udf/Makefile
+++ b/sbin/mount_udf/Makefile
@ -13,6 +13,6 @@ WARNS?= 1

 # Needs to be dynamically linked for optional dlopen() access to
 # userland libiconv
-NOSHARED?=	NO
+NO_SHARED?=	NO

 .include <bsd.prog.mk>
--- a/sbin/mount_ufs/Makefile
+++ b/sbin/mount_ufs/Makefile
@ -11,6 +11,6 @@ WARNS?= 1

 # Needs to be dynamically linked for optional dlopen() access to
 # userland libiconv
-NOSHARED?=	NO
+NO_SHARED?=	NO

 .include <bsd.prog.mk>
--- a/share/examples/etc/make.conf
+++ b/share/examples/etc/make.conf
@ -138,7 +138,7 @@
 #NO_PROFILE=		# Avoid compiling profiled libraries
 #NO_SENDMAIL=		# do not build sendmail and related programs
 #NOSHARE=		# do not go into the share subdir
-#NOSHARED= 		# build /bin and /sbin dynamically linked (bad idea
+#NO_SHARED= 		# build /bin and /sbin dynamically linked (bad idea
 #NO_SHAREDOCS=		# do not build the 4.4BSD legacy docs
 #NO_TCSH=		# do not build and install /bin/csh (which is tcsh)
 #NO_TOOLCHAIN=		# do not build programs for program development
--- a/share/man/man5/make.conf.5
+++ b/share/man/man5/make.conf.5
@ -575,7 +575,7 @@ Set to avoid compiling profiled libraries.
 Set to not build in the
 .Pa share
 subdir.
-.It Va NOSHARED
+.It Va NO_SHARED
 .Pq Vt bool
 Set to not build
 .Pa /bin
--- a/share/mk/bsd.compat.mk
+++ b/share/mk/bsd.compat.mk
@ -19,6 +19,7 @@
 	NOOBJ:NO_OBJ \
 	NOPIC:NO_PIC \
 	NOPROFILE:NO_PROFILE \
+	NOSHARED:NO_SHARED \
 	NOTAGS:NO_TAGS
 .for old in ${oldnew:C/:.*//}
 .for new in ${oldnew:C/.*://}
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@ -22,7 +22,7 @@ CFLAGS+=${CRUNCH_CFLAGS}
 STRIP?=	-s
 .endif

-.if defined(NOSHARED) && (${NOSHARED} != "no" && ${NOSHARED} != "NO")
+.if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO")
 LDFLAGS+= -static
 .endif

--- a/sys/boot/i386/kgzldr/Makefile
+++ b/sys/boot/i386/kgzldr/Makefile
@ -9,7 +9,7 @@ NO_MAN=
 SRCS=	start.s boot.c inflate.c lib.c crt.s sio.s
 CFLAGS=	-Os
 CFLAGS+=-DKZIP
-NOSHARED=
+NO_SHARED=
 LDFLAGS=-Wl,-r
 .PATH:	${.CURDIR}/../../../kern

--- a/sys/boot/pc98/boot2/Makefile
+++ b/sys/boot/pc98/boot2/Makefile
@ -49,7 +49,7 @@ CFLAGS+=	-DCOMSPEED=${BOOT_COMCONSOLE_SPEED}

 CLEANFILES+=	boot.nohdr boot.strip boot.ldr boot1 boot2 sizetest
 LDFLAGS+=	-N -Ttext 0 -e start
-NOSHARED=	YES
+NO_SHARED=	YES
 NO_MAN=
 STRIP=

--- a/sys/boot/pc98/kgzldr/Makefile
+++ b/sys/boot/pc98/kgzldr/Makefile
@ -9,7 +9,7 @@ NO_MAN=
 SRCS=	start.s boot.c inflate.c lib.c crt.s sio.s
 CFLAGS=	-Os
 CFLAGS+=-DKZIP
-NOSHARED=
+NO_SHARED=
 LDFLAGS=-Wl,-r
 .PATH:	${.CURDIR}/../../../kern
 .PATH:	${.CURDIR}/../../i386/kgzldr
--- a/usr.bin/make/Makefile
+++ b/usr.bin/make/Makefile
@ -12,7 +12,7 @@ SRCS+=	lstAppend.c lstConcat.c lstDeQueue.c lstDestroy.c \
 .PATH:	${.CURDIR}/lst.lib

 WARNS?=	3
-NOSHARED?=	YES
+NO_SHARED?=	YES

 CFLAGS+=-DMAKE_VERSION=\"5200408120\"
 .if defined(_UPGRADING)
--- a/usr.sbin/mount_smbfs/Makefile
+++ b/usr.sbin/mount_smbfs/Makefile
@ -15,7 +15,7 @@ DPADD=	${LIBSMB}
 # Needs to be dynamically linked for optional dlopen() access to
 # userland libiconv (see the -E option).
 #
-NOSHARED?=	NO
+NO_SHARED?=	NO

 .PATH:	${CONTRIBDIR}/mount_smbfs

--- a/usr.sbin/nologin/Makefile
+++ b/usr.sbin/nologin/Makefile
@ -11,6 +11,6 @@ SYMLINKS=	${BINDIR}/nologin /sbin/nologin
 # libc by setting LD_LIBRARY_PATH appropriately.  Both sshd(8) and
 # login(1) make it possible to log in with an unsanitized environment,
 # rendering a dynamic nologin binary virtually useless.
-NOSHARED=	YES
+NO_SHARED=	YES

 .include <bsd.prog.mk>
--- a/usr.sbin/pccard/Makefile.inc
+++ b/usr.sbin/pccard/Makefile.inc
@ -1,5 +1,5 @@
 # $FreeBSD$

-NOSHARED?=	YES
+NO_SHARED?=	YES

 .include "../Makefile.inc"