diff options
| -rw-r--r-- | benchmarks/hbench/Makefile | 32 | ||||
| -rw-r--r-- | benchmarks/hbench/PLIST.common | 84 | ||||
| -rw-r--r-- | benchmarks/hbench/PLIST.common_end | 10 | ||||
| -rw-r--r-- | benchmarks/hbench/PLIST.i386 | 58 |
4 files changed, 90 insertions, 94 deletions
diff --git a/benchmarks/hbench/Makefile b/benchmarks/hbench/Makefile index ee2f043a59b..331ebbcf25b 100644 --- a/benchmarks/hbench/Makefile +++ b/benchmarks/hbench/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.36 2006/03/19 22:36:03 kristerw Exp $ +# $NetBSD: Makefile,v 1.37 2006/06/18 10:07:09 rillig Exp $ DISTNAME= hbench-OS-1.0 PKGNAME= hbench-1.0 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= benchmarks MASTER_SITES= http://www.eecs.harvard.edu/vino/perf/hbench/ @@ -18,6 +18,7 @@ WRKSRC= ${WRKDIR}/hbench-OS OSVERSION_SPECIFIC= YES BUILD_TARGET= build USE_TOOLS+= perl:run +OVERRIDE_GNU_CONFIG_SCRIPTS= yes DIST_SUBDIR= ${PKGNAME_NOREV} @@ -25,26 +26,21 @@ GET_ARCH_CMD= ${PKGSRCDIR:Q}/mk/gnu-config/config.guess | ${SED} -e 's/-.*-.*$$ GET_OS_CMD= ${PKGSRCDIR:Q}/mk/gnu-config/config.guess | ${SED} -e 's/^.*-.*-//' PLIST_SUBST+= PLATFORM=${GET_OS_CMD:sh:Q}-${GET_ARCH_CMD:sh:Q} -pre-configure: - ${CP} ${PKGSRCDIR}/mk/gnu-config/config.guess ${WRKSRC}/scripts - ${CP} ${PKGSRCDIR}/mk/gnu-config/config.sub ${WRKSRC}/scripts +post-extract: + ${CP} ${FILESDIR}/do-install ${WRKSRC} -post-configure: - cd ${WRKSRC}; \ - for f in scripts/create-all-analyses \ - scripts/create-all-latgraphs \ - scripts/create-all-summaries scripts/gen-analysis \ - scripts/gen-latgraph scripts/gen-summary \ - scripts/interactive-setup scripts/maindriver \ - Results/Makefile; do \ - ${MV} $$f $$f.in; \ - ${SED} -e 's|@PREFIX@|${PREFIX}|g' $$f.in > $$f; \ - done - ${CHMOD} 0755 ${WRKSRC}/scripts/* +SUBST_CLASSES+= hb +SUBST_STAGE.hb= pre-configure +SUBST_MESSAGE.hb= Replacing bin with libexec. +SUBST_FILES.hb= do-install +SUBST_FILES.hb+= scripts/* +SUBST_FILES.hb+= Results/Makefile +SUBST_SED.hb= -e 's,@PREFIX@,${PREFIX},g' +SUBST_SED.hb+= -e 's,/bin/hbench,/libexec/hbench,g' do-install: ${SETENV} ${MAKE_ENV} WRKSRC=${WRKSRC} BINOWN=${BINOWN} \ - BINGRP=${BINGRP} ${FILESDIR}/do-install + BINGRP=${BINGRP} ${WRKSRC}/do-install benchmark: @if [ `id -u` != 0 ]; then ${ECHO} "This benchmark must be run as root!" ; exit 1 ; fi diff --git a/benchmarks/hbench/PLIST.common b/benchmarks/hbench/PLIST.common index 1153c1a7e15..deac03c7e47 100644 --- a/benchmarks/hbench/PLIST.common +++ b/benchmarks/hbench/PLIST.common @@ -1,46 +1,46 @@ -@comment $NetBSD: PLIST.common,v 1.3 2006/03/11 03:44:20 rillig Exp $ -bin/hbench/argsort -bin/hbench/config.guess -bin/hbench/config.sub -bin/hbench/create-all-analyses -bin/hbench/create-all-latgraphs -bin/hbench/create-all-summaries -bin/hbench/depend -bin/hbench/gen-analysis -bin/hbench/gen-latgraph -bin/hbench/gen-summary -bin/hbench/getostype -bin/hbench/interactive-setup -bin/hbench/maindriver -bin/hbench/stats-full -bin/hbench/stats-single -bin/hbench/${PLATFORM}/bw_bzero -bin/hbench/${PLATFORM}/bw_file_rd -bin/hbench/${PLATFORM}/bw_mem_cp -bin/hbench/${PLATFORM}/bw_mem_rd -bin/hbench/${PLATFORM}/bw_mem_wr -bin/hbench/${PLATFORM}/bw_mmap_rd -bin/hbench/${PLATFORM}/bw_pipe -bin/hbench/${PLATFORM}/bw_tcp -bin/hbench/${PLATFORM}/hello -bin/hbench/${PLATFORM}/hello-s -bin/hbench/${PLATFORM}/lat_connect -bin/hbench/${PLATFORM}/lat_ctx -bin/hbench/${PLATFORM}/lat_ctx2 -bin/hbench/${PLATFORM}/lat_fs -bin/hbench/${PLATFORM}/lat_fslayer -bin/hbench/${PLATFORM}/lat_mem_rd -bin/hbench/${PLATFORM}/lat_mmap -bin/hbench/${PLATFORM}/lat_pipe -bin/hbench/${PLATFORM}/lat_proc -bin/hbench/${PLATFORM}/lat_rpc -bin/hbench/${PLATFORM}/lat_sig -bin/hbench/${PLATFORM}/lat_syscall -bin/hbench/${PLATFORM}/lat_tcp -bin/hbench/${PLATFORM}/lat_udp -bin/hbench/${PLATFORM}/memsize -bin/hbench/${PLATFORM}/mhz +@comment $NetBSD: PLIST.common,v 1.4 2006/06/18 10:07:09 rillig Exp $ bin/run-hbench +libexec/hbench/${PLATFORM}/bw_bzero +libexec/hbench/${PLATFORM}/bw_file_rd +libexec/hbench/${PLATFORM}/bw_mem_cp +libexec/hbench/${PLATFORM}/bw_mem_rd +libexec/hbench/${PLATFORM}/bw_mem_wr +libexec/hbench/${PLATFORM}/bw_mmap_rd +libexec/hbench/${PLATFORM}/bw_pipe +libexec/hbench/${PLATFORM}/bw_tcp +libexec/hbench/${PLATFORM}/hello +libexec/hbench/${PLATFORM}/hello-s +libexec/hbench/${PLATFORM}/lat_connect +libexec/hbench/${PLATFORM}/lat_ctx +libexec/hbench/${PLATFORM}/lat_ctx2 +libexec/hbench/${PLATFORM}/lat_fs +libexec/hbench/${PLATFORM}/lat_fslayer +libexec/hbench/${PLATFORM}/lat_mem_rd +libexec/hbench/${PLATFORM}/lat_mmap +libexec/hbench/${PLATFORM}/lat_pipe +libexec/hbench/${PLATFORM}/lat_proc +libexec/hbench/${PLATFORM}/lat_rpc +libexec/hbench/${PLATFORM}/lat_sig +libexec/hbench/${PLATFORM}/lat_syscall +libexec/hbench/${PLATFORM}/lat_tcp +libexec/hbench/${PLATFORM}/lat_udp +libexec/hbench/${PLATFORM}/memsize +libexec/hbench/${PLATFORM}/mhz +libexec/hbench/argsort +libexec/hbench/config.guess +libexec/hbench/config.sub +libexec/hbench/create-all-analyses +libexec/hbench/create-all-latgraphs +libexec/hbench/create-all-summaries +libexec/hbench/depend +libexec/hbench/gen-analysis +libexec/hbench/gen-latgraph +libexec/hbench/gen-summary +libexec/hbench/getostype +libexec/hbench/interactive-setup +libexec/hbench/maindriver +libexec/hbench/stats-full +libexec/hbench/stats-single share/doc/hbench/README share/doc/hbench/benchmark-descriptions share/doc/hbench/interpreting-results diff --git a/benchmarks/hbench/PLIST.common_end b/benchmarks/hbench/PLIST.common_end index 67ad4777c31..b3f1bdd6d03 100644 --- a/benchmarks/hbench/PLIST.common_end +++ b/benchmarks/hbench/PLIST.common_end @@ -1,7 +1,7 @@ -@comment $NetBSD: PLIST.common_end,v 1.2 2006/03/11 03:44:20 rillig Exp $ -@dirrm bin/hbench/${PLATFORM} -@dirrm bin/hbench -@dirrm share/doc/hbench -@dirrm share/hbench/Results +@comment $NetBSD: PLIST.common_end,v 1.3 2006/06/18 10:07:09 rillig Exp $ @dirrm share/hbench/conf +@dirrm share/hbench/Results @dirrm share/hbench +@dirrm share/doc/hbench +@dirrm libexec/hbench/${PLATFORM} +@dirrm libexec/hbench diff --git a/benchmarks/hbench/PLIST.i386 b/benchmarks/hbench/PLIST.i386 index ccabd786ae0..7d9ed4af5fb 100644 --- a/benchmarks/hbench/PLIST.i386 +++ b/benchmarks/hbench/PLIST.i386 @@ -1,29 +1,29 @@ -@comment $NetBSD: PLIST.i386,v 1.2 2006/03/11 03:44:20 rillig Exp $ -bin/hbench/${PLATFORM}-c/bw_bzero -bin/hbench/${PLATFORM}-c/bw_file_rd -bin/hbench/${PLATFORM}-c/bw_mem_cp -bin/hbench/${PLATFORM}-c/bw_mem_rd -bin/hbench/${PLATFORM}-c/bw_mem_wr -bin/hbench/${PLATFORM}-c/bw_mmap_rd -bin/hbench/${PLATFORM}-c/bw_pipe -bin/hbench/${PLATFORM}-c/bw_tcp -bin/hbench/${PLATFORM}-c/hello -bin/hbench/${PLATFORM}-c/hello-s -bin/hbench/${PLATFORM}-c/lat_connect -bin/hbench/${PLATFORM}-c/lat_ctx -bin/hbench/${PLATFORM}-c/lat_ctx2 -bin/hbench/${PLATFORM}-c/lat_fs -bin/hbench/${PLATFORM}-c/lat_fslayer -bin/hbench/${PLATFORM}-c/lat_mem_rd -bin/hbench/${PLATFORM}-c/lat_mmap -bin/hbench/${PLATFORM}-c/lat_pipe -bin/hbench/${PLATFORM}-c/lat_proc -bin/hbench/${PLATFORM}-c/lat_rpc -bin/hbench/${PLATFORM}-c/lat_sig -bin/hbench/${PLATFORM}-c/lat_syscall -bin/hbench/${PLATFORM}-c/lat_tcp -bin/hbench/${PLATFORM}-c/lat_udp -bin/hbench/${PLATFORM}-c/memsize -bin/hbench/${PLATFORM}-c/mhz -bin/hbench/${PLATFORM}-c/mhz-counter -@dirrm bin/hbench/${PLATFORM}-c +@comment $NetBSD: PLIST.i386,v 1.3 2006/06/18 10:07:09 rillig Exp $ +libexec/hbench/${PLATFORM}-c/bw_bzero +libexec/hbench/${PLATFORM}-c/bw_file_rd +libexec/hbench/${PLATFORM}-c/bw_mem_cp +libexec/hbench/${PLATFORM}-c/bw_mem_rd +libexec/hbench/${PLATFORM}-c/bw_mem_wr +libexec/hbench/${PLATFORM}-c/bw_mmap_rd +libexec/hbench/${PLATFORM}-c/bw_pipe +libexec/hbench/${PLATFORM}-c/bw_tcp +libexec/hbench/${PLATFORM}-c/hello +libexec/hbench/${PLATFORM}-c/hello-s +libexec/hbench/${PLATFORM}-c/lat_connect +libexec/hbench/${PLATFORM}-c/lat_ctx +libexec/hbench/${PLATFORM}-c/lat_ctx2 +libexec/hbench/${PLATFORM}-c/lat_fs +libexec/hbench/${PLATFORM}-c/lat_fslayer +libexec/hbench/${PLATFORM}-c/lat_mem_rd +libexec/hbench/${PLATFORM}-c/lat_mmap +libexec/hbench/${PLATFORM}-c/lat_pipe +libexec/hbench/${PLATFORM}-c/lat_proc +libexec/hbench/${PLATFORM}-c/lat_rpc +libexec/hbench/${PLATFORM}-c/lat_sig +libexec/hbench/${PLATFORM}-c/lat_syscall +libexec/hbench/${PLATFORM}-c/lat_tcp +libexec/hbench/${PLATFORM}-c/lat_udp +libexec/hbench/${PLATFORM}-c/memsize +libexec/hbench/${PLATFORM}-c/mhz +libexec/hbench/${PLATFORM}-c/mhz-counter +@dirrm libexec/hbench/${PLATFORM}-c |