From 1acb7bf767df95a3a54276241e243bd5ed0900b7 Mon Sep 17 00:00:00 2001 From: jtb Date: Sun, 10 Dec 2000 12:20:47 +0000 Subject: A couple of files should not have been imported. While were at it, add extra directories to the includes path for the benchmarks. --- lang/stalin/Makefile | 7 +++++-- lang/stalin/files/Makefile | 27 --------------------------- lang/stalin/files/patch-sum | 16 ++++++++-------- lang/stalin/files/stalin | 7 ------- lang/stalin/patches/patch-ae | 4 ++-- lang/stalin/patches/patch-ag | 4 ++-- lang/stalin/patches/patch-ah | 4 ++-- lang/stalin/patches/patch-ai | 4 ++-- lang/stalin/patches/patch-aj | 4 ++-- lang/stalin/patches/patch-ak | 4 ++-- lang/stalin/patches/patch-al | 4 ++-- 11 files changed, 27 insertions(+), 58 deletions(-) delete mode 100644 lang/stalin/files/Makefile delete mode 100755 lang/stalin/files/stalin (limited to 'lang/stalin') diff --git a/lang/stalin/Makefile b/lang/stalin/Makefile index 8febd142324..e66d6d4c516 100644 --- a/lang/stalin/Makefile +++ b/lang/stalin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2000/12/10 11:07:31 jtb Exp $ +# $NetBSD: Makefile,v 1.2 2000/12/10 12:20:47 jtb Exp $ DISTNAME= stalin PKGNAME= stalin-0.8 @@ -21,6 +21,8 @@ ALL_TARGET= all-alpha ALL_TARGET= all-32 .endif +STALIN="${PREFIX}/bin/stalin -I ${PREFIX}/lib/stalin -I ${PREFIX}/include -I ${PREFIX}/lib -I ${GC_PREFIX}/include -I ${GC_PREFIX}/lib" + post-patch: @${RM} -f ${WRKSRC}/benchmarks/*.orig @for i in stalin.sc stalin-32.c stalin-alpha.c stalin.1 \ @@ -32,7 +34,8 @@ post-patch: ${SED} -e 's:%%PREFIX%%:'${PREFIX}':g' \ -e 's:%%GC_PREFIX%%:'${GC_PREFIX}':g' \ -e 's:%%MESA_PREFIX%%:'${MESA_PREFIX}':g' \ - -e 's:%%X11BASE%%:'${X11BASE}':g' < ${WRKSRC}/$$i > \ + -e 's:%%X11BASE%%:'${X11BASE}':g' \ + -e 's:%%STALIN%%:'${STALIN}':g' < ${WRKSRC}/$$i > \ ${WRKSRC}/$$i.tmp && ${MV} -f ${WRKSRC}/$$i.tmp ${WRKSRC}/$$i ; done do-install: diff --git a/lang/stalin/files/Makefile b/lang/stalin/files/Makefile deleted file mode 100644 index 17eefd3080b..00000000000 --- a/lang/stalin/files/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -CFLAGS = -O2 -fomit-frame-pointer -freg-struct-return -INCLUDES= -I${GC_PREFIX}/include -I${X11BASE}/include -I${MESA_PREFIX}/include -LDFLAGS = -L${GC_PREFIX}/lib -L${X11BASE}/lib -L${MESA_PREFIX}/lib -LIBS = -lgc -lm - -all-32: stalin-32 libstalin.a - -all-alpha: stalin-alpha libstalin.a - -OPTIONS = -I ./include -On -du -dI -t -c -db \ - -clone-size-limit 0 -split-even-if-no-widening \ - -do-not-align-strings \ - -treat-all-symbols-as-external \ - -do-not-index-constant-structure-types-by-expression \ - -do-not-index-allocated-structure-types-by-expression - -stalin-32: stalin-32.o - $(CC) -O -o stalin stalin-32.o $(LDFLAGS) $(LIBS) - -LIBOBJS = xlib-c.o gl-c.o - -libstalin.a: include/xlib-c.o include/gl-c.o - $(AR) cru $@ $(LIBOBJS) - $(RANLIB) $@ - -.c.o: - $(CC) $(CFLAGS) $(INCLUDES) -c $< diff --git a/lang/stalin/files/patch-sum b/lang/stalin/files/patch-sum index 055127b11d0..e36fab791fe 100644 --- a/lang/stalin/files/patch-sum +++ b/lang/stalin/files/patch-sum @@ -1,14 +1,14 @@ -$NetBSD: patch-sum,v 1.1.1.1 2000/12/10 11:07:34 jtb Exp $ +$NetBSD: patch-sum,v 1.2 2000/12/10 12:20:48 jtb Exp $ MD5 (patch-aa) = a32b936cbdf5d43b488c02a94f03adbb MD5 (patch-ab) = 91dd8e6d4cdd7981b94ea08b4856a673 MD5 (patch-ac) = a9c31188a607592daaf4070e0a5a3d3d MD5 (patch-ad) = da3af68b63d7c2a85e47f8d8cb8e9969 -MD5 (patch-ae) = 07a16223fb22c3647db3cbc98c9538c3 +MD5 (patch-ae) = 6567f7bdb71f21e862fadabf45aaeebe MD5 (patch-af) = 711362fb6f2adf9f7267488e7b0a5e30 -MD5 (patch-ag) = 1af76f94b19487b30a0d847a37ee88b3 -MD5 (patch-ah) = 7131bab44493cdb49b022c5f82f9dce7 -MD5 (patch-ai) = c8e7597b7dc94cd19d38445f43e3db6b -MD5 (patch-aj) = d2aa8699c2254197b351db892555f536 -MD5 (patch-ak) = 445193121e454d4aa35386fc62eb05c9 -MD5 (patch-al) = 788a9753d294900772ecc3b968e00636 +MD5 (patch-ag) = 83d57490e738a24b56d3d47c9a803f25 +MD5 (patch-ah) = 21d9b16e8420e383ea131891ba79164b +MD5 (patch-ai) = d4a306b0e878c09e06866358ba5be0c8 +MD5 (patch-aj) = eae4c928bd48b61368685446b62bf823 +MD5 (patch-ak) = b395bee6e823cc29359208e5d573c4cf +MD5 (patch-al) = d88b83585111f55675e32c1fa6387265 diff --git a/lang/stalin/files/stalin b/lang/stalin/files/stalin deleted file mode 100755 index 90cf7a50090..00000000000 --- a/lang/stalin/files/stalin +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -STALIN_INCLUDES ="-I %%PREFIX%%/lib/stalin -I %%PREFIX%%/include -I %%GC_PREFIX%%/include -I %%GC_PREFIX%%/lib -I%%MESA_PREFIX%%" - -STALIN_OPTIONS="-Ob -Om -On -Or -Ot -d -du -dI -k -copt -O2 -copt -fomit-frame-pointer -copt -freg-struct-return" - -exec %%PREFIX%%/libexec/stalin/stalin $STALIN_INCLUDES $STALIN_OPTIONS $@ diff --git a/lang/stalin/patches/patch-ae b/lang/stalin/patches/patch-ae index 8e9a2897f03..65ffef7d1eb 100644 --- a/lang/stalin/patches/patch-ae +++ b/lang/stalin/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.1.1.1 2000/12/10 11:07:35 jtb Exp $ +$NetBSD: patch-ae,v 1.2 2000/12/10 12:20:48 jtb Exp $ --- /dev/null Sun Dec 10 09:45:42 2000 +++ stalinc @@ -0,0 +1,3 @@ +#!/bin/sh + -+exec %%PREFIX%%/bin/stalin -I %%PREFIX%%/lib/stalin -I %%PREFIX%%/include -I %%PREFIX%%/lib -I %%GC_PREFIX%%/include -I %%GC_PREFIX%%/lib -I %%X11BASE%%/lib -I %%X11BASE%%/include -I %%MESA_PREFIX%%/lib -I %%MESA_PREFIX%%/include -Ob -Om -On -Or -Ot -d -d1 -du -dI -k -copt -O2 -copt -fomit-frame-pointer -copt -freg-struct-return $@ ++exec %%PREFIX%%/bin/stalin -I %%PREFIX%%/lib/stalin -I %%PREFIX%%/include -I %%PREFIX%%/lib -I %%GC_PREFIX%%/include -I %%GC_PREFIX%%/lib -Ob -Om -On -Or -Ot -d -d1 -du -dI -k -copt -O2 -copt -fomit-frame-pointer -copt -freg-struct-return $@ diff --git a/lang/stalin/patches/patch-ag b/lang/stalin/patches/patch-ag index cd9cb4efec7..cef2650c897 100644 --- a/lang/stalin/patches/patch-ag +++ b/lang/stalin/patches/patch-ag @@ -1,4 +1,4 @@ -$NetBSD: patch-ag,v 1.1.1.1 2000/12/10 11:07:35 jtb Exp $ +$NetBSD: patch-ag,v 1.2 2000/12/10 12:20:48 jtb Exp $ --- benchmarks/benchmark.orig Wed May 19 15:50:11 1999 +++ benchmarks/benchmark @@ -6,7 +6,7 @@ $NetBSD: patch-ag,v 1.1.1.1 2000/12/10 11:07:35 jtb Exp $ #!/bin/sh gcc -o unbuff unbuff.c -../stalin -q -On -db benchmarks-to-latex -+%%PREFIX%%/bin/stalin -q -On -db benchmarks-to-latex ++%%STALIN%% -q -On -db benchmarks-to-latex ./compile-benchmarks ./run-benchmarks ./benchmarks-to-latex diff --git a/lang/stalin/patches/patch-ah b/lang/stalin/patches/patch-ah index 3f4ed5684b5..3ae8b3e9169 100644 --- a/lang/stalin/patches/patch-ah +++ b/lang/stalin/patches/patch-ah @@ -1,4 +1,4 @@ -$NetBSD: patch-ah,v 1.1.1.1 2000/12/10 11:07:35 jtb Exp $ +$NetBSD: patch-ah,v 1.2 2000/12/10 12:20:48 jtb Exp $ --- benchmarks/compile-and-run-stalin-benchmark.orig Mon Apr 26 20:40:00 1999 +++ benchmarks/compile-and-run-stalin-benchmark @@ -7,6 +7,6 @@ $NetBSD: patch-ah,v 1.1.1.1 2000/12/10 11:07:35 jtb Exp $ echo compile $1 sed -f stalin.sed $1.sc >$1-stalin.sc -time ../stalin $o $2 $1-stalin -+time %%PREFIX%%/bin/stalin $o $2 $1-stalin ++time %%STALIN%% $o $2 $1-stalin echo run $1 time ./$1-stalin >/dev/null diff --git a/lang/stalin/patches/patch-ai b/lang/stalin/patches/patch-ai index 8f6813a2a1d..6f78cfe11f5 100644 --- a/lang/stalin/patches/patch-ai +++ b/lang/stalin/patches/patch-ai @@ -1,4 +1,4 @@ -$NetBSD: patch-ai,v 1.1.1.1 2000/12/10 11:07:35 jtb Exp $ +$NetBSD: patch-ai,v 1.2 2000/12/10 12:20:48 jtb Exp $ --- benchmarks/compile-stalin-benchmark.orig Mon Apr 26 20:40:11 1999 +++ benchmarks/compile-stalin-benchmark @@ -7,4 +7,4 @@ $NetBSD: patch-ai,v 1.1.1.1 2000/12/10 11:07:35 jtb Exp $ echo compile $1 sed -f stalin.sed $1.sc >$1-stalin.sc -time ../stalin $o $2 $1-stalin -+time %%PREFIX%%/bin/stalin $o $2 $1-stalin ++time %%STALIN%% $o $2 $1-stalin diff --git a/lang/stalin/patches/patch-aj b/lang/stalin/patches/patch-aj index cfc8ab596f2..8ee5b8d3ce7 100644 --- a/lang/stalin/patches/patch-aj +++ b/lang/stalin/patches/patch-aj @@ -1,4 +1,4 @@ -$NetBSD: patch-aj,v 1.1.1.1 2000/12/10 11:07:35 jtb Exp $ +$NetBSD: patch-aj,v 1.2 2000/12/10 12:20:48 jtb Exp $ --- benchmarks/make-define-application-example.orig Mon Apr 26 20:40:26 1999 +++ benchmarks/make-define-application-example @@ -7,7 +7,7 @@ $NetBSD: patch-aj,v 1.1.1.1 2000/12/10 11:07:35 jtb Exp $ ulimit -s unlimited ulimit -c 0 -../stalin -d0 -d1 -d5 -d6 -On -du -dI -q -no-escaping-continuations\ -+%%PREFIX%%/bin/stalin -d0 -d1 -d5 -d6 -On -du -dI -q \ ++%%STALIN%% -d0 -d1 -d5 -d6 -On -du -dI -q \ + -no-escaping-continuations \ -copt -O2 -copt -fomit-frame-pointer -copt -Wall -copt -freg-struct-return\ - -copt -L/usr/X11/lib -copt -lX11\ diff --git a/lang/stalin/patches/patch-ak b/lang/stalin/patches/patch-ak index 1a9ed3078d1..f663acada26 100644 --- a/lang/stalin/patches/patch-ak +++ b/lang/stalin/patches/patch-ak @@ -1,4 +1,4 @@ -$NetBSD: patch-ak,v 1.1.1.1 2000/12/10 11:07:35 jtb Exp $ +$NetBSD: patch-ak,v 1.2 2000/12/10 12:20:48 jtb Exp $ --- benchmarks/make-hello.orig Sun Dec 10 10:21:03 2000 +++ benchmarks/make-hello @@ -7,6 +7,6 @@ $NetBSD: patch-ak,v 1.1.1.1 2000/12/10 11:07:35 jtb Exp $ ulimit -s unlimited ulimit -c 0 -../stalin -d0 -d1 -d5 -d6 -On -du -dI\ -+%%PREFIX%%/bin/stalin -d0 -d1 -d5 -d6 -On -du -dI\ ++%%STALIN%% -d0 -d1 -d5 -d6 -On -du -dI\ -copt -O2 -copt -fomit-frame-pointer -copt -Wall -copt -freg-struct-return\ hello diff --git a/lang/stalin/patches/patch-al b/lang/stalin/patches/patch-al index 990fd1d14c9..7c7221012d9 100644 --- a/lang/stalin/patches/patch-al +++ b/lang/stalin/patches/patch-al @@ -1,4 +1,4 @@ -$NetBSD: patch-al,v 1.1.1.1 2000/12/10 11:07:35 jtb Exp $ +$NetBSD: patch-al,v 1.2 2000/12/10 12:20:48 jtb Exp $ --- benchmarks/make-xhello.orig Sun Dec 10 10:21:10 2000 +++ benchmarks/make-xhello @@ -7,7 +7,7 @@ $NetBSD: patch-al,v 1.1.1.1 2000/12/10 11:07:35 jtb Exp $ ulimit -s unlimited ulimit -c 0 -../stalin -d0 -d1 -d5 -d6 -On -du -dI\ -+%%PREFIX%%/bin/stalin -d0 -d1 -d5 -d6 -On -du -dI\ ++%%STALIN%% -d0 -d1 -d5 -d6 -On -du -dI\ -copt -O2 -copt -fomit-frame-pointer -copt -Wall -copt -freg-struct-return\ - -copt -L/usr/X11/lib -copt -lX11\ + -copt -L%%X11BASE%%/lib -copt -lX11\ -- cgit v1.2.3