diff options
author | jtb <jtb> | 2001-04-21 01:00:37 +0000 |
---|---|---|
committer | jtb <jtb> | 2001-04-21 01:00:37 +0000 |
commit | 9922d971be90f1b944fa673fab03f970db43f9a8 (patch) | |
tree | 5539ee563f7525a10b4677cd65a9caa578e42b2b /lang | |
parent | b68b9714ef110d2352861f861d2e7651950dc971 (diff) | |
download | pkgsrc-9922d971be90f1b944fa673fab03f970db43f9a8.tar.gz |
Decrease optimization level on non-i386 platforms. General cleanup of
makefiles.
Diffstat (limited to 'lang')
-rw-r--r-- | lang/stalin/Makefile | 53 | ||||
-rw-r--r-- | lang/stalin/distinfo | 6 | ||||
-rw-r--r-- | lang/stalin/patches/patch-aa | 47 | ||||
-rw-r--r-- | lang/stalin/patches/patch-ae | 9 |
4 files changed, 53 insertions, 62 deletions
diff --git a/lang/stalin/Makefile b/lang/stalin/Makefile index c0f80bcda15..27bc2a6077d 100644 --- a/lang/stalin/Makefile +++ b/lang/stalin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2001/04/14 21:43:47 jtb Exp $ +# $NetBSD: Makefile,v 1.7 2001/04/21 01:00:37 jtb Exp $ DISTNAME= stalin PKGNAME= stalin-0.8 @@ -10,31 +10,25 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.neci.nj.nec.com/homepages/qobi/software.html COMMENT= Aggressively optimizing Scheme compiler -DEPENDS+= boehm-gc-[0-9]*:../../devel/boehm-gc -DEPENDS+= Mesa-[0-9]*:../../graphics/Mesa +DEPENDS+= boehm-gc-*:../../devel/boehm-gc -EVAL_PREFIX+= GC_PREFIX=boehm-gc MESA_PREFIX=Mesa +USE_MESA= yes WRKSRC= ${WRKDIR}/${PKGNAME} - -.if (${MACHINE_ARCH} == "alpha") -ALL_TARGET= all-alpha -.else -ALL_TARGET= all-32 -.endif +EVAL_PREFIX+= GC_PREFIX=boehm-gc post-patch: @${RM} -f ${WRKSRC}/benchmarks/*.orig - @for i in stalin.sc stalin-32.c stalin-alpha.c \ - stalinc stalin.1 benchmarks/benchmark \ - benchmarks/compile-and-run-stalin-benchmark \ - benchmarks/compile-stalin-benchmark \ - benchmarks/make-define-application-example \ - benchmarks/make-hello benchmarks/make-xhello; do \ - ${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 > \ - ${WRKSRC}/$$i.tmp && ${MV} ${WRKSRC}/$$i.tmp ${WRKSRC}/$$i ; done + @for i in stalin.sc stalin-32.c stalin-alpha.c stalinc stalin.1 \ + benchmarks/benchmark benchmarks/compile-and-run-stalin-benchmark \ + benchmarks/compile-stalin-benchmark \ + benchmarks/make-define-application-example \ + benchmarks/make-hello benchmarks/make-xhello; do \ + ${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 > \ + ${WRKSRC}/$$i.tmp && ${MV} ${WRKSRC}/$$i.tmp ${WRKSRC}/$$i; \ + done do-install: ${INSTALL_PROGRAM} ${WRKSRC}/stalin ${PREFIX}/bin @@ -43,20 +37,13 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/libstalin.a ${PREFIX}/lib/stalin ${INSTALL_DATA} ${WRKSRC}/gl-c.o ${PREFIX}/lib/stalin ${INSTALL_DATA} ${WRKSRC}/xlib-c.o ${PREFIX}/lib/stalin - @for s in ${WRKSRC}/include/*.sc; do \ - c="${INSTALL_DATA} $$s ${PREFIX}/lib/stalin/"; \ - ${ECHO} $$c; $$c; \ - done + ${INSTALL_DATA} ${WRKSRC}/include/*.sc ${PREFIX}/lib/stalin/ ${INSTALL_MAN} ${WRKSRC}/stalin.1 ${PREFIX}/man/man1 ${INSTALL_DATA_DIR} ${PREFIX}/share/stalin - @for f in ANNOUNCEMENT COPYING README stalin.el ; do \ - c="${INSTALL_DATA} ${WRKSRC}/$$f ${PREFIX}/share/stalin/"; \ - ${ECHO} $$c; $$c; \ - done + cd ${WRKSRC} && ${INSTALL_DATA} ANNOUNCEMENT COPYING README \ + stalin.el ${PREFIX}/share/stalin/ ${INSTALL_DATA_DIR} ${PREFIX}/share/stalin/benchmarks - @for b in ${WRKSRC}/benchmarks/*; do \ - c="${INSTALL_DATA} $$b ${PREFIX}/share/stalin/benchmarks/"; \ - ${ECHO} $$c; $$c; \ - done + ${INSTALL_DATA} ${WRKSRC}/benchmarks/* \ + ${PREFIX}/share/stalin/benchmarks/ \ .include "../../mk/bsd.pkg.mk" diff --git a/lang/stalin/distinfo b/lang/stalin/distinfo index f64f569f6c2..24fc092bfea 100644 --- a/lang/stalin/distinfo +++ b/lang/stalin/distinfo @@ -1,12 +1,12 @@ -$NetBSD: distinfo,v 1.2 2001/04/19 15:00:58 agc Exp $ +$NetBSD: distinfo,v 1.3 2001/04/21 01:00:37 jtb Exp $ SHA1 (stalin.tar.Z) = 357d23f2805403d0d1f1cc4deb1bb8e512b86d04 Size (stalin.tar.Z) = 7738319 bytes -SHA1 (patch-aa) = cf1991353f00728d5db21ea4b83b9dfdb32a2ee6 +SHA1 (patch-aa) = 282408e4670cc1f54c858ea4c70cccf78ef28585 SHA1 (patch-ab) = 1dc86f98e00372235bea8d6764bccfbdca365366 SHA1 (patch-ac) = d9bb97e5053a30379fdc2f3380a10b3fb28bab8a SHA1 (patch-ad) = 1814a187ee014eab7b16d677381f1837eca267dc -SHA1 (patch-ae) = ed14a101d338a2c35dfc57451040bf97fcc222b3 +SHA1 (patch-ae) = 5a759e62981c2d80134a561f3ebd70781df435cf SHA1 (patch-af) = 4c27160466921bb454d0853ee100cb233adcee0c SHA1 (patch-ag) = 17119bd12a9800027d6d50d40f8f91fcb14bec95 SHA1 (patch-ah) = 0d2ed181607c2e0ca63179a7d1f99d5b12da27b5 diff --git a/lang/stalin/patches/patch-aa b/lang/stalin/patches/patch-aa index f3ab4a46ad5..975f54c584e 100644 --- a/lang/stalin/patches/patch-aa +++ b/lang/stalin/patches/patch-aa @@ -1,35 +1,40 @@ -$NetBSD: patch-aa,v 1.2 2001/01/21 02:04:56 jtb Exp $ +$NetBSD: patch-aa,v 1.3 2001/04/21 01:00:38 jtb Exp $ ---- /dev/null Sun Jan 21 00:09:25 2001 +--- /dev/null Sat Apr 21 01:44:52 2001 +++ Makefile -@@ -0,0 +1,30 @@ -+CFLAGS = -O2 -fomit-frame-pointer -freg-struct-return -+CFLAGS_ALPHA= -O2 -fomit-frame-pointer -+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 +@@ -0,0 +1,35 @@ ++.if (${MACHINE_ARCH} == "alpha") || (${MACHINE_ARCH} == "sparc64") ++STALIN= stalin-alpha ++.else ++STALIN= stalin-32 ++.endif + -+all-32: stalin-32 libstalin.a ++all: ${STALIN} libstalin.a + -+all-alpha: stalin-alpha libstalin.a ++CPPFLAGS+= -I${GC_PREFIX}/include -I${X11BASE}/include ++ ++.if (${MACHINE_ARCH} != "i386") ++CFLAGS += -O ++.endif ++ ++CFLAGS+= -fomit-frame-pointer ++ ++LDFLAGS+= -Wl,-R${GC_PREFIX}/lib -L${GC_PREFIX}/lib ++LDFLAGS+= -Wl,-R${X11BASE}/lib -L${X11BASE}/lib ++ ++LDLIBS = -lgc -lm + +stalin-32: stalin-32.o -+ $(CC) $(CFLAGS) -o stalin $@.o $(LDFLAGS) $(LIBS) ++ $(CC) -o stalin $? $(LDFLAGS) $(LDLIBS) + +stalin-alpha: stalin-alpha.o -+ $(CC) $(CFLAGS_ALPHA) -o stalin $@.o $(LDFLAGS) $(LIBS) ++ $(CC) -o stalin $? $(LDFLAGS) $(LDLIBS) + +LIBOBJS = xlib-c.o gl-c.o + +libstalin.a: include/xlib-c.o include/gl-c.o -+ $(AR) $(ARFLAGS) $@ $(LIBOBJS) ++ $(AR) cru $@ $(LIBOBJS) + $(RANLIB) $@ + -+stalin-32.o: -+ $(CC) $(CFLAGS) $(INCLUDES) -c stalin-32.c -+ -+stalin-alpha.o: -+ $(CC) $(CFLAGS_ALPHA) $(INCLUDES) -c stalin-alpha.c -+ -+.c.o: -+ $(CC) $(CFLAGS) $(INCLUDES) -c $< ++clean: ++ rm -f ${STALIN} libstalin.a *.o include/*.o diff --git a/lang/stalin/patches/patch-ae b/lang/stalin/patches/patch-ae index 2997c6c07fd..8e7a913ed37 100644 --- a/lang/stalin/patches/patch-ae +++ b/lang/stalin/patches/patch-ae @@ -1,14 +1,13 @@ -$NetBSD: patch-ae,v 1.4 2001/01/21 03:11:55 jtb Exp $ +$NetBSD: patch-ae,v 1.5 2001/04/21 01:00:38 jtb Exp $ ---- /dev/null Sun Jan 21 02:47:21 2001 +--- /dev/null Sat Apr 21 01:48:33 2001 +++ stalinc -@@ -0,0 +1,12 @@ +@@ -0,0 +1,11 @@ +#!/bin/sh + +STALIN_INCLUDES="-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" ++ -I @X11BASE@/lib -I @X11BASE@/include" + +STALIN_OPTIONS="-Ob -Om -On -Or -Ot -d -d1 -du -dI -k \ + -copt -O2 -copt -fomit-frame-pointer \ |