Module Name: src
Committed By: joerg
Date: Fri Apr 12 19:58:46 UTC 2013
Modified Files:
src/lib/libc: Makefile shlib_version
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.149 -r1.150 src/lib/libc/Makefile
cvs rdiff -u -r1.237 -r1.238 src/lib/libc/shlib_version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/Makefile
diff -u src/lib/libc/Makefile:1.149 src/lib/libc/Makefile:1.150
--- src/lib/libc/Makefile:1.149 Fri Jan 20 16:31:29 2012
+++ src/lib/libc/Makefile Fri Apr 12 19:58:45 2013
@@ -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
#
# All library objects contain sccsid strings by default; they may be
@@ -42,15 +42,17 @@ assym.h: ${ARCHDIR}/genassym.cf
.endif
# 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.
-BUILDCOLD?= no
-.if "${BUILDCOLD}" == "yes"
+BUILD_LEGACY?= no
+.if "${BUILD_LEGACY}" == "yes"
SUBDIR=compat
.include <bsd.subdir.mk>
.else
COMPATDIR=${.CURDIR}/compat
.include "${.CURDIR}/compat/Makefile.inc"
+# Marker for compat code that can't be easily isolated
+CPPFLAGS+= -D__BUILD_LEGACY
.endif
.include "${.CURDIR}/../../common/lib/libc/Makefile.inc"
Index: src/lib/libc/shlib_version
diff -u src/lib/libc/shlib_version:1.237 src/lib/libc/shlib_version:1.238
--- src/lib/libc/shlib_version:1.237 Fri Mar 1 18:25:16 2013
+++ src/lib/libc/shlib_version Fri Apr 12 19:58:46 2013
@@ -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
#
# 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: resolver update to BIND8/9?
# - md2, md4, md5, rmd160 & sha1 functions should take the same arguments AFAP
