d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NOLIBC_R -> NO_LIBC_R

Browse Source 
NOLIBPTHREAD -> NO_LIBPTHREAD
NOLIBTHR -> NO_LIBTHR
This commit is contained in:
Ruslan Ermilov 2004-12-21 09:00:26 +00:00
parent e653b48c80
commit f1f6253f4f
11 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.inc1
View File

@ -13,7 +13,7 @@
# -DNOGAMES do not go into games subdir
# -DNOSHARE do not go into share subdir
# -DNOINFO do not make or install info files
# -DNOLIBC_R do not build libc_r.
# -DNO_LIBC_R do not build libc_r.
# -DNO_FORTRAN do not build g77 and related libraries.
# -DNO_KERNELCONFIG do not run config in ${MAKE} buildkernel
# -DNO_KERNELCLEAN do not run ${MAKE} clean in ${MAKE} buildkernel

6
lib/Makefile
View File

@ -63,7 +63,7 @@ _libvgl= libvgl
.endif
.if ${MACHINE_ARCH} != "arm" && ${MACHINE_ARCH} != "ia64" && \
${MACHINE_ARCH} != "powerpc" && !defined(NOLIBC_R)
${MACHINE_ARCH} != "powerpc" && !defined(NO_LIBC_R)
_libc_r= libc_r
.endif
@ -91,11 +91,11 @@ _libncp= libncp
_libsmb= libsmb
.endif
.if !defined(NOLIBPTHREAD)
.if !defined(NO_LIBPTHREAD)
_libpthread= libpthread
.endif
.if ${MACHINE_ARCH} != "arm" && !defined(NOLIBTHR)
.if ${MACHINE_ARCH} != "arm" && !defined(NO_LIBTHR)
_libthr= libthr
.endif

8
lib/bind/config.mk
View File

@ -98,12 +98,12 @@ CRYPTO_LDADD= -lcrypto
# Link against POSIX threads library
.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc64"
.if defined(NOLIBC_R)
.error "BIND requires libpthread - define NO_BIND, or undefine NOLIBC_R"
.if defined(NO_LIBC_R)
.error "BIND requires libpthread - define NO_BIND, or undefine NO_LIBC_R"
.endif
.else
.if defined(NOLIBPTHREAD)
.error "BIND requires libpthread - define NO_BIND, or undefine NOLIBPTHREAD"
.if defined(NO_LIBPTHREAD)
.error "BIND requires libpthread - define NO_BIND, or undefine NO_LIBPTHREAD"
.endif
.endif

2
release/picobsd/build/picobsd
View File

@ -154,7 +154,7 @@ create_includes_and_libraries2() {
MAKEOBJDIRPREFIX=${l_objtree}
export MAKEOBJDIRPREFIX
( cd ${SRC};
make -DNOCLEAN -DNOPROFILE -DNOGAMES -DNOLIBC_R -DPICOBSD buildworld
make -DNOCLEAN -DNOPROFILE -DNOGAMES -DNO_LIBC_R -DPICOBSD buildworld
)
}

4
secure/usr.sbin/sshd/Makefile
View File

@ -34,9 +34,9 @@ LDADD+= -lcrypto -lcrypt
.if defined(OPENSSH_USE_POSIX_THREADS)
.if ((${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" || \
${MACHINE_ARCH} == "ia64") && !defined(NOLIBPTHREAD)) || \
${MACHINE_ARCH} == "ia64") && !defined(NO_LIBPTHREAD)) || \
((${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc64") && \
!defined(NOLIBC_R))
!defined(NO_LIBC_R))
CFLAGS+=-DUSE_POSIX_THREADS
DPADD+= ${LIBPTHREAD}
LDADD+= -lpthread

6
share/examples/etc/make.conf
View File

