Thu Jun 18 10:07:35 2020 UTC ()
bmake: Fix match for bootstrap pdksh.

When bmake is built during bootstrap it's using a temporary prefix, so matching
against LOCALBASE doesn't work.


(jperkin)
diff -r1.77 -r1.78 pkgsrc/devel/bmake/Makefile
cvs diff -r1.77 -r1.78 pkgsrc/devel/bmake/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/bmake/Makefile 2020/06/12 16:01:36 1.77
+++ pkgsrc/devel/bmake/Makefile 2020/06/18 10:07:35 1.78
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.77 2020/06/12 16:01:36 jperkin Exp $ 1# $NetBSD: Makefile,v 1.78 2020/06/18 10:07:35 jperkin Exp $
2 2
3DISTNAME= bmake-20200524 3DISTNAME= bmake-20200524
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= devel 5CATEGORIES= devel
6MASTER_SITES= # empty 6MASTER_SITES= # empty
7DISTFILES= # empty 7DISTFILES= # empty
8 8
9# distfile obtained from ftp://ftp.NetBSD.org/pub/NetBSD/misc/sjg/ 9# distfile obtained from ftp://ftp.NetBSD.org/pub/NetBSD/misc/sjg/
10# source is kept in files/ for bootstrap purposes 10# source is kept in files/ for bootstrap purposes
11 11
12MAINTAINER= joerg@NetBSD.org 12MAINTAINER= joerg@NetBSD.org
13HOMEPAGE= http://www.crufty.net/help/sjg/bmake.html 13HOMEPAGE= http://www.crufty.net/help/sjg/bmake.html
14COMMENT= Portable (autoconf) version of NetBSD 'make' utility 14COMMENT= Portable (autoconf) version of NetBSD 'make' utility
@@ -30,27 +30,27 @@ GNU_CONFIGURE= yes @@ -30,27 +30,27 @@ GNU_CONFIGURE= yes
30CONFIGURE_ARGS+= --prefix=${PREFIX} 30CONFIGURE_ARGS+= --prefix=${PREFIX}
31CONFIGURE_ARGS+= --with-default-sys-path=${makesyspath} 31CONFIGURE_ARGS+= --with-default-sys-path=${makesyspath}
32CONFIGURE_ARGS+= --with-machine_arch=${MACHINE_ARCH} 32CONFIGURE_ARGS+= --with-machine_arch=${MACHINE_ARCH}
33CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 33CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
34 34
35.include "../../mk/bsd.prefs.mk" 35.include "../../mk/bsd.prefs.mk"
36 36
37# 37#
38# This section is incomplete, but the general idea is that we should use the 38# This section is incomplete, but the general idea is that we should use the
39# same shell that was selected by bootstrap. 39# same shell that was selected by bootstrap.
40# 40#
41.if ${OPSYS} == "SunOS" && exists(/usr/bin/bash) 41.if ${OPSYS} == "SunOS" && exists(/usr/bin/bash)
42CONFIGURE_ARGS+= --with-defshell=/usr/bin/bash 42CONFIGURE_ARGS+= --with-defshell=/usr/bin/bash
43.elif ${TOOLS_PLATFORM.sh} == "${LOCALBASE}/bin/pdksh" 43.elif ${TOOLS_PLATFORM.sh:M*/bin/pdksh}
44DEPENDS+= pdksh-[0-9]*:../../shells/pdksh 44DEPENDS+= pdksh-[0-9]*:../../shells/pdksh
45CONFIGURE_ARGS+= --with-defshell=${PREFIX}/bin/pdksh 45CONFIGURE_ARGS+= --with-defshell=${PREFIX}/bin/pdksh
46.endif 46.endif
47 47
48MAKE_ENV.Interix+= XDEFS=-DUSE_SELECT 48MAKE_ENV.Interix+= XDEFS=-DUSE_SELECT
49 49
50# Fix bmake not finding files (e.g. .include) on Illumos with 32 bit ABI 50# Fix bmake not finding files (e.g. .include) on Illumos with 32 bit ABI
51CFLAGS.SunOS+= -D_FILE_OFFSET_BITS=64 51CFLAGS.SunOS+= -D_FILE_OFFSET_BITS=64
52 52
53do-extract: 53do-extract:
54 ${CP} -R ${FILESDIR} ${WRKSRC} 54 ${CP} -R ${FILESDIR} ${WRKSRC}
55 55
56do-build: 56do-build: