Thu Apr 14 21:59:08 2016 UTC ()
Set BOX explicitly for x86_64 instead of accidentally by default.
No actual effect.


(dholland)
diff -r1.13 -r1.14 pkgsrc/lang/smlnj/Makefile.common
cvs diff -r1.13 -r1.14 pkgsrc/lang/smlnj/Makefile.common (expand / switch to unified diff)

--- pkgsrc/lang/smlnj/Makefile.common 2015/04/22 07:41:38 1.13
+++ pkgsrc/lang/smlnj/Makefile.common 2016/04/14 21:59:08 1.14
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.13 2015/04/22 07:41:38 dholland Exp $ 1# $NetBSD: Makefile.common,v 1.14 2016/04/14 21:59:08 dholland Exp $
2# 2#
3# used by lang/smlnj/Makefile 3# used by lang/smlnj/Makefile
4 4
5# smlnj supports i386, hppa, sparc, ppc, mlrisc & alpha 5# smlnj supports i386, hppa, sparc, ppc, mlrisc & alpha
6# but this package only handles i386, ppc, and sparc. 6# but this package only handles i386, ppc, and sparc.
7# Extending this is left as an (easy) exercise for the reader. 7# Extending this is left as an (easy) exercise for the reader.
8ONLY_FOR_PLATFORM+= *-*-alpha *-*-hppa *-*-i386 \ 8ONLY_FOR_PLATFORM+= *-*-alpha *-*-hppa *-*-i386 \
9 *-*-mlrisc *-*-sparc *-*-powerpc 9 *-*-mlrisc *-*-sparc *-*-powerpc
10BROKEN_ON_PLATFORM= *-*-alpha *-*-hppa *-*-mlrisc 10BROKEN_ON_PLATFORM= *-*-alpha *-*-hppa *-*-mlrisc
11 11
12# This package also only supports netbsd, freebsd, linux, and solaris. 12# This package also only supports netbsd, freebsd, linux, and solaris.
13# Making it work on other OSes shouldn't be all that hard. 13# Making it work on other OSes shouldn't be all that hard.
14BROKEN_EXCEPT_ON_PLATFORM+= NetBSD-*-* FreeBSD-*-* Linux-*-* SunOS-*-* 14BROKEN_EXCEPT_ON_PLATFORM+= NetBSD-*-* FreeBSD-*-* Linux-*-* SunOS-*-*
@@ -25,27 +25,27 @@ ONLY_FOR_PLATFORM+= Linux-*-x86_64 NetBS @@ -25,27 +25,27 @@ ONLY_FOR_PLATFORM+= Linux-*-x86_64 NetBS
25.include "../../mk/bsd.prefs.mk" 25.include "../../mk/bsd.prefs.mk"
26 26
27# Possible values of BOX and OS must be kept in sync with the 27# Possible values of BOX and OS must be kept in sync with the
28# currently ported platforms. 28# currently ported platforms.
29 29
30.if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" 30.if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD"
31OS= bsd 31OS= bsd
32.elif ${OPSYS} == "SunOS" || ${OPSYS} == "Linux" 32.elif ${OPSYS} == "SunOS" || ${OPSYS} == "Linux"
33OS= ${LOWER_OPSYS} 33OS= ${LOWER_OPSYS}
34.endif 34.endif
35 35
36PLIST_VARS+= nlffi # not available on all platforms 36PLIST_VARS+= nlffi # not available on all platforms
37 37
38.if ${MACHINE_ARCH} == "i386" 38.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
39BOX= x86 39BOX= x86
40PLIST.nlffi= yes 40PLIST.nlffi= yes
41.elif ${MACHINE_ARCH} == "powerpc" 41.elif ${MACHINE_ARCH} == "powerpc"
42BOX= ppc 42BOX= ppc
43.elif ${MACHINE_ARCH} == "sparc" 43.elif ${MACHINE_ARCH} == "sparc"
44BOX= ${MACHINE_ARCH} 44BOX= ${MACHINE_ARCH}
45PLIST.nlffi= yes 45PLIST.nlffi= yes
46.else 46.else
47# for "make fetch", default to i386 instead of trying to download 47# for "make fetch", default to i386 instead of trying to download
48# a non-existing file 48# a non-existing file
49BOX= x86 49BOX= x86
50PLIST.nlffi= yes 50PLIST.nlffi= yes
51.endif 51.endif