Module Name:    src
Committed By:   martin
Date:           Fri Oct 20 16:04:59 UTC 2023

Modified Files:
        src/doc [netbsd-10]: CHANGES
        src/share/man/man5 [netbsd-10]: mk.conf.5
        src/share/mk [netbsd-10]: bsd.own.mk

Log Message:
Pull up following revision(s) (requested by mrg in ticket #430):

        doc/CHANGES: revision 1.2984
        share/mk/bsd.own.mk: revision 1.1345
        share/man/man5/mk.conf.5: revision 1.108

bsd.own.mk: force MKSTRIPSYM=no if MKDEBUG=yes

Local symbols are desirable with MKDEBUG=yes, so don't strip them.
Per request from mrg@


To generate a diff of this commit:
cvs rdiff -u -r1.2940.2.6 -r1.2940.2.7 src/doc/CHANGES
cvs rdiff -u -r1.97 -r1.97.2.1 src/share/man/man5/mk.conf.5
cvs rdiff -u -r1.1289.2.1 -r1.1289.2.2 src/share/mk/bsd.own.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.2940.2.6 src/doc/CHANGES:1.2940.2.7
--- src/doc/CHANGES:1.2940.2.6	Sun Oct  8 14:35:24 2023
+++ src/doc/CHANGES	Fri Oct 20 16:04:59 2023
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2940.2.6 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2940.2.7 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -800,4 +800,5 @@ Changes from NetBSD 9.0 to NetBSD 10.0:
 		[rin 20231007]
 	igc(4): Add initial support to Intel I225/I226 series Ethernet devices.
 		[knakahara, rin, msaitoh 20231006]
+	build: Force MKSTRIPSYM=no if MKDEBUG=yes. [lukem 20231020]
 

Index: src/share/man/man5/mk.conf.5
diff -u src/share/man/man5/mk.conf.5:1.97 src/share/man/man5/mk.conf.5:1.97.2.1
--- src/share/man/man5/mk.conf.5:1.97	Sat Jul  9 08:27:35 2022
+++ src/share/man/man5/mk.conf.5	Fri Oct 20 16:04:59 2023
@@ -1,4 +1,4 @@
-.\"	$NetBSD: mk.conf.5,v 1.97 2022/07/09 08:27:35 nia Exp $
+.\"	$NetBSD: mk.conf.5,v 1.97.2.1 2023/10/20 16:04:59 martin Exp $
 .\"
 .\"  Copyright (c) 1999-2003 The NetBSD Foundation, Inc.
 .\"  All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd July 9, 2022
+.Dd October 20, 2023
 .Dt MK.CONF 5
 .Os
 .\" turn off hyphenation
@@ -374,6 +374,12 @@ is built.
 .YorN
 Indicates whether separate debugging symbols should be installed into
 .Sy DESTDIR Ns Pa /usr/libdata/debug .
+.Pp
+If
+.Dq yes ,
+acts as
+.Sy MKSTRIPSYM=no .
+.
 .DFLTn
 .
 .It Sy MKDEBUGKERNEL
@@ -861,6 +867,7 @@ Keeping non-temporary local symbols
 such as static function names is useful on using DTrace for
 userland libraries and getting a backtrace from a rump kernel
 loading shared libraries.
+.NOVAR MKDEBUG=yes
 .DFLTy
 .
 .It Sy MKUNPRIVED

Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1289.2.1 src/share/mk/bsd.own.mk:1.1289.2.2
--- src/share/mk/bsd.own.mk:1.1289.2.1	Fri Aug 11 13:43:42 2023
+++ src/share/mk/bsd.own.mk	Fri Oct 20 16:04:59 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.1289.2.1 2023/08/11 13:43:42 martin Exp $
+#	$NetBSD: bsd.own.mk,v 1.1289.2.2 2023/10/20 16:04:59 martin Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -1428,6 +1428,13 @@ MKLIBCXX:=	yes
 .endif
 
 #
+# Disable MKSTRIPSYM if MKDEBUG is enabled.
+#
+.if ${MKDEBUG} != "no"
+MKSTRIPSYM:=	no
+.endif
+
+#
 # install(1) parameters.
 #
 COPY?=		-c

Reply via email to