kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Sync 32-on-64 hacks from main smlnj package.

Browse source
This commit is contained in:
dholland 2016-07-03 19:00:24 +00:00
parent 49a45044dc
commit d7a4da3526
3 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lang/smlnj11072/Makefile.common
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile.common,v 1.3 2016/07/03 18:23:35 dholland Exp $
# $NetBSD: Makefile.common,v 1.4 2016/07/03 19:00:24 dholland Exp $
#
# used by lang/smlnj/Makefile
@ -19,8 +19,8 @@ BROKEN_ON_PLATFORM+= FreeBSD-*-sparc FreeBSD-*-powerpc
BROKEN_ON_PLATFORM+= Linux-*-sparc Linux-*-powerpc
BROKEN_ON_PLATFORM+= SunOS-*-i386 SunOS-*-powerpc
# there are 32-on-64 hacks for amd64 on linux
ONLY_FOR_PLATFORM+= Linux-*-x86_64
# there are 32-on-64 hacks for amd64 on linux and netbsd
ONLY_FOR_PLATFORM+= Linux-*-x86_64 NetBSD-*-x86_64
.include "../../mk/bsd.prefs.mk"
@ -35,7 +35,7 @@ OS= ${LOWER_OPSYS}
PLIST_VARS+= nlffi # not available on all platforms
.if ${MACHINE_ARCH} == "i386"
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
BOX= x86
PLIST.nlffi= yes
.elif ${MACHINE_ARCH} == "powerpc"

4
lang/smlnj11072/distinfo
View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.3 2016/07/03 18:52:32 dholland Exp $
$NetBSD: distinfo,v 1.4 2016/07/03 19:00:24 dholland Exp $
SHA1 (smlnj-110.72/MLRISC.tgz) = 9bb9eb169337533304c2e0e4eb9af263d38c398a
RMD160 (smlnj-110.72/MLRISC.tgz) = 484512df036421e216d4afed01beb978d33e16bb
@ -83,7 +83,7 @@ SHA1 (patch-base_runtime_gc_init-gc.c) = f40e961089beab151290ffc8371a48bc9f84651
SHA1 (patch-base_runtime_kernel_unix-timers.c) = 42f1d2964d5de37fdc232139f74fb9a95f21da07
SHA1 (patch-base_runtime_mach-dep_unix-prof.c) = 1f28a05cfb271c569cfb9778e67076bbfb14d646
SHA1 (patch-base_runtime_objs_mk.x86-netbsd) = 7d716c17c0f6a29acca7b630a1526df4d58e18cf
SHA1 (patch-config___arch-n-opsys) = f6c30285f55a9537a785d363837ecc83cfd384b7
SHA1 (patch-config___arch-n-opsys) = 7035758667350aa9558a14e28245d022e43369ea
SHA1 (patch-src_runtime_gc_gc-stats.h) = af61db9d1f04e566d4c5c2bc5dcf4c6958f0ea78
SHA1 (patch-src_runtime_gc_init-gc.c) = 5d1d5a13a51d732590dd4f375824bbc389a0525d
SHA1 (patch-src_runtime_kernel_unix-timers.c) = 1c1db5bce0ec1e72adafb9380027884cf746c75c

15
lang/smlnj11072/patches/patch-config___arch-n-opsys
View file

@ -1,8 +1,12 @@
$NetBSD: patch-config___arch-n-opsys,v 1.1 2016/07/03 18:49:02 dholland Exp $
$NetBSD: patch-config___arch-n-opsys,v 1.2 2016/07/03 19:00:25 dholland Exp $
--- config/_arch-n-opsys.orig 2008-08-13 22:37:59.000000000 +0400
+++ config/_arch-n-opsys 2009-01-27 17:24:34.000000000 +0300
@@ -118,13 +118,15 @@
Fix version reporting.
Learn about x86_64.
Support ppc and sparc on NetBSD.
--- config/_arch-n-opsys.dist 2016-07-03 18:45:43.000000000 +0000
+++ config/_arch-n-opsys
@@ -119,13 +119,15 @@ case `uname -s` in
;;
NetBSD)
case `uname -r` in
@ -15,8 +19,9 @@ $NetBSD: patch-config___arch-n-opsys,v 1.1 2016/07/03 18:49:02 dholland Exp $
esac
HEAP_OPSYS=bsd
- case `uname -m` in
- *86) ARCH=x86;;
+ case `uname -p` in
*86) ARCH=x86;;
+ *86|x86_64) ARCH=x86;;
+ powerpc) ARCH=ppc;;
+ sparc) ARCH=sparc;;
*) exit 1;;