Rename BUILDCOLD to BUILD_LEGACY and provide a preprocessor macro that

can be used in code files that aren't easy to split up. Add the removal
to the major bump todo list.
This commit is contained in:
joerg 2013-04-12 19:58:45 +00:00
parent a79378684d
commit 575a4660cc
2 changed files with 8 additions and 5 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.149 2012/01/20 16:31:29 joerg Exp $ # $NetBSD: Makefile,v 1.150 2013/04/12 19:58:45 joerg Exp $
# @(#)Makefile 8.2 (Berkeley) 2/3/94 # @(#)Makefile 8.2 (Berkeley) 2/3/94
# #
# All library objects contain sccsid strings by default; they may be # All library objects contain sccsid strings by default; they may be
@ -42,15 +42,17 @@ assym.h: ${ARCHDIR}/genassym.cf
.endif .endif
# The following controls how to build compatibility code for old NetBSD # The following controls how to build compatibility code for old NetBSD
# binaries. If BUILDCOLD is yes, then we build a separate library; otherwise # binaries. If BUILD_LEGACY is yes, then we build a separate library; otherwise
# we include the code in libc. # we include the code in libc.
BUILDCOLD?= no BUILD_LEGACY?= no
.if "${BUILDCOLD}" == "yes" .if "${BUILD_LEGACY}" == "yes"
SUBDIR=compat SUBDIR=compat
.include <bsd.subdir.mk> .include <bsd.subdir.mk>
.else .else
COMPATDIR=${.CURDIR}/compat COMPATDIR=${.CURDIR}/compat
.include "${.CURDIR}/compat/Makefile.inc" .include "${.CURDIR}/compat/Makefile.inc"
# Marker for compat code that can't be easily isolated
CPPFLAGS+= -D__BUILD_LEGACY
.endif .endif
.include "${.CURDIR}/../../common/lib/libc/Makefile.inc" .include "${.CURDIR}/../../common/lib/libc/Makefile.inc"

View File

@ -1,7 +1,8 @@
# $NetBSD: shlib_version,v 1.237 2013/03/01 18:25:16 joerg Exp $ # $NetBSD: shlib_version,v 1.238 2013/04/12 19:58:46 joerg Exp $
# Remember to update distrib/sets/lists/base/shl.* when changing # Remember to update distrib/sets/lists/base/shl.* when changing
# #
# things we wish to do on next major version bump: # things we wish to do on next major version bump:
# - remove code under BUILD_LEGACY
# - libc/net/rcmd.c: make __ivaliduser() and __ivaliduser_sa() static # - libc/net/rcmd.c: make __ivaliduser() and __ivaliduser_sa() static
# - libc/net: resolver update to BIND8/9? # - libc/net: resolver update to BIND8/9?
# - md2, md4, md5, rmd160 & sha1 functions should take the same arguments AFAP # - md2, md4, md5, rmd160 & sha1 functions should take the same arguments AFAP