CVS commit: pkgsrc/benchmarks/nbench

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Apr 20 13:48:24 UTC 2024

Modified Files:
        pkgsrc/benchmarks/nbench: Makefile distinfo
        pkgsrc/benchmarks/nbench/patches: patch-aa

Log Message:
nbench: Do not force static linking. Honour CFLAGS/LDFLAGS.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/benchmarks/nbench/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/benchmarks/nbench/distinfo
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/benchmarks/nbench/patches/patch-aa

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/benchmarks/nbench/Makefile
diff -u pkgsrc/benchmarks/nbench/Makefile:1.11 pkgsrc/benchmarks/nbench/Makefile:1.12
--- pkgsrc/benchmarks/nbench/Makefile:1.11      Sun Oct 31 19:58:56 2021
+++ pkgsrc/benchmarks/nbench/Makefile   Sat Apr 20 13:48:24 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2021/10/31 19:58:56 jklos Exp $
+# $NetBSD: Makefile,v 1.12 2024/04/20 13:48:24 nia Exp $
 #
 
 DISTNAME=      nbench-byte-2.2.3
@@ -11,18 +11,12 @@ HOMEPAGE=   https://www.math.utah.edu/~may
 COMMENT=       Benchmark tool for CPU, FPU and memory
 
 MAKE_JOBS_SAFE=                no
-MKPIE_SUPPORTED=       no
 
 BUILD_TARGET=  default
+MAKE_FLAGS+=   LINKFLAGS=${LDFLAGS:Q}
 
 INSTALLATION_DIRS=     bin
 
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "SunOS" && \
-    (!empty(OS_VERSION:M5.1*) || ${ABI} == 64)
-BUILDLINK_TRANSFORM+=  rm:-static
-.endif
-
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/nbench ${DESTDIR}${PREFIX}/bin
 

Index: pkgsrc/benchmarks/nbench/distinfo
diff -u pkgsrc/benchmarks/nbench/distinfo:1.7 pkgsrc/benchmarks/nbench/distinfo:1.8
--- pkgsrc/benchmarks/nbench/distinfo:1.7       Tue Oct 26 10:02:53 2021
+++ pkgsrc/benchmarks/nbench/distinfo   Sat Apr 20 13:48:24 2024
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.7 2021/10/26 10:02:53 nia Exp $
+$NetBSD: distinfo,v 1.8 2024/04/20 13:48:24 nia Exp $
 
 BLAKE2s (nbench-byte-2.2.3.tar.gz) = e6439d8b695c996ea65b5c41a209d450ad8fb5471baed4fb11977d590966b9c8
 SHA512 (nbench-byte-2.2.3.tar.gz) = 68ae34c083e2e01f0114e6ff9ce04df41d70facbb05533b4cb9432fd9856048fde28e5c024d92f202e5f2de10fe223fdb46570873b1e2f69b2c847779645dec8
 Size (nbench-byte-2.2.3.tar.gz) = 111791 bytes
-SHA1 (patch-aa) = 5beabbb962fc2a56b5561b6d5a3eaa882af3dbd1
+SHA1 (patch-aa) = 25914ed3c6b23594d9c7e66f39597848ebdded1c
 SHA1 (patch-ab) = 6308ca09483da37a72e17503ba8d6f342692e508
 SHA1 (patch-sysinfo.sh) = 6846c6cc8d323f83c60fb95a9e6c0cd7b1e2ff5f

Index: pkgsrc/benchmarks/nbench/patches/patch-aa
diff -u pkgsrc/benchmarks/nbench/patches/patch-aa:1.1.1.1 pkgsrc/benchmarks/nbench/patches/patch-aa:1.2
--- pkgsrc/benchmarks/nbench/patches/patch-aa:1.1.1.1   Sat Sep  3 06:26:21 2005
+++ pkgsrc/benchmarks/nbench/patches/patch-aa   Sat Apr 20 13:48:24 2024
@@ -1,17 +1,18 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/09/03 06:26:21 xtraeme Exp $
+$NetBSD: patch-aa,v 1.2 2024/04/20 13:48:24 nia Exp $
 
---- Makefile.orig      2005-09-03 08:16:12.000000000 +0200
-+++ Makefile   2005-09-03 08:16:51.000000000 +0200
-@@ -19,10 +19,10 @@
+Do not hardcode CC or CFLAGS.
+
+--- Makefile.orig      2004-12-30 02:23:30.000000000 +0000
++++ Makefile
+@@ -19,10 +19,7 @@ default: nbench
  # You should leave -static in the CFLAGS so that your sysinfo can be
  # compiled into the executable.
  
 -CC = gcc
-+#CC = gcc
- 
- # generic options for gcc
+-
+-# generic options for gcc
 -CFLAGS = -s -static -Wall -O3
-+CFLAGS += -s -static # -Wall -O3
++#CC = gcc
  
  # if your gcc lets you do it, then try this one
  #CFLAGS = -s -static -Wall -O3 -fomit-frame-pointer -funroll-loops