diff options
author | dholland <dholland> | 2015-04-22 07:41:38 +0000 |
---|---|---|
committer | dholland <dholland> | 2015-04-22 07:41:38 +0000 |
commit | 51988646bac78c60f93551f5571e77a01bbb5d19 (patch) | |
tree | ad7e2edcde1a5429744ae4941446f2a1dd85fb70 /lang | |
parent | 90c659d3fc094a6c77848dc6d3a0e112fb3d69b3 (diff) | |
download | pkgsrc-51988646bac78c60f93551f5571e77a01bbb5d19.tar.gz |
Preliminary hacks for building this with -m32 on amd64 NetBSD.
I've run into local problems with COMPAT_32 so this only gets a short
distance in before I can't run it any further, but I'm going to commit
anyway as "broken package" > "no package", and with luck I'll get it
sorted out fully before much longer.
Also allow amd64 Linux as the necessary hacks for that seem to already
be in place.
Diffstat (limited to 'lang')
-rw-r--r-- | lang/smlnj/Makefile.common | 5 | ||||
-rw-r--r-- | lang/smlnj/distinfo | 5 | ||||
-rw-r--r-- | lang/smlnj/patches/patch-base_runtime_objs_mk.x86-netbsd | 23 | ||||
-rw-r--r-- | lang/smlnj/patches/patch-config___arch-n-opsys | 13 | ||||
-rw-r--r-- | lang/smlnj/patches/patch-src_runtime_objs_mk.x86-netbsd | 23 |
5 files changed, 67 insertions, 2 deletions
diff --git a/lang/smlnj/Makefile.common b/lang/smlnj/Makefile.common index 78a8deb360c..75ccccdeab7 100644 --- a/lang/smlnj/Makefile.common +++ b/lang/smlnj/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.12 2015/01/05 11:03:22 wiz Exp $ +# $NetBSD: Makefile.common,v 1.13 2015/04/22 07:41:38 dholland Exp $ # # used by lang/smlnj/Makefile @@ -19,6 +19,9 @@ 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 and netbsd +ONLY_FOR_PLATFORM+= Linux-*-x86_64 NetBSD-*-x86_64 + .include "../../mk/bsd.prefs.mk" # Possible values of BOX and OS must be kept in sync with the diff --git a/lang/smlnj/distinfo b/lang/smlnj/distinfo index f74461d3fe2..a4844d41f3c 100644 --- a/lang/smlnj/distinfo +++ b/lang/smlnj/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.14 2012/01/29 20:48:48 asau Exp $ +$NetBSD: distinfo,v 1.15 2015/04/22 07:41:38 dholland Exp $ SHA1 (smlnj-110.73/MLRISC.tgz) = 59a38a4a1c63cecf97764a99577b3f929b5ccbc9 RMD160 (smlnj-110.73/MLRISC.tgz) = dd951776482f37421a17701d67c051741691c6cb @@ -76,3 +76,6 @@ SHA1 (patch-ao) = 1c66024c5949269291cbf6f815baf6162db47d31 SHA1 (patch-ap) = 8e9e28548b4e58de68a11982a355a010ea96aa29 SHA1 (patch-aq) = 7d0734b76d778d7f584d2e70d325fd72e6554b01 SHA1 (patch-at) = 376b67d25ef428377b1686fcd6232628867d6eae +SHA1 (patch-base_runtime_objs_mk.x86-netbsd) = 1e5ca88c65066a07b818af76abc2f9f1bafdc339 +SHA1 (patch-config___arch-n-opsys) = 83b357d78c0762c9b0c295444bfe9e5641aa02e0 +SHA1 (patch-src_runtime_objs_mk.x86-netbsd) = bd29b208b68771ecd1f3c64d896653084c6eb30e diff --git a/lang/smlnj/patches/patch-base_runtime_objs_mk.x86-netbsd b/lang/smlnj/patches/patch-base_runtime_objs_mk.x86-netbsd new file mode 100644 index 00000000000..b2b26db9d1d --- /dev/null +++ b/lang/smlnj/patches/patch-base_runtime_objs_mk.x86-netbsd @@ -0,0 +1,23 @@ +$NetBSD: patch-base_runtime_objs_mk.x86-netbsd,v 1.1 2015/04/22 07:41:38 dholland Exp $ + +--- base/runtime/objs/mk.x86-netbsd.orig 2015-04-22 07:11:37.000000000 +0000 ++++ base/runtime/objs/mk.x86-netbsd +@@ -7,9 +7,10 @@ SHELL = /bin/sh + + MAKE = gmake + ++AS = as --32 + ARFLAGS = Trcv + CC = gcc -ansi +-CFLAGS = -O2 ++CFLAGS = -O2 -m32 + CPP = gcc -x assembler-with-cpp -E -P + #CPP = /usr/bin/cpp -P + +@@ -23,4 +24,5 @@ VERSION = v-x86-netbsd + RUNTIME = run.x86-netbsd + + all: +- ($(MAKE) RUNTIME="$(RUNTIME)" VERSION="$(VERSION)" MAKE="$(MAKE)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME)) ++ echo '************************** schnozzbort ************************' ++ ($(MAKE) RUNTIME="$(RUNTIME)" VERSION="$(VERSION)" MAKE="$(MAKE)" AS="$(AS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME)) diff --git a/lang/smlnj/patches/patch-config___arch-n-opsys b/lang/smlnj/patches/patch-config___arch-n-opsys new file mode 100644 index 00000000000..ead1a8a8736 --- /dev/null +++ b/lang/smlnj/patches/patch-config___arch-n-opsys @@ -0,0 +1,13 @@ +$NetBSD: patch-config___arch-n-opsys,v 1.1 2015/04/22 07:41:38 dholland Exp $ + +--- config/_arch-n-opsys~ 2011-03-22 13:30:14.000000000 +0000 ++++ config/_arch-n-opsys +@@ -126,7 +126,7 @@ case `uname -s` in + esac + HEAP_OPSYS=bsd + case `uname -p` in +- *86) ARCH=x86;; ++ *86|x86_64) ARCH=x86;; + powerpc) ARCH=ppc;; + sparc) ARCH=sparc;; + *) exit 1;; diff --git a/lang/smlnj/patches/patch-src_runtime_objs_mk.x86-netbsd b/lang/smlnj/patches/patch-src_runtime_objs_mk.x86-netbsd new file mode 100644 index 00000000000..61a6979c071 --- /dev/null +++ b/lang/smlnj/patches/patch-src_runtime_objs_mk.x86-netbsd @@ -0,0 +1,23 @@ +$NetBSD: patch-src_runtime_objs_mk.x86-netbsd,v 1.1 2015/04/22 07:41:38 dholland Exp $ + +--- src/runtime/objs/mk.x86-netbsd.orig 2015-04-22 07:11:37.000000000 +0000 ++++ src/runtime/objs/mk.x86-netbsd +@@ -7,9 +7,10 @@ SHELL = /bin/sh + + MAKE = gmake + ++AS = as --32 + ARFLAGS = Trcv + CC = gcc -ansi +-CFLAGS = -O2 ++CFLAGS = -O2 -m32 + CPP = gcc -x assembler-with-cpp -E -P + #CPP = /usr/bin/cpp -P + +@@ -23,4 +24,5 @@ VERSION = v-x86-netbsd + RUNTIME = run.x86-netbsd + + all: +- ($(MAKE) RUNTIME="$(RUNTIME)" VERSION="$(VERSION)" MAKE="$(MAKE)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME)) ++ echo '************************** schnozzbort ************************' ++ ($(MAKE) RUNTIME="$(RUNTIME)" VERSION="$(VERSION)" MAKE="$(MAKE)" AS="$(AS)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME)) |