Attachment 161374 Details for Bug 200949 – Updating the patch adopting the version 0.4.20 and removing the FreeBSD 8 support

[patch] Updating the patch adopting the version 0.4.20 and removing the FreeBSD 8 support

W-benchmarks-stress-ng.diff (text/plain), 4.49 KB, created by luca.pizzamiglio on 2015-09-25 13:44:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: luca.pizzamiglio

Created: 2015-09-25 13:44:53 UTC

Size: 4.49 KB

patch

obsolete

>diff --git benchmarks/Makefile benchmarks/Makefile
>index 770d523..86ef121 100644
>--- benchmarks/Makefile
>+++ benchmarks/Makefile
>@@ -70,6 +70,7 @@
>     SUBDIR += smhasher
>     SUBDIR += spp
>     SUBDIR += stream
>+    SUBDIR += stress-ng
>     SUBDIR += super-smack
>     SUBDIR += sysbench
>     SUBDIR += tcpblast
>diff --git benchmarks/stress-ng/Makefile benchmarks/stress-ng/Makefile
>new file mode 100644
>index 0000000..0bf5437
>--- /dev/null
>+++ benchmarks/stress-ng/Makefile
>@@ -0,0 +1,28 @@
>+# $FreeBSD$
>+
>+PORTNAME=	stress-ng
>+PORTVERSION=	0.04.20
>+CATEGORIES=	benchmarks
>+MASTER_SITES=	http://kernel.ubuntu.com/~cking/tarballs/stress-ng/
>+
>+MAINTAINER=	luca.pizzamiglio@gmail.com
>+COMMENT=	Stress test benchmarks
>+
>+LICENSE=	GPLv2
>+
>+ALL_TARGET=	# empty
>+
>+PLIST_FILES=	bin/stress-ng man/man1/stress-ng.1.gz
>+
>+.include <bsd.port.pre.mk>
>+
>+.if ${OSVERSION} < 1000000
>+EXTRA_PATCHES+=	${FILESDIR}/extrapatch-stress-cpu.c \
>+		${FILESDIR}/extrapatch-Makefile
>+.endif
>+
>+do-install:
>+	${INSTALL_PROGRAM} ${WRKSRC}/stress-ng ${STAGEDIR}${PREFIX}/bin
>+	${INSTALL_MAN} ${WRKSRC}/stress-ng.1 ${STAGEDIR}${MANDIRS}/man1
>+
>+.include <bsd.port.post.mk>
>diff --git benchmarks/stress-ng/distinfo benchmarks/stress-ng/distinfo
>new file mode 100644
>index 0000000..4f1a98d
>--- /dev/null
>+++ benchmarks/stress-ng/distinfo
>@@ -0,0 +1,2 @@
>+SHA256 (stress-ng-0.04.20.tar.gz) = 5b00c23325e46236466e598a977c8ebcd4f786cc0c2e15118004a0462bb6f47f
>+SIZE (stress-ng-0.04.20.tar.gz) = 236074
>diff --git benchmarks/stress-ng/files/extrapatch-Makefile benchmarks/stress-ng/files/extrapatch-Makefile
>new file mode 100644
>index 0000000..9220658
>--- /dev/null
>+++ benchmarks/stress-ng/files/extrapatch-Makefile
>@@ -0,0 +1,11 @@
>+--- Makefile.orig	2015-09-25 10:15:45 UTC
>++++ Makefile
>+@@ -165,7 +165,7 @@ OBJS = $(SRC:.c=.o)
>+ 	@$(CC) $(CFLAGS) -c -o $@ $<
>+ 
>+ stress-ng: $(OBJS)
>+-	$(CC) $(CPPFLAGS) $(CFLAGS) $(OBJS) -lm -pthread -lrt -lcrypt -o $@ $(LDFLAGS)
>++	$(CC) $(CPPFLAGS) $(CFLAGS) $(OBJS) -lm -pthread -lrt -lcrypt -lstdc++ -o $@ $(LDFLAGS)
>+ 
>+ stress-cpu.o: stress-cpu.c
>+ 	@echo $(CC) $(CFLAGS) -c -o $@ $<
>diff --git benchmarks/stress-ng/files/extrapatch-stress-cpu.c benchmarks/stress-ng/files/extrapatch-stress-cpu.c
>new file mode 100644
>index 0000000..6893076
>--- /dev/null
>+++ benchmarks/stress-ng/files/extrapatch-stress-cpu.c
>@@ -0,0 +1,10 @@
>+--- stress-cpu.c.orig	2015-09-18 14:50:12 UTC
>++++ stress-cpu.c
>+@@ -23,6 +23,7 @@
>+  *
>+  */
>+ #define _GNU_SOURCE
>++#define _DECLARE_C99_LDBL_MATH 1
>+ 
>+ #include <stdio.h>
>+ #include <stdlib.h>
>diff --git benchmarks/stress-ng/files/patch-stress-cpu.c benchmarks/stress-ng/files/patch-stress-cpu.c
>new file mode 100644
>index 0000000..9d0f5e6
>--- /dev/null
>+++ benchmarks/stress-ng/files/patch-stress-cpu.c
>@@ -0,0 +1,38 @@
>+--- stress-cpu.c.orig	2015-09-18 14:50:12 UTC
>++++ stress-cpu.c
>+@@ -57,7 +58,6 @@
>+ #define	ccosl	ccos
>+ #define	csinl	csin
>+ #define cpow	pow
>+-#define powl	pow
>+ #endif
>+ 
>+ /*
>+@@ -866,6 +866,7 @@ stress_cpu_fp(_Decimal128, decimal128, s
>+ /* Append floating point literal specifier to literal value */
>+ #define FP(val, ltype)	val ## ltype
>+ 
>++#if defined(__STDC_IEC_559_COMPLEX__)
>+ /*
>+  *  Generic complex stressor macro
>+  */
>+@@ -891,6 +892,7 @@ static void HOT OPTIMIZE3 stress_cpu_ ##
>+ stress_cpu_complex(complex float, f, complex_float, csinf, ccosf)
>+ stress_cpu_complex(complex double, , complex_double, csin, ccos)
>+ stress_cpu_complex(complex long double, l, complex_long_double, csinl, ccosl)
>++#endif /* __STDC_IEC_559_COMPLEX__ */
>+ 
>+ #define int_float_ops(_ftype, flt_a, flt_b, flt_c, flt_d,	\
>+ 	_sin, _cos, int_a, int_b, _c1, _c2, _c3)		\
>+@@ -2058,9 +2060,11 @@ static stress_cpu_stressor_info_t cpu_me
>+ 	{ "ackermann",		stress_cpu_ackermann },
>+ 	{ "bitops",		stress_cpu_bitops },
>+ 	{ "callfunc",		stress_cpu_callfunc },
>++#if defined(__STDC_IEC_559_COMPLEX__)
>+ 	{ "cdouble",		stress_cpu_complex_double },
>+ 	{ "cfloat",		stress_cpu_complex_float },
>+ 	{ "clongdouble",	stress_cpu_complex_long_double },
>++#endif /* __STDC_IEC_559_COMPLEX__ */
>+ 	{ "correlate",		stress_cpu_correlate },
>+ 	{ "crc16",		stress_cpu_crc16 },
>+ #if defined(STRESS_FLOAT_DECIMAL)
>diff --git benchmarks/stress-ng/pkg-descr benchmarks/stress-ng/pkg-descr
>new file mode 100644
>index 0000000..395e783
>--- /dev/null
>+++ benchmarks/stress-ng/pkg-descr
>@@ -0,0 +1,5 @@
>+This stress test suite will stress a computer system in various selectable ways
>+It was designed to exercise various physical subsystems of a computer as well
>+as various operating system kernel interfaces.
>+
>+WWW: http://kernel.ubuntu.com/~cking/stress-ng/

Actions: View | Diff

Attachments on bug 200949: 157850 | 157851 | 157852 | 157853 | 157854 | 157855 | 157856 | 158909 | 161374