pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang Store brand new configs in ${FILESDIR}, not as pa...
details: https://anonhg.NetBSD.org/pkgsrc/rev/dd90417c6262
branches: trunk
changeset: 349321:dd90417c6262
user: dholland <dholland%pkgsrc.org@localhost>
date: Sun Jul 03 19:26:35 2016 +0000
description:
Store brand new configs in ${FILESDIR}, not as patches.
diffstat:
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 -------------------------------
lang/smlnj11072/Makefile | 4 +++-
lang/smlnj11072/distinfo | 4 +---
lang/smlnj11072/files/mk.ppc-netbsd | 25 +++++++++++++++++++++++++
lang/smlnj11072/files/mk.sparc-netbsd | 25 +++++++++++++++++++++++++
lang/smlnj11072/patches/patch-ab | 31 -------------------------------
lang/smlnj11072/patches/patch-ag | 31 -------------------------------
12 files changed, 108 insertions(+), 132 deletions(-)
diffs (truncated from 338 to 300 lines):
diff -r 95496ec11404 -r dd90417c6262 lang/smlnj/Makefile
--- a/lang/smlnj/Makefile Sun Jul 03 19:25:16 2016 +0000
+++ b/lang/smlnj/Makefile Sun Jul 03 19:26:35 2016 +0000
@@ -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 @@
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 -r 95496ec11404 -r dd90417c6262 lang/smlnj/distinfo
--- a/lang/smlnj/distinfo Sun Jul 03 19:25:16 2016 +0000
+++ b/lang/smlnj/distinfo Sun Jul 03 19:26:35 2016 +0000
@@ -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 @@
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 -r 95496ec11404 -r dd90417c6262 lang/smlnj/files/mk.ppc-netbsd
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/smlnj/files/mk.ppc-netbsd Sun Jul 03 19:26:35 2016 +0000
@@ -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 -r 95496ec11404 -r dd90417c6262 lang/smlnj/files/mk.sparc-netbsd
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/smlnj/files/mk.sparc-netbsd Sun Jul 03 19:26:35 2016 +0000
@@ -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 -r 95496ec11404 -r dd90417c6262 lang/smlnj/patches/patch-ab
--- a/lang/smlnj/patches/patch-ab Sun Jul 03 19:25:16 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 95496ec11404 -r dd90417c6262 lang/smlnj/patches/patch-ag
--- a/lang/smlnj/patches/patch-ag Sun Jul 03 19:25:16 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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))
diff -r 95496ec11404 -r dd90417c6262 lang/smlnj11072/Makefile
--- a/lang/smlnj11072/Makefile Sun Jul 03 19:25:16 2016 +0000
+++ b/lang/smlnj11072/Makefile Sun Jul 03 19:26:35 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2016/07/03 19:21:44 dholland Exp $
+# $NetBSD: Makefile,v 1.8 2016/07/03 19:26:35 dholland Exp $
#
DISTNAME= boot.${BOX}-unix
@@ -78,8 +78,10 @@
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 -r 95496ec11404 -r dd90417c6262 lang/smlnj11072/distinfo
--- a/lang/smlnj11072/distinfo Sun Jul 03 19:25:16 2016 +0000
+++ b/lang/smlnj11072/distinfo Sun Jul 03 19:26:35 2016 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2016/07/03 19:18:47 dholland Exp $
+$NetBSD: distinfo,v 1.7 2016/07/03 19:26:35 dholland Exp $
SHA1 (smlnj-110.72/MLRISC.tgz) = 9bb9eb169337533304c2e0e4eb9af263d38c398a
RMD160 (smlnj-110.72/MLRISC.tgz) = 484512df036421e216d4afed01beb978d33e16bb
@@ -61,11 +61,9 @@
RMD160 (smlnj-110.72/trace-debug-profile.tgz) = 6c85734aefd0672a645497550dacf56f503dd726
Size (smlnj-110.72/trace-debug-profile.tgz) = 3905 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 -r 95496ec11404 -r dd90417c6262 lang/smlnj11072/files/mk.ppc-netbsd
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/smlnj11072/files/mk.ppc-netbsd Sun Jul 03 19:26:35 2016 +0000
@@ -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 -r 95496ec11404 -r dd90417c6262 lang/smlnj11072/files/mk.sparc-netbsd
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/smlnj11072/files/mk.sparc-netbsd Sun Jul 03 19:26:35 2016 +0000
@@ -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 -r 95496ec11404 -r dd90417c6262 lang/smlnj11072/patches/patch-ab
--- a/lang/smlnj11072/patches/patch-ab Sun Jul 03 19:25:16 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2016/07/03 18:33:36 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
Home |
Main Index |
Thread Index |
Old Index