Sun Jan 4 03:26:34 2015 UTC ()
Systematize 32-on-64 handling.


(dholland)
diff -r1.47 -r1.48 pkgsrc/lang/nhc98/Makefile
cvs diff -r1.47 -r1.48 pkgsrc/lang/nhc98/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/nhc98/Attic/Makefile 2014/03/09 11:59:09 1.47
+++ pkgsrc/lang/nhc98/Attic/Makefile 2015/01/04 03:26:34 1.48
@@ -1,38 +1,43 @@ @@ -1,38 +1,43 @@
1# $NetBSD: Makefile,v 1.47 2014/03/09 11:59:09 roy Exp $ 1# $NetBSD: Makefile,v 1.48 2015/01/04 03:26:34 dholland Exp $
2 2
3DISTNAME= nhc98src-1.22 3DISTNAME= nhc98src-1.22
4PKGNAME= nhc98-1.22 4PKGNAME= nhc98-1.22
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= lang 6CATEGORIES= lang
7MASTER_SITES= http://www.haskell.org/nhc98/ 7MASTER_SITES= http://www.haskell.org/nhc98/
8 8
9MAINTAINER= kristerw@NetBSD.org 9MAINTAINER= kristerw@NetBSD.org
10HOMEPAGE= http://www.haskell.org/nhc98/ 10HOMEPAGE= http://www.haskell.org/nhc98/
11COMMENT= Portable Haskell 98 compiler 11COMMENT= Portable Haskell 98 compiler
12 12
13WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} 13WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
14 14
15MAKE_JOBS_SAFE= no 15MAKE_JOBS_SAFE= no
16HAS_CONFIGURE= yes 16HAS_CONFIGURE= yes
17USE_TOOLS+= gmake 17USE_TOOLS+= gmake
18CONFIGURE_ARGS+= --buildwith=gcc --installdir=${PREFIX} \ 18CONFIGURE_ARGS+= --buildwith=gcc --installdir=${PREFIX} \
19 +docs --docdir=${PREFIX}/share/doc/nhc98 19 +docs --docdir=${PREFIX}/share/doc/nhc98
20 20
21.if (${MACHINE_ARCH} == "alpha") || (${MACHINE_ARCH} == "amd64") || \ 21.include "../../mk/bsd.prefs.mk"
22 (${MACHINE_ARCH} == "sparc64") || (${MACHINE_ARCH} == "x86_64") || \ 22
23 (${MACHINE_ARCH} == "powerpc64") || (defined(ABI) && ${ABI} == "64") 23# These platforms cannot build 32-on-64 binaries.
24# 64-bit platform 24NOT_FOR_PLATFORM+= *-*-alpha
25BUILD_MAKE_FLAGS+= PKGSRC_M32=-m32 25NOT_FOR_PLATFORM+= DragonFly-*-x86_64
26.else 26
27# not a 64-bit platform 27# This package has LP64 issues, so must build as 32-bit binary.
28BUILD_MAKE_FLAGS+= PKGSRC_M32= 28M32=
 29.for P in ${LP64PLATFORMS}
 30.if ${MACHINE_PLATFORM:M${P}}
 31M32= -m32
29.endif 32.endif
 33.endfor
 34BUILD_MAKE_FLAGS+= PKGSRC_M32=${M32}
30 35
31PLIST_SUBST+= HARCH=`${WRKSRC}/script/harch` 36PLIST_SUBST+= HARCH=`${WRKSRC}/script/harch`
32 37
33INCOMPAT_CURSES= NetBSD-1.5*-* NetBSD-1.6[-_.]*-* 38INCOMPAT_CURSES= NetBSD-1.5*-* NetBSD-1.6[-_.]*-*
34INCOMPAT_CURSES+= NetBSD-1.6[A-Z]-* NetBSD-1.6Z[A-K]*-* 39INCOMPAT_CURSES+= NetBSD-1.6[A-Z]-* NetBSD-1.6Z[A-K]*-*
35 40
36.include "../../mk/curses.buildlink3.mk" 41.include "../../mk/curses.buildlink3.mk"
37.include "../../mk/readline.buildlink3.mk" 42.include "../../mk/readline.buildlink3.mk"
38.include "../../mk/bsd.pkg.mk" 43.include "../../mk/bsd.pkg.mk"