Subject: Re: Please test bootstrap
To: None <tech-pkg@NetBSD.org>
From: Joerg Sonnenberger <joerg@britannica.bec.de>
List: tech-pkg
Date: 11/06/2005 22:36:08
--5vNYLRcllDrimb99
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On Sat, Nov 05, 2005 at 01:24:32PM -0800, Jeremy C. Reed wrote:
> 
> Edit in pkgsrc/bootstrap/bmake/mk/bsd.prog.mk the lines that start with
> ${PROG}:
> to remove the ${LIBC} reference.

What about the attached patch instead? Can the bsd.hostprog.mk be nuked
BTW?

Joerg

--5vNYLRcllDrimb99
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="bmake_mk.diff"

Index: bsd.hostprog.mk
===================================================================
RCS file: /cvsroot/pkgsrc/bootstrap/bmake/mk/bsd.hostprog.mk,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 bsd.hostprog.mk
--- bsd.hostprog.mk	11 Mar 2004 13:04:17 -0000	1.1.1.1
+++ bsd.hostprog.mk	6 Nov 2005 21:05:07 -0000
@@ -18,7 +18,11 @@
 CFLAGS+=	${COPTS}
 
 LIBBZ2?=	/usr/lib/libbz2.a
+.if exists(/usr/lib/libc.a)
 LIBC?=		/usr/lib/libc.a
+.else
+LIBC?=
+.endif
 LIBC_PIC?=	/usr/lib/libc_pic.a
 LIBCDK?=	/usr/lib/libcdk.a
 LIBCOMPAT?=	/usr/lib/libcompat.a
Index: bsd.prog.mk
===================================================================
RCS file: /cvsroot/pkgsrc/bootstrap/bmake/mk/bsd.prog.mk,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 bsd.prog.mk
--- bsd.prog.mk	11 Mar 2004 13:04:17 -0000	1.1.1.1
+++ bsd.prog.mk	6 Nov 2005 21:05:07 -0000
@@ -28,7 +28,11 @@
 .endif
 
 LIBBZ2?=	${DESTDIR}/usr/lib/libbz2.a
+.if exists(${DESTDIR}/usr/lib/libc.a)
 LIBC?=		${DESTDIR}/usr/lib/libc.a
+.else
+LIBC?=
+.endif
 LIBC_PIC?=	${DESTDIR}/usr/lib/libc_pic.a
 LIBCDK?=	${DESTDIR}/usr/lib/libcdk.a
 LIBCOM_ERR?=	${DESTDIR}/usr/lib/libcom_err.a

--5vNYLRcllDrimb99--