Permalink
Browse files

No static linking on SunOS. Don't use non-standard u_intXX_t types.

Not MAKE_JOBS_SAFE.
  • Loading branch information...
hans
hans committed Feb 28, 2012
1 parent 5a65306 commit e0ae8c9273b45c02e9b7bf355c75f1f1034424c0
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2011/09/12 11:15:33 dholland Exp $
+# $NetBSD: Makefile,v 1.47 2012/02/28 15:49:56 hans Exp $
DISTNAME= hbench-OS-1.1
PKGNAME= hbench-1.1
@@ -24,12 +24,16 @@ OSVERSION_SPECIFIC= YES
BUILD_TARGET= build
USE_TOOLS+= perl:run
OVERRIDE_GNU_CONFIG_SCRIPTS= yes
+MAKE_JOBS_SAFE= no
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}
.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "SunOS"
+BUILDLINK_TRANSFORM+= rm:-static
+.endif
HB_HOSTNAME!= ${UNAME} -n
HB_SHORTNAME= ${HB_HOSTNAME:C/\..*//}
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2011/09/12 11:15:33 dholland Exp $
+$NetBSD: distinfo,v 1.18 2012/02/28 15:49:56 hans Exp $
SHA1 (hbench-OS-1.1.tar.gz) = b6c98f5fc9cd306df6bdd2cf7d8254100118b01a
RMD160 (hbench-OS-1.1.tar.gz) = 023131dc9ae6239b9d64671e4128d691b78b310a
@@ -21,5 +21,6 @@ SHA1 (patch-am) = 1d58355f664879ccd8880a63f574388fb61c0780
SHA1 (patch-an) = 9ac065d203081a5779b87cca69ecadfbeff5c970
SHA1 (patch-ao) = 69c92f83d10f061f8f0aa05da860cfc5cf764859
SHA1 (patch-ap) = 057465b9f89e76367781401d91b333679a651cb4
-SHA1 (patch-aq) = ed10e6323feca92a0c1a454a5bc72627060e5c37
+SHA1 (patch-aq) = 18f1d6191ff8a87a86004d5adb7bfbe56d36432b
SHA1 (patch-as) = 5e6668a93610db020a4de0e46620b37f24e53309
+SHA1 (patch-src_arch_i386_cyclecounter.c) = b2c41f7e2bae6deb561a4a010a2a8bb5eba3d19b
@@ -1,9 +1,19 @@
-$NetBSD: patch-aq,v 1.4 2011/09/12 11:15:33 dholland Exp $
+$NetBSD: patch-aq,v 1.5 2012/02/28 15:49:56 hans Exp $
- fix parallel build
+- solaris runs not only on sparc
--- src/Makefile.orig 2011-09-12 10:59:10.000000000 +0000
+++ src/Makefile
+@@ -121,7 +121,7 @@ bsdi:
+ @$(MAKE) LDLIBS="-lrpc" binaries
+
+ solaris:
+- @$(MAKE) CC=gcc LDLIBS="-lnsl -lsocket -lcpc" SYS5=-DSYS5 CFLAGS="-Wa,-xarch=v8plusa $(CFLAGS_SPARC)" CPPFLAGS="-Wa,-xarch=v8plusa" binaries
++ @$(MAKE) CC=gcc LDLIBS="-lnsl -lsocket -lcpc" SYS5=-DSYS5 CFLAGS="$(CFLAGS_SPARC)" binaries
+
+ # HPUX needs gcc; their C compiler screws up mhz.c.
+ hpux:
@@ -170,7 +170,7 @@ EXES= $(BINDIR)/bw_bzero $(BINDIR)/bw_fi
$(BINDIR)/mhz $(BINDIR)/mhz-counter
# $(BINDIR)/lmdd $(BINDIR)/lat_pagefault
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_arch_i386_cyclecounter.c,v 1.1 2012/02/28 15:49:56 hans Exp $
+
+--- src/arch/i386/cyclecounter.c.orig 2003-02-28 18:19:53.000000000 +0100
++++ src/arch/i386/cyclecounter.c 2012-02-28 16:40:39.132704974 +0100
+@@ -62,8 +62,8 @@
+ * instruction for the TCP bandwidth test.
+ */
+
+-typedef u_int32_t clk_t; /* time stamps are 64 bit on the Pentium Pro */
+-typedef u_int64_t internal_clk_t;
++typedef uint32_t clk_t; /* time stamps are 64 bit on the Pentium Pro */
++typedef uint64_t internal_clk_t;
+ #define CLKTFMT "%d"
+ #define CLKTSTR(x) ((int)strtol(x, NULL, 10))
+

0 comments on commit e0ae8c9

Please sign in to comment.