Mon May 9 07:48:57 2011 UTC ()
Closes PR pkg/44501.
Pass pkgsrc's MACHINE_ARCH to bmake's configure script. Oked by wiz@


(cheusov)
diff -r1.53 -r1.54 pkgsrc/devel/bmake/Makefile
cvs diff -r1.53 -r1.54 pkgsrc/devel/bmake/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/bmake/Makefile 2010/09/10 02:42:59 1.53
+++ pkgsrc/devel/bmake/Makefile 2011/05/09 07:48:57 1.54
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.53 2010/09/10 02:42:59 obache Exp $ 1# $NetBSD: Makefile,v 1.54 2011/05/09 07:48:57 cheusov Exp $
2# 2#
3 3
4DISTNAME= bmake-20100808 4DISTNAME= bmake-20100808
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,26 +30,29 @@ INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 @@ -30,26 +30,29 @@ INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
30BOOTSTRAP_ARGS= -q -o ${OPSYS} --prefix=${PREFIX} \ 30BOOTSTRAP_ARGS= -q -o ${OPSYS} --prefix=${PREFIX} \
31 --with-default-sys-path=${makesyspath} \ 31 --with-default-sys-path=${makesyspath} \
32 --mksrc none --sysconfdir=${PKG_SYSCONFDIR:Q} 32 --mksrc none --sysconfdir=${PKG_SYSCONFDIR:Q}
33 33
34.include "../../mk/bsd.prefs.mk" 34.include "../../mk/bsd.prefs.mk"
35 35
36.if ${OPSYS} == "SunOS" || ${OPSYS} == "OSF1" 36.if ${OPSYS} == "SunOS" || ${OPSYS} == "OSF1"
37DEPENDS+= pdksh-[0-9]*:../../shells/pdksh 37DEPENDS+= pdksh-[0-9]*:../../shells/pdksh
38BOOTSTRAP_ARGS+= --with-defshell=${PREFIX}/bin/pdksh 38BOOTSTRAP_ARGS+= --with-defshell=${PREFIX}/bin/pdksh
39.endif 39.endif
40.if ${OPSYS} == "Interix" 40.if ${OPSYS} == "Interix"
41MAKE_ENV+= XDEFS=-DUSE_SELECT 41MAKE_ENV+= XDEFS=-DUSE_SELECT
42.endif 42.endif
 43.if ${OPSYS} == "IRIX"
 44BOOTSTRAP_ARGS+= --with-machine_arch=${MACHINE_ARCH}
 45.endif
43 46
44do-extract: 47do-extract:
45 ${CP} -R ${FILESDIR} ${WRKSRC} 48 ${CP} -R ${FILESDIR} ${WRKSRC}
46 49
47do-configure: 50do-configure:
48 51
49do-build: 52do-build:
50 cd ${WRKDIR} && \ 53 cd ${WRKDIR} && \
51 ${SETENV} ${MAKE_ENV} ${SH} ./bmake/boot-strap ${BOOTSTRAP_ARGS} 54 ${SETENV} ${MAKE_ENV} ${SH} ./bmake/boot-strap ${BOOTSTRAP_ARGS}
52 55
53do-install: 56do-install:
54 ${INSTALL_PROGRAM} ${WRKDIR}/${OPSYS}/bmake ${DESTDIR}${PREFIX}/bin 57 ${INSTALL_PROGRAM} ${WRKDIR}/${OPSYS}/bmake ${DESTDIR}${PREFIX}/bin
55 ${INSTALL_MAN} ${WRKSRC}/bmake.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 58 ${INSTALL_MAN} ${WRKSRC}/bmake.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1