From bfb8fc0807ba567486c962755d755f92ebf2990b Mon Sep 17 00:00:00 2001 From: dholland Date: Sun, 3 Jul 2016 19:26:35 +0000 Subject: Store brand new configs in ${FILESDIR}, not as patches. --- lang/smlnj/Makefile | 4 +++- lang/smlnj/distinfo | 4 +--- lang/smlnj/files/mk.ppc-netbsd | 25 +++++++++++++++++++++++++ lang/smlnj/files/mk.sparc-netbsd | 25 +++++++++++++++++++++++++ lang/smlnj/patches/patch-ab | 31 ------------------------------- lang/smlnj/patches/patch-ag | 31 ------------------------------- 6 files changed, 54 insertions(+), 66 deletions(-) create mode 100644 lang/smlnj/files/mk.ppc-netbsd create mode 100644 lang/smlnj/files/mk.sparc-netbsd delete mode 100644 lang/smlnj/patches/patch-ab delete mode 100644 lang/smlnj/patches/patch-ag (limited to 'lang/smlnj') diff --git a/lang/smlnj/Makefile b/lang/smlnj/Makefile index b9d9a277884..9397f6d1d97 100644 --- a/lang/smlnj/Makefile +++ b/lang/smlnj/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2016/07/03 19:21:44 dholland Exp $ +# $NetBSD: Makefile,v 1.32 2016/07/03 19:26:35 dholland Exp $ # DISTNAME= boot.${BOX}-unix @@ -79,8 +79,10 @@ do-extract: cd ${WRKDIR}/src; ${EXTRACT_CMD} # symlink the rest of the distfiles +# also copy in new configs post-extract: cd ${WRKDIR} && ${LN} -sf ${_DISTDIR}/* . + cp ${FILESDIR}/mk.* ${WRKDIR}/src/runtime/objs/ # make the necessary copy of the runtime, _after_ patching src post-patch: diff --git a/lang/smlnj/distinfo b/lang/smlnj/distinfo index f0650c112c8..246992d12ad 100644 --- a/lang/smlnj/distinfo +++ b/lang/smlnj/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.21 2016/07/03 19:18:46 dholland Exp $ +$NetBSD: distinfo,v 1.22 2016/07/03 19:26:35 dholland Exp $ SHA1 (smlnj-110.73/MLRISC.tgz) = 59a38a4a1c63cecf97764a99577b3f929b5ccbc9 RMD160 (smlnj-110.73/MLRISC.tgz) = dd951776482f37421a17701d67c051741691c6cb @@ -81,11 +81,9 @@ RMD160 (smlnj-110.73/trace-debug-profile.tgz) = e6cdae53b060c85782424d792bdf4673 SHA512 (smlnj-110.73/trace-debug-profile.tgz) = f806a36a2d9d500af0975f8d2ebb38b8189fc9732f3163ad3bc3c7b7fd13cba965ab41754b4e37ef576005b2733b41cf291fb2d4ae5c47ec2a51a751507b911f Size (smlnj-110.73/trace-debug-profile.tgz) = 3899 bytes SHA1 (patch-aa) = f738a6284236158b6b95928768fe1213cc77fc20 -SHA1 (patch-ab) = 2c9a448c8566d87a2d01528cf6e38ed0dfd9328b SHA1 (patch-ad) = 67802bbdf42408c60bbce4087f20d000a3445677 SHA1 (patch-ae) = 0ba98fb2b012daf75dcc4ac416cbf0fd3182114b SHA1 (patch-af) = 3a1c1cadd26eb246adafff823d49b4ab7161793b -SHA1 (patch-ag) = 1dd473bf9b21cd6218945c119fb08230dcd3c4bf SHA1 (patch-ah) = 93d7453dc82d91d29662cc02dd8ab9e8b8987393 SHA1 (patch-ai) = 6a15a5415bd73e6618bc45b9a7eb021543e9cecd SHA1 (patch-aj) = 6318548da4c943c60fe63d41529803ea3fa2c96e diff --git a/lang/smlnj/files/mk.ppc-netbsd b/lang/smlnj/files/mk.ppc-netbsd new file mode 100644 index 00000000000..b0a0420b8cd --- /dev/null +++ b/lang/smlnj/files/mk.ppc-netbsd @@ -0,0 +1,25 @@ +# mk.ppc-netbsd +# $NetBSD: mk.ppc-netbsd,v 1.1 2016/07/03 19:26:35 dholland Exp $ +# + +SHELL = /bin/sh + +MAKE = gmake +GCC = gcc +ARFLAGS = Trcv +CFLAGS = @CFLAGS@ +LDFLAGS= +CPP = $(GCC) -x c -E -P + +#XOBJS = xmonitor.o +#LD_LIBS = -lX11 +#BASE_DEFS = -DHEAP_MONITOR -DPOLL_DEBUG +XOBJS = +XLIBS = +DEFS = $(BASE_DEFS) -DHOST_PPC -DTARGET_PPC -DOPSYS_UNIX -DOPSYS_NETBSD +TARGET = PPC +VERSION = v-ppc-netbsd +RUNTIME = run.ppc-netbsd + +all: + ($(MAKE) RUNTIME="$(RUNTIME)" MAKE="$(MAKE)" VERSION="$(VERSION)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" AS="$(AS)" AR="$(AR)" RANLIB="$(RANLIB)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME)) diff --git a/lang/smlnj/files/mk.sparc-netbsd b/lang/smlnj/files/mk.sparc-netbsd new file mode 100644 index 00000000000..db919de2349 --- /dev/null +++ b/lang/smlnj/files/mk.sparc-netbsd @@ -0,0 +1,25 @@ +# mk.sparc-netbsd +# $NetBSD: mk.sparc-netbsd,v 1.1 2016/07/03 19:26:35 dholland Exp $ +# + +SHELL = /bin/sh + +MAKE = gmake +GCC = gcc +ARFLAGS = Trcv +CFLAGS = @CFLAGS@ +LDFLAGS= +CPP = $(GCC) -x c -E -P + +#XOBJS = xmonitor.o +#LD_LIBS = -lX11 +#BASE_DEFS = -DHEAP_MONITOR -DPOLL_DEBUG +XOBJS = +XLIBS = +DEFS = $(BASE_DEFS) -DHOST_SPARC -DTARGET_SPARC -DOPSYS_UNIX -DOPSYS_NETBSD -DCALLEESAVE=3 -DUNBOXEDFLOAT=1 +TARGET = SPARC +VERSION = v-sparc-netbsd +RUNTIME = run.sparc-netbsd + +all: + ($(MAKE) RUNTIME="$(RUNTIME)" MAKE="$(MAKE)" VERSION="$(VERSION)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" AS="$(AS)" AR="$(AR)" RANLIB="$(RANLIB)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME)) diff --git a/lang/smlnj/patches/patch-ab b/lang/smlnj/patches/patch-ab deleted file mode 100644 index c81706fb847..00000000000 --- a/lang/smlnj/patches/patch-ab +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-ab,v 1.3 2016/04/14 22:04:47 dholland Exp $ - -Support for NetBSD on PPC. - ---- /dev/null -+++ src/runtime/objs/mk.ppc-netbsd -@@ -0,0 +1,24 @@ -+# mk.ppc-netbsd -+# -+ -+SHELL = /bin/sh -+ -+MAKE = gmake -+GCC = gcc -+ARFLAGS = Trcv -+CFLAGS = @CFLAGS@ -+LDFLAGS= -+CPP = $(GCC) -x c -E -P -+ -+#XOBJS = xmonitor.o -+#LD_LIBS = -lX11 -+#BASE_DEFS = -DHEAP_MONITOR -DPOLL_DEBUG -+XOBJS = -+XLIBS = -+DEFS = $(BASE_DEFS) -DHOST_PPC -DTARGET_PPC -DOPSYS_UNIX -DOPSYS_NETBSD -+TARGET = PPC -+VERSION = v-ppc-netbsd -+RUNTIME = run.ppc-netbsd -+ -+all: -+ ($(MAKE) RUNTIME="$(RUNTIME)" MAKE="$(MAKE)" VERSION="$(VERSION)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" AS="$(AS)" AR="$(AR)" RANLIB="$(RANLIB)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME)) diff --git a/lang/smlnj/patches/patch-ag b/lang/smlnj/patches/patch-ag deleted file mode 100644 index 2589ccdc159..00000000000 --- a/lang/smlnj/patches/patch-ag +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-ag,v 1.3 2016/04/14 22:04:47 dholland Exp $ - -Add config for NetBSD on sparc. - ---- src/runtime/objs/mk.sparc-netbsd.orig Thu Sep 19 03:54:01 2002 -+++ src/runtime/objs/mk.sparc-netbsd -@@ -0,0 +1,24 @@ -+# mk.sparc-netbsd -+# -+ -+SHELL = /bin/sh -+ -+MAKE = gmake -+GCC = gcc -+ARFLAGS = Trcv -+CFLAGS = @CFLAGS@ -+LDFLAGS= -+CPP = $(GCC) -x c -E -P -+ -+#XOBJS = xmonitor.o -+#LD_LIBS = -lX11 -+#BASE_DEFS = -DHEAP_MONITOR -DPOLL_DEBUG -+XOBJS = -+XLIBS = -+DEFS = $(BASE_DEFS) -DHOST_SPARC -DTARGET_SPARC -DOPSYS_UNIX -DOPSYS_NETBSD -DCALLEESAVE=3 -DUNBOXEDFLOAT=1 -+TARGET = SPARC -+VERSION = v-sparc-netbsd -+RUNTIME = run.sparc-netbsd -+ -+all: -+ ($(MAKE) RUNTIME="$(RUNTIME)" MAKE="$(MAKE)" VERSION="$(VERSION)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" AS="$(AS)" AR="$(AR)" RANLIB="$(RANLIB)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME)) -- cgit v1.2.3