diff options
author | abs <abs@pkgsrc.org> | 2002-09-17 17:02:30 +0000 |
---|---|---|
committer | abs <abs@pkgsrc.org> | 2002-09-17 17:02:30 +0000 |
commit | 957792d48dae03b703ec192f65553e45a14c282f (patch) | |
tree | aeeb5c3086b683794b553e624bcbf5d56da88501 | |
parent | 8833111dc3283302336ba98725f50ae82ee30e5b (diff) | |
download | pkgsrc-957792d48dae03b703ec192f65553e45a14c282f.tar.gz |
Updated cpuburn to 1.4nb2
Nuke -nostdlib and play some define games to ensure we have a 'main'
instead of '_start', so the binary includes the NetBSD ELF note and
runs correctly.
-rw-r--r-- | sysutils/cpuburn/Makefile | 4 | ||||
-rw-r--r-- | sysutils/cpuburn/distinfo | 4 | ||||
-rw-r--r-- | sysutils/cpuburn/patches/patch-aa | 12 |
3 files changed, 11 insertions, 9 deletions
diff --git a/sysutils/cpuburn/Makefile b/sysutils/cpuburn/Makefile index 430efe56b36..ba3527b55fa 100644 --- a/sysutils/cpuburn/Makefile +++ b/sysutils/cpuburn/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.2 2002/09/16 22:32:00 abs Exp $ +# $NetBSD: Makefile,v 1.3 2002/09/17 17:02:30 abs Exp $ # DISTNAME= cpuburn_1_4 PKGNAME= cpuburn-1.4 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= sysutils MASTER_SITES= http://users.ev1.net/~redelm/ EXTRACT_SUFX= _tar.gz diff --git a/sysutils/cpuburn/distinfo b/sysutils/cpuburn/distinfo index fb31e8634b6..fffd9a165f6 100644 --- a/sysutils/cpuburn/distinfo +++ b/sysutils/cpuburn/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.3 2002/09/16 22:32:00 abs Exp $ +$NetBSD: distinfo,v 1.4 2002/09/17 17:02:30 abs Exp $ SHA1 (cpuburn_1_4_tar.gz) = 291e163d17ce528fd8301f821babed74d9caffaf Size (cpuburn_1_4_tar.gz) = 7373 bytes -SHA1 (patch-aa) = 76f2904a27da9e8f570a83e76560868a1da380d4 +SHA1 (patch-aa) = 6427616decd8c19a5e79e6eedf1ff59e60323b45 diff --git a/sysutils/cpuburn/patches/patch-aa b/sysutils/cpuburn/patches/patch-aa index c1a4eb699a0..8094aeef033 100644 --- a/sysutils/cpuburn/patches/patch-aa +++ b/sysutils/cpuburn/patches/patch-aa @@ -1,16 +1,18 @@ -$NetBSD: patch-aa,v 1.1 2002/09/16 22:32:00 abs Exp $ +$NetBSD: patch-aa,v 1.2 2002/09/17 17:02:30 abs Exp $ --- Makefile.orig Sat Jun 16 04:39:17 2001 +++ Makefile -@@ -1,3 +1,10 @@ +@@ -1,3 +1,12 @@ +OPSYS!= uname -s -+# On NetBSD crtbeginS.o includes the ELF note that tags the binary as native ++# On NetBSD -nostdlib will exclude the ELF note that tags binaries as native. +.if (${OPSYS} == NetBSD) -+EXTRALINK=/usr/lib/crtbeginS.o ++COMPILEFLAGS=-D_main=main -DWINDOWS ++.else ++COMPILEFLAGS=-nostdlib +.endif + all : burnP5 burnP6 burnK6 burnK7 burnBX burnMMX + .S: - gcc -s -nostdlib -o $@ $< -+ gcc -s -nostdlib -o $@ $< ${EXTRALINK} ++ gcc -s ${COMPILEFLAGS} -o $@ $< |