Re: install/60741: strings in installation binaries cause bloat

To: install-manager%netbsd.org@localhost,gnats-admin%netbsd.org@localhost,netbsd-bugs%netbsd.org@localhost,christos%astron.com@localhost
Subject: Re: install/60741: strings in installation binaries cause bloat
From: "Martin Husemann via gnats" <gnats-admin%NetBSD.org@localhost>
Date: Sun, 20 Sep 2026 16:05:02 +0000 (UTC)
The following reply was made to PR install/60741; it has been noted by GNATS.

From: Martin Husemann <martin%duskware.de@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: 
Subject: Re: install/60741: strings in installation binaries cause bloat
Date: Sun, 20 Sep 2026 18:02:28 +0200

 --jhAut859rLYmUTy6
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 I checked the distrib stuff and we already define NDEBUG wherever
 possible. So we need a special build of all the other libc stuff.
 
 Following a suggestion from Taylor I tried a simple hack to 
 create a libc_ndebug with something like this as Makefile:
 
 ---8<---
 # $NetBSD$
 #
 # Version of libc that avoids the assert(3) macro
 # (See Makefile.inc also.)
 
 LIB=	c_ndebug
 WARNS=		1
 NOLINKLIB=	# defined
 NOLINT= 	# defined
 NOPIC=		# defined
 NOPROFILE=	# defined
 
 .include <bsd.own.mk>
 
 SMALL=		# defined
 USE_FORT=	no
 USE_HESIOD=	no
 USE_YP=		no
 CPPFLAGS+=	-DSMALL
 CPPFLAGS+=	-DNDEBUG
 LIBCSRCDIR=${NETBSDSRCDIR}/lib/libc
 BUILD_LEGACY= never
 .include "${LIBCSRCDIR}/Makefile"
 --->8---
 
 but it is pretty intrusive in libc and it doesn't feel
 like the right way to go (incomplete, non-working patch attached).
 
 Any better ideas? Did I overlook something to make this
 more simple?
 
 I wondered for a moment if we could re-use the compat build in
 src/compat for this libc (like we do when building i386 libc on amd64,
 as that is just passing additional compiler flags and so should be all
 we need here).
 
 Martin
 
 --jhAut859rLYmUTy6
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename=patch
 
 Index: Makefile
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/Makefile,v
 retrieving revision 1.175
 diff -u -r1.175 Makefile
 --- Makefile	30 Mar 2025 16:17:04 -0000	1.175
 +++ Makefile	20 Sep 2026 15:59:05 -0000
 @@ -18,15 +18,20 @@
  # actually call the Hesiod functions, put -DHESIOD on the CPPFLAGS line below.
  
  
 +# default to local directory, but allow overriding so other places can
 +# "just" include this Makefile
 +LIBCSRCDIR?="${.CURDIR}"
 +
 +
  # generated code depends on RTTI
  LIBCSANITIZERFLAGS+=	${${ACTIVE_CC} == "clang":? -fno-sanitize=function :}
  
 -.include "Makefile.inc"
 +.include "${.PARSEDIR}/Makefile.inc"
  
  LIB=		c
 -CPPFLAGS+=	-I${.CURDIR}/include -I${.CURDIR}
 +CPPFLAGS+=	-I${LIBCSRCDIR}/include -I${LIBCSRCDIR}
  
 -LIBCDIR=	${.CURDIR}
 +LIBCDIR=	${LIBCSRCDIR}
  
  .if exists (${ARCHDIR}/Makefile.inc)
  .PATH:	${ARCHDIR}
 @@ -52,55 +57,57 @@
  .if "${BUILD_LEGACY}" == "yes"
  SUBDIR=compat
  .include <bsd.subdir.mk>
 -.else
 -COMPATDIR=${.CURDIR}/compat
 -.include "${.CURDIR}/compat/Makefile.inc"
 +.elif "${BUILD_LEGACY}" != "never"
 +COMPATDIR=${LIBCSRCDIR}/compat
 +.include "${LIBCSRCDIR}/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"
 -.include "${.CURDIR}/atomic/Makefile.inc"
 -.include "${.CURDIR}/cdb/Makefile.inc"
 -.include "${.CURDIR}/db/Makefile.inc"
 -.include "${.CURDIR}/citrus/Makefile.inc"
 -.include "${.CURDIR}/compat-43/Makefile.inc"
 -.include "${.CURDIR}/compiler_rt/Makefile.inc"
 -.include "${.CURDIR}/dlfcn/Makefile.inc"
 -.include "${.CURDIR}/gdtoa/Makefile.inc"
 -.include "${.CURDIR}/gen/Makefile.inc"
 -.include "${.CURDIR}/gmon/Makefile.inc"
 -.include "${.CURDIR}/hash/Makefile.inc"
 -.include "${.CURDIR}/iconv/Makefile.inc"
 -.include "${.CURDIR}/inet/Makefile.inc"
 -.include "${.CURDIR}/isc/Makefile.inc"
 -.include "${.CURDIR}/locale/Makefile.inc"
 -.include "${.CURDIR}/md/Makefile.inc"
 -.include "${.CURDIR}/misc/Makefile.inc"
 -.include "${.CURDIR}/net/Makefile.inc"
 -.include "${.CURDIR}/nameser/Makefile.inc"
 -.include "${.CURDIR}/nls/Makefile.inc"
 -.include "${.CURDIR}/posix1e/Makefile.inc"
 -.include "${.CURDIR}/regex/Makefile.inc"
 -.include "${.CURDIR}/resolv/Makefile.inc"
 -.include "${.CURDIR}/rpc/Makefile.inc"
 -.include "${.CURDIR}/ssp/Makefile.inc"
 -.include "${.CURDIR}/stdio/Makefile.inc"
 -.include "${.CURDIR}/stdlib/Makefile.inc"
 -.include "${.CURDIR}/string/Makefile.inc"
 -.include "${.CURDIR}/termios/Makefile.inc"
 -.include "${.CURDIR}/thread-stub/Makefile.inc"
 -.include "${.CURDIR}/time/Makefile.inc"
 +.include "${LIBCSRCDIR}/../../common/lib/libc/Makefile.inc"
 +.include "${LIBCSRCDIR}/atomic/Makefile.inc"
 +.include "${LIBCSRCDIR}/cdb/Makefile.inc"
 +.include "${LIBCSRCDIR}/db/Makefile.inc"
 +.include "${LIBCSRCDIR}/citrus/Makefile.inc"
 +.if "${BUILD_LEGACY}" != "never"
 +.include "${LIBCSRCDIR}/compat-43/Makefile.inc"
 +.endif
 +.include "${LIBCSRCDIR}/compiler_rt/Makefile.inc"
 +.include "${LIBCSRCDIR}/dlfcn/Makefile.inc"
 +.include "${LIBCSRCDIR}/gdtoa/Makefile.inc"
 +.include "${LIBCSRCDIR}/gen/Makefile.inc"
 +.include "${LIBCSRCDIR}/gmon/Makefile.inc"
 +.include "${LIBCSRCDIR}/hash/Makefile.inc"
 +.include "${LIBCSRCDIR}/iconv/Makefile.inc"
 +.include "${LIBCSRCDIR}/inet/Makefile.inc"
 +.include "${LIBCSRCDIR}/isc/Makefile.inc"
 +.include "${LIBCSRCDIR}/locale/Makefile.inc"
 +.include "${LIBCSRCDIR}/md/Makefile.inc"
 +.include "${LIBCSRCDIR}/misc/Makefile.inc"
 +.include "${LIBCSRCDIR}/net/Makefile.inc"
 +.include "${LIBCSRCDIR}/nameser/Makefile.inc"
 +.include "${LIBCSRCDIR}/nls/Makefile.inc"
 +.include "${LIBCSRCDIR}/posix1e/Makefile.inc"
 +.include "${LIBCSRCDIR}/regex/Makefile.inc"
 +.include "${LIBCSRCDIR}/resolv/Makefile.inc"
 +.include "${LIBCSRCDIR}/rpc/Makefile.inc"
 +.include "${LIBCSRCDIR}/ssp/Makefile.inc"
 +.include "${LIBCSRCDIR}/stdio/Makefile.inc"
 +.include "${LIBCSRCDIR}/stdlib/Makefile.inc"
 +.include "${LIBCSRCDIR}/string/Makefile.inc"
 +.include "${LIBCSRCDIR}/termios/Makefile.inc"
 +.include "${LIBCSRCDIR}/thread-stub/Makefile.inc"
 +.include "${LIBCSRCDIR}/time/Makefile.inc"
  .if ${RUMPRUN} != "yes"
 -.include "${.CURDIR}/tls/Makefile.inc"
 +.include "${LIBCSRCDIR}/tls/Makefile.inc"
  .endif
 -.include "${.CURDIR}/sys/Makefile.inc"
 +.include "${LIBCSRCDIR}/sys/Makefile.inc"
  .if ${HAVE_LIBGCC_EH} == "no"
  .include "${NETBSDSRCDIR}/sys/lib/libunwind/Makefile.inc"
  .endif
 -.include "${.CURDIR}/uuid/Makefile.inc"
 +.include "${LIBCSRCDIR}/uuid/Makefile.inc"
  .if (${MKYP} != "no")
 -.include "${.CURDIR}/yp/Makefile.inc"
 +.include "${LIBCSRCDIR}/yp/Makefile.inc"
  .endif
  
  # Remove from SRCS the .c files for any .S files added by the MD makefiles,
 Index: Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/Makefile.inc,v
 retrieving revision 1.26
 diff -u -r1.26 Makefile.inc
 --- Makefile.inc	3 Feb 2026 19:42:49 -0000	1.26
 +++ Makefile.inc	20 Sep 2026 15:59:05 -0000
 @@ -17,6 +17,8 @@
  # The Hesiod functions are always in libc. To choose that getpwent() and friends
  # actually call the Hesiod functions, put -DHESIOD on the CPPFLAGS line below.
  
 +LIBCSRCDIR?="${.CURDIR}"
 +
  NOSANITIZER=	# defined
  USE_FORT?=	yes
  
 @@ -65,7 +67,7 @@
  
  .include "libcincludes.mk"
  
 -ARCHDIR=	${.CURDIR}/arch/${ARCHSUBDIR}
 +ARCHDIR=	${LIBCSRCDIR}/arch/${ARCHSUBDIR}
  AFLAGS+=	-I${ARCHDIR}
  CLEANFILES+=	tags
  
 Index: arch/aarch64/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/arch/aarch64/Makefile.inc,v
 retrieving revision 1.3
 diff -u -r1.3 Makefile.inc
 --- arch/aarch64/Makefile.inc	31 Oct 2021 22:24:34 -0000	1.3
 +++ arch/aarch64/Makefile.inc	20 Sep 2026 15:59:05 -0000
 @@ -14,5 +14,5 @@
  # in softfloat. Just provide a wrapper which pulls it in via a #include
  SRCS.softfloat= softfloat-wrapper.c
  SRCS+= ${SRCS.softfloat}
 -CPPFLAGS+=      -I${ARCHDIR}/softfloat -I${.CURDIR}/softfloat \
 -		-I${.CURDIR}/softfloat/bits64
 +CPPFLAGS+=      -I${ARCHDIR}/softfloat -I${LIBCSRCDIR}/softfloat \
 +		-I${LIBCSRCDIR}/softfloat/bits64
 Index: arch/sparc64/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/arch/sparc64/Makefile.inc,v
 retrieving revision 1.21
 diff -u -r1.21 Makefile.inc
 --- arch/sparc64/Makefile.inc	31 Oct 2021 22:24:36 -0000	1.21
 +++ arch/sparc64/Makefile.inc	20 Sep 2026 15:59:05 -0000
 @@ -17,7 +17,7 @@
  # in softfloat. Just provide a wrapper which pulls it in via a #include
  SRCS.softfloat= softfloat-wrapper.c
  SRCS+= ${SRCS.softfloat}
 -CPPFLAGS+=      -I${ARCHDIR}/softfloat -I${.CURDIR}/softfloat \
 -		-I${.CURDIR}/softfloat/bits64
 +CPPFLAGS+=      -I${ARCHDIR}/softfloat -I${LIBCSRCDIR}/softfloat \
 +		-I${LIBCSRCDIR}/softfloat/bits64
  
  .endif
 Index: atomic/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/atomic/Makefile.inc,v
 retrieving revision 1.5
 diff -u -r1.5 Makefile.inc
 --- atomic/Makefile.inc	9 Apr 2022 23:32:52 -0000	1.5
 +++ atomic/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -2,7 +2,7 @@
  #	from: @(#)Makefile.inc	8.6 (Berkeley) 5/4/95
  
  # gen sources
 -.PATH:	${.CURDIR}/atomic
 +.PATH:	${LIBCSRCDIR}/atomic
  
  MAN+=	atomic_add.3 atomic_and.3 atomic_cas.3 atomic_dec.3 \
  	atomic_inc.3 atomic_ops.3 atomic_or.3 atomic_swap.3 \
 Index: cdb/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/cdb/Makefile.inc,v
 retrieving revision 1.6
 diff -u -r1.6 Makefile.inc
 --- cdb/Makefile.inc	18 Apr 2026 21:45:23 -0000	1.6
 +++ cdb/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -2,7 +2,7 @@
  
  # Constant database reader/writer
  
 -.PATH:	${.CURDIR}/cdb
 +.PATH:	${LIBCSRCDIR}/cdb
  .PATH:	${NETBSDSRCDIR}/common/lib/libc/cdb
  
  SRCS+=		cdbr.c cdbw.c
 Index: citrus/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/citrus/Makefile.inc,v
 retrieving revision 1.10
 diff -u -r1.10 Makefile.inc
 --- citrus/Makefile.inc	3 Jun 2023 09:09:09 -0000	1.10
 +++ citrus/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -1,7 +1,7 @@
  #	$NetBSD: Makefile.inc,v 1.10 2023/06/03 09:09:09 lukem Exp $
  
  # sources
 -.PATH: ${ARCHDIR}/citrus ${.CURDIR}/citrus
 +.PATH: ${ARCHDIR}/citrus ${LIBCSRCDIR}/citrus
  
  MODULE_SHLIB_MAJOR!= . ${NETBSDSRCDIR}/lib/i18n_module/shlib_version ; echo $$major
  CPPFLAGS.citrus_module.c+=-DI18NMODULE_MAJOR=${MODULE_SHLIB_MAJOR}
 Index: compat/arch/alpha/gen/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/compat/arch/alpha/gen/Makefile.inc,v
 retrieving revision 1.2
 diff -u -r1.2 Makefile.inc
 --- compat/arch/alpha/gen/Makefile.inc	28 Jun 2006 14:22:15 -0000	1.2
 +++ compat/arch/alpha/gen/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -4,4 +4,6 @@
  SRCS+=  compat_setjmp.S compat__setjmp.S compat_sigsetjmp.S
  
  # objects built from C sources in compat/gen
 +.if ${BUILD_LEGACY} != "never"
  SRCS+=  compat_frexp_ieee754.c compat_ldexp_ieee754.c compat_modf_ieee754.c
 +.endif
 Index: compat/arch/arm/gen/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/compat/arch/arm/gen/Makefile.inc,v
 retrieving revision 1.2
 diff -u -r1.2 Makefile.inc
 --- compat/arch/arm/gen/Makefile.inc	28 Jun 2006 14:46:33 -0000	1.2
 +++ compat/arch/arm/gen/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -3,4 +3,6 @@
  SRCS+=	compat_setjmp.S compat_sigsetjmp.S
  
  # objects built from C sources in compat/gen
 +.if ${BUILD_LEGACY} != "never"
  SRCS+=	compat_frexp_ieee754.c compat_ldexp_ieee754.c compat_modf_ieee754.c
 +.endif
 Index: compat/arch/hppa/gen/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/compat/arch/hppa/gen/Makefile.inc,v
 retrieving revision 1.1
 diff -u -r1.1 Makefile.inc
 --- compat/arch/hppa/gen/Makefile.inc	28 Jun 2006 14:46:33 -0000	1.1
 +++ compat/arch/hppa/gen/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -1,4 +1,6 @@
  # $NetBSD: Makefile.inc,v 1.1 2006/06/28 14:46:33 drochner Exp $
  
  # objects built from C sources in compat/gen
 +.if ${BUILD_LEGACY} != "never"
  SRCS+=	compat_frexp_ieee754.c compat_ldexp_ieee754.c compat_modf_ieee754.c
 +.endif
 Index: compat/arch/i386/gen/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/compat/arch/i386/gen/Makefile.inc,v
 retrieving revision 1.3
 diff -u -r1.3 Makefile.inc
 --- compat/arch/i386/gen/Makefile.inc	27 Jun 2006 18:19:57 -0000	1.3
 +++ compat/arch/i386/gen/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -4,4 +4,6 @@
  SRCS+=	compat_setjmp.S compat_sigsetjmp.S
  
  # objects built from C sources in compat/gen
 +.if ${BUILD_LEGACY} != "never"
  SRCS+=  compat_frexp_ieee754.c compat_ldexp_ieee754.c compat_modf_ieee754.c
 +.endif
 Index: compat/arch/m68k/gen/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/compat/arch/m68k/gen/Makefile.inc,v
 retrieving revision 1.2
 diff -u -r1.2 Makefile.inc
 --- compat/arch/m68k/gen/Makefile.inc	3 Jul 2006 12:54:34 -0000	1.2
 +++ compat/arch/m68k/gen/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -4,5 +4,7 @@
  SRCS+=	compat_setjmp.S compat_sigsetjmp.S
  
  # objects built from C sources in compat/gen
 +.if ${BUILD_LEGACY} != "never"
  SRCS+=	compat_frexp_ieee754.c
  #SRCS+=	compat_ldexp_ieee754.c compat_modf_ieee754.c
 +.endif
 Index: compat/arch/mips/gen/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/compat/arch/mips/gen/Makefile.inc,v
 retrieving revision 1.3
 diff -u -r1.3 Makefile.inc
 --- compat/arch/mips/gen/Makefile.inc	3 Jul 2006 12:58:55 -0000	1.3
 +++ compat/arch/mips/gen/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -4,5 +4,7 @@
  SRCS+=	compat_setjmp.S compat_sigsetjmp.S
  
  # objects built from C sources in compat/gen
 +.if ${BUILD_LEGACY} != "never"
  SRCS+=	compat_frexp_ieee754.c
  #SRCS+=	compat_ldexp_ieee754.c compat_modf_ieee754.c
 +.endif
 Index: compat/arch/powerpc/gen/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/compat/arch/powerpc/gen/Makefile.inc,v
 retrieving revision 1.3
 diff -u -r1.3 Makefile.inc
 --- compat/arch/powerpc/gen/Makefile.inc	28 Jun 2006 14:46:33 -0000	1.3
 +++ compat/arch/powerpc/gen/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -4,4 +4,6 @@
  SRCS+=	compat_setjmp.S compat_sigsetjmp.S
  
  # objects built from C sources in compat/gen
 +.if ${BUILD_LEGACY} != "never"
  SRCS+=	compat_frexp_ieee754.c compat_ldexp_ieee754.c compat_modf_ieee754.c
 +.endif
 Index: compat/arch/powerpc64/gen/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/compat/arch/powerpc64/gen/Makefile.inc,v
 retrieving revision 1.1
 diff -u -r1.1 Makefile.inc
 --- compat/arch/powerpc64/gen/Makefile.inc	1 Jul 2006 19:17:32 -0000	1.1
 +++ compat/arch/powerpc64/gen/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -4,4 +4,6 @@
  SRCS+=	
  
  # objects built from C sources in compat/gen
 +.if ${BUILD_LEGACY} != "never"
  SRCS+=
 +.endif
 Index: compat/arch/sh3/gen/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/compat/arch/sh3/gen/Makefile.inc,v
 retrieving revision 1.3
 diff -u -r1.3 Makefile.inc
 --- compat/arch/sh3/gen/Makefile.inc	28 Jun 2006 14:46:33 -0000	1.3
 +++ compat/arch/sh3/gen/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -3,4 +3,6 @@
  SRCS+=	compat_setjmp.S compat_sigsetjmp.S
  
  # objects built from C sources in compat/gen
 +.if ${BUILD_LEGACY} != "never"
  SRCS+=	compat_frexp_ieee754.c compat_ldexp_ieee754.c compat_modf_ieee754.c
 +.endif
 Index: compat/arch/sparc/gen/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/compat/arch/sparc/gen/Makefile.inc,v
 retrieving revision 1.2
 diff -u -r1.2 Makefile.inc
 --- compat/arch/sparc/gen/Makefile.inc	3 Jul 2006 13:06:12 -0000	1.2
 +++ compat/arch/sparc/gen/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -3,5 +3,7 @@
  SRCS+=	compat_setjmp.S compat_sigsetjmp.S
  
  # objects built from C sources in compat/gen
 +.if ${BUILD_LEGACY} != "never"
  SRCS+=	compat_frexp_ieee754.c compat_ldexp_ieee754.c
  #SRCS+=	compat_modf_ieee754.c
 +.endif
 Index: compat/arch/sparc64/gen/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/compat/arch/sparc64/gen/Makefile.inc,v
 retrieving revision 1.2
 diff -u -r1.2 Makefile.inc
 --- compat/arch/sparc64/gen/Makefile.inc	3 Jul 2006 13:06:12 -0000	1.2
 +++ compat/arch/sparc64/gen/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -3,5 +3,7 @@
  SRCS+=	compat_setjmp.S compat_sigsetjmp.S
  
  # objects built from C sources in compat/gen
 +.if ${BUILD_LEGACY} != "never"
  SRCS+=	compat_frexp_ieee754.c compat_ldexp_ieee754.c
  #SRCS+=	compat_modf_ieee754.c
 +.endif
 Index: compat/arch/x86_64/gen/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/compat/arch/x86_64/gen/Makefile.inc,v
 retrieving revision 1.1
 diff -u -r1.1 Makefile.inc
 --- compat/arch/x86_64/gen/Makefile.inc	3 Jul 2006 13:13:53 -0000	1.1
 +++ compat/arch/x86_64/gen/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -1,4 +1,6 @@
  # $NetBSD: Makefile.inc,v 1.1 2006/07/03 13:13:53 drochner Exp $
  
  # objects built from C sources in compat/gen
 +.if ${BUILD_LEGACY} != "never"
  SRCS+=	compat_frexp_ieee754.c compat_ldexp_ieee754.c compat_modf_ieee754.c
 +.endif
 Index: compat/stdio/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/compat/stdio/Makefile.inc,v
 retrieving revision 1.2
 diff -u -r1.2 Makefile.inc
 --- compat/stdio/Makefile.inc	20 Oct 2025 14:31:39 -0000	1.2
 +++ compat/stdio/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -10,10 +10,10 @@
  .ifndef ABSTOP
  ABSTOP!= cd ${.PARSEDIR}; pwd
  
 -.if (${.PARSEDIR} == ${.CURDIR})
 +.if (${.PARSEDIR} == ${LIBCSRCDIR})
  RELTOP:= .
  .else
 -RELTOP:= ${.PARSEDIR:S,^${.CURDIR},,}
 +RELTOP:= ${.PARSEDIR:S,^${LIBCSRCDIR},,}
  .endif
  
  # you can set BSD{SRC,OBJ}DIR in Makefile.local.inc
 Index: compat-43/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/compat-43/Makefile.inc,v
 retrieving revision 1.16
 diff -u -r1.16 Makefile.inc
 --- compat-43/Makefile.inc	24 Apr 2006 17:15:06 -0000	1.16
 +++ compat-43/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -2,7 +2,7 @@
  #	from: @(#)Makefile.inc	8.1 (Berkeley) 6/2/93
  
  # compat-43 sources
 -.PATH: ${ARCHDIR}/compat-43 ${.CURDIR}/compat-43
 +.PATH: ${ARCHDIR}/compat-43 ${LIBCSRCDIR}/compat-43
  
  SRCS+=	creat.c getdtablesize.c gethostid.c \
  	killpg.c sethostid.c setpgrp.c \
 Index: db/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/db/Makefile.inc,v
 retrieving revision 1.8
 diff -u -r1.8 Makefile.inc
 --- db/Makefile.inc	9 Aug 2011 13:03:36 -0000	1.8
 +++ db/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -3,9 +3,9 @@
  #
  CPPFLAGS+=-D__DBINTERFACE_PRIVATE
  
 -.include "${.CURDIR}/db/btree/Makefile.inc"
 -.include "${.CURDIR}/db/db/Makefile.inc"
 -.include "${.CURDIR}/db/hash/Makefile.inc"
 -.include "${.CURDIR}/db/man/Makefile.inc"
 -.include "${.CURDIR}/db/mpool/Makefile.inc"
 -.include "${.CURDIR}/db/recno/Makefile.inc"
 +.include "${LIBCSRCDIR}/db/btree/Makefile.inc"
 +.include "${LIBCSRCDIR}/db/db/Makefile.inc"
 +.include "${LIBCSRCDIR}/db/hash/Makefile.inc"
 +.include "${LIBCSRCDIR}/db/man/Makefile.inc"
 +.include "${LIBCSRCDIR}/db/mpool/Makefile.inc"
 +.include "${LIBCSRCDIR}/db/recno/Makefile.inc"
 Index: db/btree/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/db/btree/Makefile.inc,v
 retrieving revision 1.6
 diff -u -r1.6 Makefile.inc
 --- db/btree/Makefile.inc	3 May 1996 21:50:36 -0000	1.6
 +++ db/btree/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -1,7 +1,7 @@
  #	$NetBSD: Makefile.inc,v 1.6 1996/05/03 21:50:36 cgd Exp $
  #	@(#)Makefile.inc	8.2 (Berkeley) 7/14/94
  
 -.PATH: ${.CURDIR}/db/btree
 +.PATH: ${LIBCSRCDIR}/db/btree
  
  SRCS+=	bt_close.c bt_conv.c bt_debug.c bt_delete.c bt_get.c bt_open.c \
  	bt_overflow.c bt_page.c bt_put.c bt_search.c bt_seq.c bt_split.c \
 Index: db/db/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/db/db/Makefile.inc,v
 retrieving revision 1.5
 diff -u -r1.5 Makefile.inc
 --- db/db/Makefile.inc	1 Dec 2013 00:22:48 -0000	1.5
 +++ db/db/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -1,6 +1,6 @@
  #	$NetBSD: Makefile.inc,v 1.5 2013/12/01 00:22:48 christos Exp $
  #       @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
  
 -.PATH: ${.CURDIR}/db/db
 +.PATH: ${LIBCSRCDIR}/db/db
  
  SRCS+=	db.c dbfile.c
 Index: db/hash/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/db/hash/Makefile.inc,v
 retrieving revision 1.9
 diff -u -r1.9 Makefile.inc
 --- db/hash/Makefile.inc	13 Sep 2005 01:44:09 -0000	1.9
 +++ db/hash/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -1,7 +1,7 @@
  #	$NetBSD: Makefile.inc,v 1.9 2005/09/13 01:44:09 christos Exp $
  #       @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
  
 -.PATH: ${.CURDIR}/db/hash
 +.PATH: ${LIBCSRCDIR}/db/hash
  
  SRCS+=	hash.c hash_bigkey.c hash_buf.c hash_func.c hash_log2.c \
  	hash_page.c ndbmdatum.c ndbm.c
 Index: db/man/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/db/man/Makefile.inc,v
 retrieving revision 1.10
 diff -u -r1.10 Makefile.inc
 --- db/man/Makefile.inc	30 Apr 2004 21:13:23 -0000	1.10
 +++ db/man/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -1,7 +1,7 @@
  #	$NetBSD: Makefile.inc,v 1.10 2004/04/30 21:13:23 kleink Exp $
  #       @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
  
 -.PATH: ${.CURDIR}/db/man
 +.PATH: ${LIBCSRCDIR}/db/man
  
  MAN+=	btree.3 dbm_clearerr.3 dbopen.3 hash.3 recno.3 mpool.3
  MLINKS+= dbm_clearerr.3 dbm_close.3 dbm_clearerr.3 dbm_delete.3
 Index: db/mpool/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/db/mpool/Makefile.inc,v
 retrieving revision 1.4
 diff -u -r1.4 Makefile.inc
 --- db/mpool/Makefile.inc	27 Feb 1995 13:23:53 -0000	1.4
 +++ db/mpool/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -1,6 +1,6 @@
  #	$NetBSD: Makefile.inc,v 1.4 1995/02/27 13:23:53 cgd Exp $
  #	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
  
 -.PATH: ${.CURDIR}/db/mpool
 +.PATH: ${LIBCSRCDIR}/db/mpool
  
  SRCS+=	mpool.c
 Index: db/recno/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/db/recno/Makefile.inc,v
 retrieving revision 1.5
 diff -u -r1.5 Makefile.inc
 --- db/recno/Makefile.inc	3 May 1996 21:38:43 -0000	1.5
 +++ db/recno/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -1,7 +1,7 @@
  #	$NetBSD: Makefile.inc,v 1.5 1996/05/03 21:38:43 cgd Exp $
  #       @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
  
 -.PATH: ${.CURDIR}/db/recno
 +.PATH: ${LIBCSRCDIR}/db/recno
  
  SRCS+=	rec_close.c rec_delete.c rec_get.c rec_open.c rec_put.c rec_search.c \
  	rec_seq.c rec_utils.c
 Index: dlfcn/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/dlfcn/Makefile.inc,v
 retrieving revision 1.3
 diff -u -r1.3 Makefile.inc
 --- dlfcn/Makefile.inc	6 Jul 2010 05:59:52 -0000	1.3
 +++ dlfcn/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -1,7 +1,7 @@
  #       $NetBSD: Makefile.inc,v 1.3 2010/07/06 05:59:52 mrg Exp $
  
 -.PATH: ${.CURDIR}/dlfcn
 +.PATH: ${LIBCSRCDIR}/dlfcn
  
  CPPFLAGS+=	-I${NETBSDSRCDIR}/libexec/ld.elf_so
 -CPPFLAGS+=	-I${.CURDIR}/dlfcn
 +CPPFLAGS+=	-I${LIBCSRCDIR}/dlfcn
  SRCS+=		dlfcn_elf.c
 Index: gdtoa/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/gdtoa/Makefile.inc,v
 retrieving revision 1.15
 diff -u -r1.15 Makefile.inc
 --- gdtoa/Makefile.inc	7 Jun 2024 20:50:13 -0000	1.15
 +++ gdtoa/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -1,8 +1,8 @@
  #	$NetBSD: Makefile.inc,v 1.15 2024/06/07 20:50:13 riastradh Exp $
  
  # gdtoa sources
 -.PATH: ${.CURDIR}/gdtoa
 -CPPFLAGS+=-I${.CURDIR}/gdtoa -I${.CURDIR}/locale
 +.PATH: ${LIBCSRCDIR}/gdtoa
 +CPPFLAGS+=-I${LIBCSRCDIR}/gdtoa -I${LIBCSRCDIR}/locale
  
  .if ${MACHINE_ARCH} == "vax"
  CPPFLAGS+=-DNO_FENV_H
 Index: gen/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/gen/Makefile.inc,v
 retrieving revision 1.231
 diff -u -r1.231 Makefile.inc
 --- gen/Makefile.inc	11 Jul 2026 03:53:40 -0000	1.231
 +++ gen/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -2,7 +2,7 @@
  #	from: @(#)Makefile.inc	8.6 (Berkeley) 5/4/95
  
  # gen sources
 -.PATH: ${ARCHDIR}/gen ${.CURDIR}/gen
 +.PATH: ${ARCHDIR}/gen ${LIBCSRCDIR}/gen
  
  .if ${RUMPRUN} != "yes"
  SRCS+=	_errno.c daemon.c
 @@ -216,8 +216,10 @@
  errlist.c: errlist.awk ${NETBSDSRCDIR}/sys/sys/errno.h
  	${TOOL_AWK} -f ${.ALLSRC} > ${.TARGET}
  
 +.if !defined(SMALL)
  USER_VERSIONS!= DATE=${TOOL_DATE} SED=${TOOL_SED}			\
  	$${HOST_SH:-sh} ${LIBCDIR}/gen/grab-version.sh "${NETBSDSRCDIR}"
 +.endif
  
  CPPFLAGS.sysctl.c+=${USER_VERSIONS}
  sysctl.o: /dev/null
 Index: gmon/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/gmon/Makefile.inc,v
 retrieving revision 1.16
 diff -u -r1.16 Makefile.inc
 --- gmon/Makefile.inc	29 Aug 2021 16:44:16 -0000	1.16
 +++ gmon/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -2,7 +2,7 @@
  #	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
  
  # gmon sources
 -.PATH: ${.CURDIR}/gmon ${ARCHDIR}/gmon
 +.PATH: ${LIBCSRCDIR}/gmon ${ARCHDIR}/gmon
  
  .-include "${ARCHDIR}/gmon/Makefile.inc"
  
 Index: hash/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/hash/Makefile.inc,v
 retrieving revision 1.14
 diff -u -r1.14 Makefile.inc
 --- hash/Makefile.inc	30 Nov 2017 05:47:24 -0000	1.14
 +++ hash/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -2,15 +2,15 @@
  #	$OpenBSD: Makefile.inc,v 1.5 1997/07/17 06:02:42 millert Exp $
  
  # hash functions
 -.PATH: ${ARCHDIR}/hash ${.CURDIR}/hash
 +.PATH: ${ARCHDIR}/hash ${LIBCSRCDIR}/hash
  
  SRCS+= hmac.c
  MAN+= hmac.3
  
 -.include "${.CURDIR}/hash/md2/Makefile.inc"
 -.include "${.CURDIR}/hash/rmd160/Makefile.inc"
 -.include "${.CURDIR}/hash/sha1/Makefile.inc"
 -.include "${.CURDIR}/hash/sha2/Makefile.inc"
 -.include "${.CURDIR}/hash/sha3/Makefile.inc"
 +.include "${LIBCSRCDIR}/hash/md2/Makefile.inc"
 +.include "${LIBCSRCDIR}/hash/rmd160/Makefile.inc"
 +.include "${LIBCSRCDIR}/hash/sha1/Makefile.inc"
 +.include "${LIBCSRCDIR}/hash/sha2/Makefile.inc"
 +.include "${LIBCSRCDIR}/hash/sha3/Makefile.inc"
  
 -.include "${.CURDIR}/hash/murmurhash/Makefile.inc"
 +.include "${LIBCSRCDIR}/hash/murmurhash/Makefile.inc"
 Index: hash/md2/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/hash/md2/Makefile.inc,v
 retrieving revision 1.1
 diff -u -r1.1 Makefile.inc
 --- hash/md2/Makefile.inc	24 Sep 2005 20:51:14 -0000	1.1
 +++ hash/md2/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -1,7 +1,7 @@
  # $NetBSD: Makefile.inc,v 1.1 2005/09/24 20:51:14 elad Exp $
  
  # hash functions
 -.PATH: ${.CURDIR}/hash/md2
 +.PATH: ${LIBCSRCDIR}/hash/md2
  
  SRCS+=	md2.c md2hl.c
  
 Index: hash/murmurhash/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/hash/murmurhash/Makefile.inc,v
 retrieving revision 1.1
 diff -u -r1.1 Makefile.inc
 --- hash/murmurhash/Makefile.inc	8 Jul 2012 11:43:47 -0000	1.1
 +++ hash/murmurhash/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -1,5 +1,5 @@
  # $NetBSD: Makefile.inc,v 1.1 2012/07/08 11:43:47 rmind Exp $
  
 -.PATH: ${.CURDIR}/hash/murmurhash
 +.PATH: ${LIBCSRCDIR}/hash/murmurhash
  
  SRCS+=	murmurhash.c
 Index: hash/rmd160/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/hash/rmd160/Makefile.inc,v
 retrieving revision 1.1
 diff -u -r1.1 Makefile.inc
 --- hash/rmd160/Makefile.inc	24 Sep 2005 19:04:52 -0000	1.1
 +++ hash/rmd160/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -1,7 +1,7 @@
  # $NetBSD: Makefile.inc,v 1.1 2005/09/24 19:04:52 elad Exp $
  
  # hash functions
 -.PATH: ${.CURDIR}/hash/rmd160
 +.PATH: ${LIBCSRCDIR}/hash/rmd160
  
  SRCS+=	rmd160.c rmd160hl.c
  
 Index: hash/sha1/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/hash/sha1/Makefile.inc,v
 retrieving revision 1.3
 diff -u -r1.3 Makefile.inc
 --- hash/sha1/Makefile.inc	27 Nov 2018 03:56:37 -0000	1.3
 +++ hash/sha1/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -1,7 +1,7 @@
  # $NetBSD: Makefile.inc,v 1.3 2018/11/27 03:56:37 kamil Exp $
  
  # hash functions
 -.PATH: ${.CURDIR}/hash/sha1
 +.PATH: ${LIBCSRCDIR}/hash/sha1
  
  SRCS+=	sha1.c sha1hl.c
  
 Index: hash/sha2/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/hash/sha2/Makefile.inc,v
 retrieving revision 1.4
 diff -u -r1.4 Makefile.inc
 --- hash/sha2/Makefile.inc	26 May 2009 08:04:11 -0000	1.4
 +++ hash/sha2/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -1,7 +1,7 @@
  #	$NetBSD: Makefile.inc,v 1.4 2009/05/26 08:04:11 joerg Exp $
  
  # hash functions
 -.PATH: ${.CURDIR}/hash/sha2
 +.PATH: ${LIBCSRCDIR}/hash/sha2
  
  SRCS+=	sha2.c sha224hl.c sha256hl.c sha384hl.c sha512hl.c
  
 Index: hash/sha3/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/hash/sha3/Makefile.inc,v
 retrieving revision 1.2
 diff -u -r1.2 Makefile.inc
 --- hash/sha3/Makefile.inc	30 Nov 2017 16:00:48 -0000	1.2
 +++ hash/sha3/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -1,6 +1,6 @@
  #	$NetBSD: Makefile.inc,v 1.2 2017/11/30 16:00:48 wiz Exp $
  
 -.PATH: ${.CURDIR}/hash/sha3
 +.PATH: ${LIBCSRCDIR}/hash/sha3
  
  SRCS+=	keccak.c sha3.c
  
 Index: iconv/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/iconv/Makefile.inc,v
 retrieving revision 1.5
 diff -u -r1.5 Makefile.inc
 --- iconv/Makefile.inc	20 Jan 2012 16:31:29 -0000	1.5
 +++ iconv/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -1,6 +1,6 @@
  #	$NetBSD: Makefile.inc,v 1.5 2012/01/20 16:31:29 joerg Exp $
  
 -.PATH:	${ARCHDIR}/iconv ${.CURDIR}/iconv
 +.PATH:	${ARCHDIR}/iconv ${LIBCSRCDIR}/iconv
  
  SRCS+=	iconv.c
  MAN+=	iconv.3
 Index: inet/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/inet/Makefile.inc,v
 retrieving revision 1.2
 diff -u -r1.2 Makefile.inc
 --- inet/Makefile.inc	16 Jan 2014 20:31:43 -0000	1.2
 +++ inet/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -1,7 +1,7 @@
  #	$NetBSD: Makefile.inc,v 1.2 2014/01/16 20:31:43 christos Exp $
  
  # net sources
 -.PATH: ${.CURDIR}/inet
 +.PATH: ${LIBCSRCDIR}/inet
  
  SRCS+=	inet_addr.c inet_cidr_ntop.c \
  	inet_cidr_pton.c inet_lnaof.c inet_makeaddr.c \
 Index: isc/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/isc/Makefile.inc,v
 retrieving revision 1.3
 diff -u -r1.3 Makefile.inc
 --- isc/Makefile.inc	18 Apr 2026 21:52:21 -0000	1.3
 +++ isc/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -1,6 +1,6 @@
  #	$NetBSD: Makefile.inc,v 1.3 2026/04/18 21:52:21 rillig Exp $
  
  # net sources
 -.PATH: ${.CURDIR}/isc
 +.PATH: ${LIBCSRCDIR}/isc
  
  SRCS+=	assertions.c ev_timers.c ev_streams.c
 Index: locale/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/locale/Makefile.inc,v
 retrieving revision 1.69
 diff -u -r1.69 Makefile.inc
 --- locale/Makefile.inc	15 Sep 2025 00:11:54 -0000	1.69
 +++ locale/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -2,7 +2,7 @@
  #	$NetBSD: Makefile.inc,v 1.69 2025/09/15 00:11:54 riastradh Exp $
  
  # locale sources
 -.PATH: ${ARCHDIR}/locale ${.CURDIR}/locale
 +.PATH: ${ARCHDIR}/locale ${LIBCSRCDIR}/locale
  
  SRCS+=	setlocale.c __mb_cur_max.c \
  	duplocale.c global_locale.c fix_grouping.c \
 @@ -22,7 +22,7 @@
  
  # citrus multibyte locale support
  # we have quirk for libc.a - see the last part of lib/libc/Makefile
 -CPPFLAGS+=	-DWITH_RUNE -I${.CURDIR}
 +CPPFLAGS+=	-DWITH_RUNE -I${LIBCSRCDIR}
  SRCS+=	_wctrans.c _wctype.c rune.c runetable.c \
  	multibyte_c90.c multibyte_amd1.c iswctype_mb.c
  CPPFLAGS.rune.c+=		-I${LIBCDIR}/citrus
 Index: md/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/md/Makefile.inc,v
 retrieving revision 1.7
 diff -u -r1.7 Makefile.inc
 --- md/Makefile.inc	24 Sep 2005 20:51:14 -0000	1.7
 +++ md/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -3,7 +3,7 @@
  .include <bsd.own.mk>
  
  # MD4/MD5 sources
 -.PATH: ${ARCHDIR}/md ${.CURDIR}/md
 +.PATH: ${ARCHDIR}/md ${LIBCSRCDIR}/md
  
  SRCS+=	md4c.c md5c.c md4hl.c md5hl.c
  
 Index: misc/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/misc/Makefile.inc,v
 retrieving revision 1.5
 diff -u -r1.5 Makefile.inc
 --- misc/Makefile.inc	20 Apr 2021 21:42:32 -0000	1.5
 +++ misc/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -1,7 +1,7 @@
  #	$NetBSD: Makefile.inc,v 1.5 2021/04/20 21:42:32 christos Exp $
  #	@(#)Makefile.inc	8.3 (Berkeley) 10/24/94
  
 -.PATH: ${ARCHDIR}/misc ${.CURDIR}/misc
 +.PATH: ${ARCHDIR}/misc ${LIBCSRCDIR}/misc
  
  # other sources shared with the kernel
  .if ${MKLIBCSANITIZER:Uno} == "yes"
 Index: nameser/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/nameser/Makefile.inc,v
 retrieving revision 1.2
 diff -u -r1.2 Makefile.inc
 --- nameser/Makefile.inc	7 Jun 2024 20:50:13 -0000	1.2
 +++ nameser/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -1,7 +1,7 @@
  #	$NetBSD: Makefile.inc,v 1.2 2024/06/07 20:50:13 riastradh Exp $
  
  # net sources
 -.PATH: ${.CURDIR}/nameser
 +.PATH: ${LIBCSRCDIR}/nameser
  
  SRCS+=	ns_name.c ns_netint.c ns_parse.c ns_print.c \
  	ns_samedomain.c ns_ttl.c
 Index: net/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/net/Makefile.inc,v
 retrieving revision 1.96
 diff -u -r1.96 Makefile.inc
 --- net/Makefile.inc	3 Aug 2023 14:56:36 -0000	1.96
 +++ net/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -2,7 +2,7 @@
  #	@(#)Makefile.inc	8.2 (Berkeley) 9/5/93
  
  # net sources
 -.PATH: ${ARCHDIR}/net ${.CURDIR}/net
 +.PATH: ${ARCHDIR}/net ${LIBCSRCDIR}/net
  
  SRCS+=	base64.c ethers.c gethnamaddr.c getifaddrs.c \
  	getnetnamadr.c getnetent.c getpeereid.c \
 Index: nls/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/nls/Makefile.inc,v
 retrieving revision 1.12
 diff -u -r1.12 Makefile.inc
 --- nls/Makefile.inc	19 Aug 2013 08:03:34 -0000	1.12
 +++ nls/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -1,6 +1,6 @@
  #	$NetBSD: Makefile.inc,v 1.12 2013/08/19 08:03:34 joerg Exp $
  
 -.PATH: ${.CURDIR}/nls
 +.PATH: ${LIBCSRCDIR}/nls
  
  SRCS+=	catclose.c catgets.c catopen.c 
  MAN+=	catclose.3 catgets.3 catopen.3
 Index: posix1e/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/posix1e/Makefile.inc,v
 retrieving revision 1.4
 diff -u -r1.4 Makefile.inc
 --- posix1e/Makefile.inc	9 Mar 2025 16:24:38 -0000	1.4
 +++ posix1e/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -1,6 +1,6 @@
  # $FreeBSD: head/lib/libc/posix1e/Makefile.inc 338745 2018-09-18 01:40:37Z brd $
  
 -.PATH: ${.CURDIR}/posix1e ${NETBSDSRCDIR}/sys/kern
 +.PATH: ${LIBCSRCDIR}/posix1e ${NETBSDSRCDIR}/sys/kern
  
  CPPFLAGS+=-D_ACL_PRIVATE
  
 Index: quad/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/quad/Makefile.inc,v
 retrieving revision 1.18
 diff -u -r1.18 Makefile.inc
 --- quad/Makefile.inc	20 Oct 2025 14:31:39 -0000	1.18
 +++ quad/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -34,4 +34,4 @@
  
  SRCS+=	${SRCS.quad}
  
 -.PATH: ${ARCHDIR}/quad ${.CURDIR}/quad
 +.PATH: ${ARCHDIR}/quad ${LIBCSRCDIR}/quad
 Index: regex/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/regex/Makefile.inc,v
 retrieving revision 1.10
 diff -u -r1.10 Makefile.inc
 --- regex/Makefile.inc	20 Jan 2024 14:52:48 -0000	1.10
 +++ regex/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -2,7 +2,7 @@
  #	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
  
  # regex sources
 -.PATH: ${.CURDIR}/regex
 +.PATH: ${LIBCSRCDIR}/regex
  
  CPPFLAGS+=-DPOSIX_MISTAKE
  
 Index: resolv/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/resolv/Makefile.inc,v
 retrieving revision 1.9
 diff -u -r1.9 Makefile.inc
 --- resolv/Makefile.inc	3 Jun 2023 09:09:09 -0000	1.9
 +++ resolv/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -1,7 +1,7 @@
  #	$NetBSD: Makefile.inc,v 1.9 2023/06/03 09:09:09 lukem Exp $
  
  # net sources
 -.PATH: ${.CURDIR}/resolv
 +.PATH: ${LIBCSRCDIR}/resolv
  CPPFLAGS+=-DCOMPAT__RES -DUSE_POLL
  
  SRCS+=	h_errno.c herror.c res_comp.c res_data.c res_debug.c \
 Index: rpc/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/rpc/Makefile.inc,v
 retrieving revision 1.28
 diff -u -r1.28 Makefile.inc
 --- rpc/Makefile.inc	3 Jun 2023 09:09:10 -0000	1.28
 +++ rpc/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -1,7 +1,7 @@
  #	$NetBSD: Makefile.inc,v 1.28 2023/06/03 09:09:10 lukem Exp $
  
  # librpc sources
 -.PATH:	${.CURDIR}/rpc
 +.PATH:	${LIBCSRCDIR}/rpc
  
  SRCS+=	auth_none.c auth_unix.c authunix_prot.c bindresvport.c \
  	clnt_bcast.c clnt_dg.c clnt_generic.c clnt_perror.c \
 Index: softfloat/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/softfloat/Makefile.inc,v
 retrieving revision 1.23
 diff -u -r1.23 Makefile.inc
 --- softfloat/Makefile.inc	4 Oct 2025 21:03:16 -0000	1.23
 +++ softfloat/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -2,9 +2,9 @@
  
  SOFTFLOAT_BITS?=64
  .PATH:		${ARCHDIR}/softfloat \
 -		${.CURDIR}/softfloat/bits${SOFTFLOAT_BITS} ${.CURDIR}/softfloat
 +		${LIBCSRCDIR}/softfloat/bits${SOFTFLOAT_BITS} ${LIBCSRCDIR}/softfloat
  
 -CPPFLAGS+=	-I${ARCHDIR}/softfloat -I${.CURDIR}/softfloat
 +CPPFLAGS+=	-I${ARCHDIR}/softfloat -I${LIBCSRCDIR}/softfloat
  CPPFLAGS+=	-DSOFTFLOAT_FOR_GCC
  
  SRCS.softfloat= softfloat.c
 Index: ssp/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/ssp/Makefile.inc,v
 retrieving revision 1.6
 diff -u -r1.6 Makefile.inc
 --- ssp/Makefile.inc	15 Nov 2023 03:15:28 -0000	1.6
 +++ ssp/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -1,6 +1,6 @@
  #	$NetBSD: Makefile.inc,v 1.6 2023/11/15 03:15:28 christos Exp $
  
 -.PATH: ${.CURDIR}/ssp
 +.PATH: ${LIBCSRCDIR}/ssp
  
  SSP_SRCS=	gets_chk.c fgets_chk.c memcpy_chk.c memmove_chk.c memset_chk.c \
  		snprintf_chk.c sprintf_chk.c stpcpy_chk.c stpncpy_chk.c \
 Index: stdio/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/stdio/Makefile.inc,v
 retrieving revision 1.51
 diff -u -r1.51 Makefile.inc
 --- stdio/Makefile.inc	7 Jul 2025 20:05:06 -0000	1.51
 +++ stdio/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -2,7 +2,7 @@
  #	$NetBSD: Makefile.inc,v 1.51 2025/07/07 20:05:06 rillig Exp $
  
  # stdio sources
 -.PATH: ${.CURDIR}/stdio
 +.PATH: ${LIBCSRCDIR}/stdio
  
  SRCS+=	clrerr.c dprintf.c fclose.c fdopen.c feof.c ferror.c \
  	fflush.c fgetc.c fgetln.c fgetpos.c fgets.c fgetstr.c fgetwc.c \
 Index: stdlib/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/stdlib/Makefile.inc,v
 retrieving revision 1.105
 diff -u -r1.105 Makefile.inc
 --- stdlib/Makefile.inc	20 Jul 2025 23:09:09 -0000	1.105
 +++ stdlib/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -2,7 +2,7 @@
  #	from: @(#)Makefile.inc	8.3 (Berkeley) 2/4/95
  
  # stdlib sources
 -.PATH: ${ARCHDIR}/stdlib ${.CURDIR}/stdlib
 +.PATH: ${ARCHDIR}/stdlib ${LIBCSRCDIR}/stdlib
  
  SRCS+=	_env.c _rand48.c \
  	a64l.c abort.c atexit.c atof.c atoi.c atol.c atoll.c \
 Index: string/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/string/Makefile.inc,v
 retrieving revision 1.93
 diff -u -r1.93 Makefile.inc
 --- string/Makefile.inc	2 Nov 2024 02:43:48 -0000	1.93
 +++ string/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -2,7 +2,7 @@
  #	$NetBSD: Makefile.inc,v 1.93 2024/11/02 02:43:48 riastradh Exp $
  
  # string sources
 -.PATH: ${ARCHDIR}/string ${.CURDIR}/string
 +.PATH: ${ARCHDIR}/string ${LIBCSRCDIR}/string
  
  # NB: if a .S version of any of these is added in the arch/*/Makefile
  # then the relevant .c file is automatically removed
 Index: sys/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/sys/Makefile.inc,v
 retrieving revision 1.259
 diff -u -r1.259 Makefile.inc
 --- sys/Makefile.inc	9 Mar 2025 17:02:56 -0000	1.259
 +++ sys/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -2,7 +2,7 @@
  #	@(#)Makefile.inc	8.3 (Berkeley) 10/24/94
  
  # sys sources
 -.PATH: ${ARCHDIR}/sys ${.CURDIR}/sys
 +.PATH: ${ARCHDIR}/sys ${LIBCSRCDIR}/sys
  
  # other sources shared with the kernel, used in syscalls
  SRCS+=	cpuset.c
 @@ -203,7 +203,7 @@
  SRCS+=		${_GENFILES}
  CLEANFILES+=	${_GENFILES}
  
 -ASMDEPS=	${.CURDIR}/sys/Makefile.inc ${ARCHDIR}/SYS.h \
 +ASMDEPS=	${LIBCSRCDIR}/sys/Makefile.inc ${ARCHDIR}/SYS.h \
  		${DESTDIR}/usr/include/sys/syscall.h
  
  _LINTASM=	${ASM:Nsa_*.S} ${WEAKASM:Nsa_*.S}
 Index: termios/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/termios/Makefile.inc,v
 retrieving revision 1.5
 diff -u -r1.5 Makefile.inc
 --- termios/Makefile.inc	25 Oct 2017 06:32:59 -0000	1.5
 +++ termios/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -1,6 +1,6 @@
  #	$NetBSD: Makefile.inc,v 1.5 2017/10/25 06:32:59 kre Exp $
  
 -.PATH:	${.CURDIR}/termios
 +.PATH:	${LIBCSRCDIR}/termios
  
  SRCS+=	cfgetispeed.c cfgetospeed.c cfmakeraw.c cfsetispeed.c cfsetospeed.c \
  	cfsetspeed.c tcdrain.c tcflow.c tcflush.c tcgetattr.c tcgetpgrp.c \
 Index: thread-stub/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/thread-stub/Makefile.inc,v
 retrieving revision 1.4
 diff -u -r1.4 Makefile.inc
 --- thread-stub/Makefile.inc	5 Apr 2013 20:15:42 -0000	1.4
 +++ thread-stub/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -3,6 +3,6 @@
  .include <bsd.own.mk>
  
  # Our sources
 -.PATH: ${.CURDIR}/thread-stub
 +.PATH: ${LIBCSRCDIR}/thread-stub
  
  SRCS+=	__isthreaded.c thread-stub.c thread-stub-init.c
 Index: time/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/time/Makefile.inc,v
 retrieving revision 1.25
 diff -u -r1.25 Makefile.inc
 --- time/Makefile.inc	6 Apr 2025 16:17:30 -0000	1.25
 +++ time/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -1,6 +1,6 @@
  #	$NetBSD: Makefile.inc,v 1.25 2025/04/06 16:17:30 christos Exp $
  
 -.PATH: ${.CURDIR}/time
 +.PATH: ${LIBCSRCDIR}/time
  
  SRCS+=	asctime.c difftime.c localtime.c getdate.c strftime.c strptime.c
  MAN+=	ctime.3 getdate.3 offtime.3 strftime.3 strptime.3		\
 Index: uuid/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/uuid/Makefile.inc,v
 retrieving revision 1.1
 diff -u -r1.1 Makefile.inc
 --- uuid/Makefile.inc	13 Sep 2004 21:44:54 -0000	1.1
 +++ uuid/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -2,7 +2,7 @@
  
  # DCE 1.1 compatible UUID implementation sources
  
 -.PATH: ${.CURDIR}/uuid
 +.PATH: ${LIBCSRCDIR}/uuid
  
  SRCS+=	uuid_compare.c uuid_create.c uuid_create_nil.c uuid_equal.c \
  	uuid_from_string.c uuid_hash.c uuid_is_nil.c uuid_stream.c \
 Index: yp/Makefile.inc
 ===================================================================
 RCS file: /cvsroot/src/lib/libc/yp/Makefile.inc,v
 retrieving revision 1.15
 diff -u -r1.15 Makefile.inc
 --- yp/Makefile.inc	2 Mar 2012 17:27:49 -0000	1.15
 +++ yp/Makefile.inc	20 Sep 2026 15:59:06 -0000
 @@ -1,7 +1,7 @@
  #	$NetBSD: Makefile.inc,v 1.15 2012/03/02 17:27:49 christos Exp $
  
  # yp sources
 -.PATH: ${ARCHDIR}/yp ${.CURDIR}/yp
 +.PATH: ${ARCHDIR}/yp ${LIBCSRCDIR}/yp
  
  SRCS+=	xdryp.c yp_all.c yp_first.c yp_maplist.c yp_master.c yp_match.c \
  	yp_order.c yplib.c yperr_string.c ypprot_err.c
 
 --jhAut859rLYmUTy6--
Prev by Date: PR/60669 CVS commit: src/sys/netipsec
Next by Date: PR/60744 CVS commit: src/tests/lib/libc/string
Previous by Thread: install/60741: strings in installation binaries cause bloat
Next by Thread: PR/60729 CVS commit: src/sys/rump/librump/rumpkern
Indexes:
Home | Main Index | Thread Index | Old Index