Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-benchmarks/stress-ng/, app-benchmarks/stress-ng/files/
Date: Fri, 30 Oct 2020 22:43:22
Message-Id: 1604097782.52bc9443c8e57b964a8325a9209d851461bc8b69.conikost@gentoo
1 commit: 52bc9443c8e57b964a8325a9209d851461bc8b69
2 Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
3 AuthorDate: Fri Oct 30 22:24:13 2020 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Fri Oct 30 22:43:02 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52bc9443
7
8 app-benchmarks/stress-ng: bump to version 0.11.23
9
10 Package-Manager: Portage-3.0.8, Repoman-3.0.2
11 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
12
13 app-benchmarks/stress-ng/Manifest | 1 +
14 .../files/stress-ng-0.11.23-makefile.patch | 60 ++++++++++++++++++++++
15 app-benchmarks/stress-ng/stress-ng-0.11.23.ebuild | 41 +++++++++++++++
16 3 files changed, 102 insertions(+)
17
18 diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
19 index 1e292ca6e33..5aa29283411 100644
20 --- a/app-benchmarks/stress-ng/Manifest
21 +++ b/app-benchmarks/stress-ng/Manifest
22 @@ -1 +1,2 @@
23 DIST stress-ng-0.11.22.tar.xz 495692 BLAKE2B 738883d59f4054d650de33f67ddf1e4a27625631e22295e3df00ba115d229a1f747e1b2948313beca55af160010683c20f4acad02eb2231c0a908af6534b266e SHA512 1685c7eb675bae1f751d8dbeb20dcd4ce753c564524d773dd6a396ace83bd94558425a3557d7d8cb86b87fb9a477069f85b81aec41649db3ccee2a32422b2546
24 +DIST stress-ng-0.11.23.tar.xz 499540 BLAKE2B ccba08bdb756737e782f896fe364869e4f939f7c8e9d5a02f8138d85f3d1922740100a58d9652169735eab994ab89df331b97bb08b588a721a6b1a8511fab937 SHA512 1642e6ea8ee75e400d5ea4e40d61384f9a895cd489715be1107d6cd06eea2274ac0b32320cabe806d0f919efbea8061848d9c9c4bdc5980704e7a2db45c9be70
25
26 diff --git a/app-benchmarks/stress-ng/files/stress-ng-0.11.23-makefile.patch b/app-benchmarks/stress-ng/files/stress-ng-0.11.23-makefile.patch
27 new file mode 100644
28 index 00000000000..77687d2a114
29 --- /dev/null
30 +++ b/app-benchmarks/stress-ng/files/stress-ng-0.11.23-makefile.patch
31 @@ -0,0 +1,60 @@
32 +--- a/Makefile
33 ++++ b/Makefile
34 +@@ -21,7 +21,7 @@
35 + # Codename "synthetic system strainer"
36 + #
37 +
38 +-CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' -O2 -std=gnu99
39 ++CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' -std=gnu99
40 +
41 + #
42 + # Pedantic flags
43 +@@ -364,12 +364,10 @@
44 + .o: stress-ng.h Makefile
45 +
46 + .c.o:
47 +- @echo "CC $<"
48 +- @$(CC) $(CFLAGS) -c -o $@ $<
49 ++ $(CC) $(CFLAGS) -c -o $@ $<
50 +
51 + stress-ng: $(OBJS)
52 +- @echo "LD $@"
53 +- @$(CC) $(CPPFLAGS) $(CFLAGS) $(OBJS) -lm $(LDFLAGS) -o $@
54 ++ $(CC) $(CPPFLAGS) $(CFLAGS) $(OBJS) -lm $(LDFLAGS) -o $@
55 + @sync
56 +
57 + makeconfig:
58 +@@ -390,8 +388,7 @@
59 + sed '$$ s/.$$//' >> apparmor-data.c
60 + @echo "};" >> apparmor-data.c
61 + @echo "const size_t g_apparmor_data_len = sizeof(g_apparmor_data);" >> apparmor-data.c
62 +- @echo "CC $<"
63 +- @$(CC) -c apparmor-data.c -o apparmor-data.o
64 ++ $(CC) -c apparmor-data.c -o apparmor-data.o
65 + @rm -rf apparmor-data.c apparmor-data.bin
66 +
67 + #
68 +@@ -419,12 +416,10 @@
69 + @$(CC) $(CFLAGS) -E core-perf-event.c | $(GREP) "PERF_COUNT" | \
70 + sed 's/,/ /' | sed s/'^ *//' | \
71 + awk {'print "#define _SNG_" $$1 " (1)"'} > core-perf-event.h
72 +- @echo CC $<
73 +- @$(CC) $(CFLAGS) -c -o $@ $<
74 ++ $(CC) $(CFLAGS) -c -o $@ $<
75 +
76 + stress-vecmath.o: stress-vecmath.c
77 +- @echo CC $<
78 +- @$(CC) $(CFLAGS) -fno-builtin -c -o $@ $<
79 ++ $(CC) $(CFLAGS) -fno-builtin -c -o $@ $<
80 +
81 + $(OBJS): stress-ng.h Makefile
82 +
83 +@@ -478,7 +473,7 @@
84 + mkdir -p ${DESTDIR}${BINDIR}
85 + cp stress-ng ${DESTDIR}${BINDIR}
86 + mkdir -p ${DESTDIR}${MANDIR}
87 +- cp stress-ng.1.gz ${DESTDIR}${MANDIR}
88 ++ cp stress-ng.1 ${DESTDIR}${MANDIR}
89 + mkdir -p ${DESTDIR}${JOBDIR}
90 + cp -rp example-jobs/*.job ${DESTDIR}${JOBDIR}
91 + mkdir -p ${DESTDIR}${BASHDIR}
92
93 diff --git a/app-benchmarks/stress-ng/stress-ng-0.11.23.ebuild b/app-benchmarks/stress-ng/stress-ng-0.11.23.ebuild
94 new file mode 100644
95 index 00000000000..a01d58d2dda
96 --- /dev/null
97 +++ b/app-benchmarks/stress-ng/stress-ng-0.11.23.ebuild
98 @@ -0,0 +1,41 @@
99 +# Copyright 1999-2020 Gentoo Authors
100 +# Distributed under the terms of the GNU General Public License v2
101 +
102 +EAPI=7
103 +
104 +inherit optfeature toolchain-funcs
105 +
106 +DESCRIPTION="Stress test for a computer system with various selectable ways"
107 +HOMEPAGE="https://kernel.ubuntu.com/~cking/stress-ng/"
108 +SRC_URI="https://kernel.ubuntu.com/~cking/tarballs/${PN}/${P}.tar.xz"
109 +
110 +LICENSE="GPL-2+"
111 +SLOT="0"
112 +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
113 +
114 +DEPEND="
115 + dev-libs/libaio
116 + dev-libs/libbsd
117 + dev-libs/libgcrypt:0=
118 + sys-apps/attr
119 + sys-apps/keyutils:=
120 + sys-libs/libcap
121 + sys-libs/zlib
122 +"
123 +
124 +RDEPEND="${DEPEND}"
125 +
126 +DOCS=( "README" "README.Android" "TODO" "syscalls.txt" )
127 +
128 +PATCHES=( "${FILESDIR}/${PN}-0.11.23-makefile.patch" )
129 +
130 +src_compile() {
131 + tc-export CC
132 +
133 + default
134 +}
135 +
136 +pkg_postinst() {
137 + optfeature "AppArmor support" sys-libs/libapparmor
138 + optfeature "SCTP support" net-misc/lksctp-tools
139 +}