@ -123,9 +123,9 @@
#NO_IPFILTER= # do not build IP Filter package
#NOIPSEC= # do not build traceroute(8) with IPSEC support
#NO_KERBEROS= # do not build and install Kerberos 5 (KTH Heimdal)
#NOLIBC_R= # do not build libc_r (re-entrant version of libc)
#NOLIBPTHREAD= # do not build libpthread (M:N threading library)
#NOLIBTHR= # do not build libthr (1:1 threading library)
#NO_LIBC_R= # do not build libc_r (re-entrant version of libc)
#NO_LIBPTHREAD= # do not build libpthread (M:N threading library)
#NO_LIBTHR= # do not build libthr (1:1 threading library)
#NO_LPR= # do not build lpr and related programs
#NO_MAILWRAPPER= # do not build the mailwrapper(8) MTA selector
#NO_MAN= # do not build manual pages

2
share/man/man3/Makefile
View File

@ -141,7 +141,7 @@ MLINKS+= tree.3 RB_EMPTY.3 \
tree.3 SPLAY_RIGHT.3 \
tree.3 SPLAY_ROOT.3
.if !defined(NOLIBC_R) || !defined(NOLIBPTHREAD) || !defined(NOLIBTHR)
.if !defined(NO_LIBC_R) || !defined(NO_LIBPTHREAD) || !defined(NO_LIBTHR)
PTHREAD_MAN= pthread.3 \
pthread_attr.3 \
pthread_attr_get_np.3 \

6
share/man/man5/make.conf.5
View File

@ -546,19 +546,19 @@ Set to not build games.
Set to not make or install
.Xr info 5
files.
.It Va NOLIBC_R
.It Va NO_LIBC_R
.Pq Vt bool
Set to not build
.Nm libc_r
(reentrant version of
.Nm libc ) .
.It Va NOLIBPTHREAD
.It Va NO_LIBPTHREAD
.Pq Vt bool
Set to not build the
.Nm libpthread
(M:N threading)
library.
.It Va NOLIBTHR
.It Va NO_LIBTHR
.Pq Vt bool
Set to not build the
.Nm libthr

3
share/mk/bsd.compat.mk
View File

@ -2,6 +2,9 @@
.if !defined(BURN_BRIDGES)
.for oldnew in \
NOLIBC_R:NO_LIBC_R \
NOLIBPTHREAD:NO_LIBPTHREAD \
NOLIBTHR:NO_LIBTHR \
NOMAN:NO_MAN \
NOMANCOMPRESS:NO_MANCOMPRESS \
NOOBJ:NO_OBJ

2
tools/tools/nanobsd/make.conf
View File

@ -24,7 +24,7 @@ NOINET6=
NOINFO=
NO_IPFILTER=
NO_KERBEROS=
NOLIBTHR=
NO_LIBTHR=
NO_LPR=
NO_MAN=
NO_MODULES=

10
usr.sbin/Makefile
View File

@ -294,7 +294,7 @@ _ndiscvt= ndiscvt
_pccard= pccard
_pcvt= pcvt
_pnpinfo= pnpinfo
.if !defined(NOLIBPTHREAD)
.if !defined(NO_LIBPTHREAD)
_pppctl= pppctl
.endif
_sicontrol= sicontrol
@ -306,7 +306,7 @@ _zzz= zzz
.if ${MACHINE_ARCH} == "alpha"
_elf2exe= elf2exe
_pnpinfo= pnpinfo
.if !defined(NOLIBC_R)
.if !defined(NO_LIBC_R)
_pppctl= pppctl
.endif
.endif
@ -326,7 +326,7 @@ _lptcontrol= lptcontrol
_mount_nwfs= mount_nwfs
_mount_smbfs= mount_smbfs
_mptable= mptable
.if !defined(NOLIBPTHREAD)
.if !defined(NO_LIBPTHREAD)
_pppctl= pppctl
.endif
_sicontrol= sicontrol
@ -339,7 +339,7 @@ _zzz= zzz
_acpi= acpi
.endif
_kgmon= kgmon
.if !defined(NOLIBPTHREAD)
.if !defined(NO_LIBPTHREAD)
_pppctl= pppctl
.endif
_zzz= zzz
@ -348,7 +348,7 @@ _zzz= zzz
.if ${MACHINE_ARCH} == "sparc64"
_eeprom= eeprom
_ofwdump= ofwdump
.if !defined(NOLIBC_R)
.if !defined(NO_LIBC_R)
_pppctl= pppctl
.endif
.endif