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/files/, app-benchmarks/stress-ng/
Date: Fri, 30 Oct 2020 22:43:21
Message-Id: 1604097792.5413fb9b87df58ec7bcf4922d9049f7c666d131a.conikost@gentoo
1 commit: 5413fb9b87df58ec7bcf4922d9049f7c666d131a
2 Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
3 AuthorDate: Fri Oct 30 22:25:17 2020 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Fri Oct 30 22:43:12 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5413fb9b
7
8 app-benchmarks/stress-ng: drop old version
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.17-makefile.patch | 61 ----------------------
15 app-benchmarks/stress-ng/stress-ng-0.11.22.ebuild | 41 ---------------
16 3 files changed, 103 deletions(-)
17
18 diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
19 index 5aa29283411..f7ed2493196 100644
20 --- a/app-benchmarks/stress-ng/Manifest
21 +++ b/app-benchmarks/stress-ng/Manifest
22 @@ -1,2 +1 @@
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.17-makefile.patch b/app-benchmarks/stress-ng/files/stress-ng-0.11.17-makefile.patch
27 deleted file mode 100644
28 index d3c5e93b007..00000000000
29 --- a/app-benchmarks/stress-ng/files/stress-ng-0.11.17-makefile.patch
30 +++ /dev/null
31 @@ -1,61 +0,0 @@
32 ---- stress-ng-0.11.17.orig/Makefile 2020-07-27 13:38:23.000000000 +0200
33 -+++ stress-ng-0.11.17/Makefile 2020-08-09 13:43:30.919796477 +0200
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 -@@ -358,12 +358,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 -@@ -384,7 +382,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 -+ echo "CC $<"
64 - @$(CC) -c apparmor-data.c -o apparmor-data.o
65 - @rm -rf apparmor-data.c apparmor-data.bin
66 -
67 -@@ -401,12 +399,12 @@
68 - @$(CC) $(CFLAGS) -E core-perf-event.c | grep "PERF_COUNT" | \
69 - sed 's/,/ /' | sed s/'^ *//' | \
70 - awk {'print "#define _SNG_" $$1 " (1)"'} > core-perf-event.h
71 -- @echo CC $<
72 -- @$(CC) $(CFLAGS) -c -o $@ $<
73 -+ echo CC $<
74 -+ $(CC) $(CFLAGS) -c -o $@ $<
75 -
76 - stress-vecmath.o: stress-vecmath.c
77 -- @echo CC $<
78 -- @$(CC) $(CFLAGS) -fno-builtin -c -o $@ $<
79 -+ echo CC $<
80 -+ $(CC) $(CFLAGS) -fno-builtin -c -o $@ $<
81 - @touch stress-ng.c
82 -
83 - $(OBJS): stress-ng.h Makefile
84 -@@ -459,7 +457,7 @@
85 - mkdir -p ${DESTDIR}${BINDIR}
86 - cp stress-ng ${DESTDIR}${BINDIR}
87 - mkdir -p ${DESTDIR}${MANDIR}
88 -- cp stress-ng.1.gz ${DESTDIR}${MANDIR}
89 -+ cp stress-ng.1 ${DESTDIR}${MANDIR}
90 - mkdir -p ${DESTDIR}${JOBDIR}
91 - cp -rp example-jobs/*.job ${DESTDIR}${JOBDIR}
92 - mkdir -p ${DESTDIR}${BASHDIR}
93
94 diff --git a/app-benchmarks/stress-ng/stress-ng-0.11.22.ebuild b/app-benchmarks/stress-ng/stress-ng-0.11.22.ebuild
95 deleted file mode 100644
96 index 3985c5e0570..00000000000
97 --- a/app-benchmarks/stress-ng/stress-ng-0.11.22.ebuild
98 +++ /dev/null
99 @@ -1,41 +0,0 @@
100 -# Copyright 1999-2020 Gentoo Authors
101 -# Distributed under the terms of the GNU General Public License v2
102 -
103 -EAPI=7
104 -
105 -inherit optfeature toolchain-funcs
106 -
107 -DESCRIPTION="Stress test for a computer system with various selectable ways"
108 -HOMEPAGE="https://kernel.ubuntu.com/~cking/stress-ng/"
109 -SRC_URI="https://kernel.ubuntu.com/~cking/tarballs/${PN}/${P}.tar.xz"
110 -
111 -LICENSE="GPL-2+"
112 -SLOT="0"
113 -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
114 -
115 -DEPEND="
116 - dev-libs/libaio
117 - dev-libs/libbsd
118 - dev-libs/libgcrypt:0=
119 - sys-apps/attr
120 - sys-apps/keyutils:=
121 - sys-libs/libcap
122 - sys-libs/zlib
123 -"
124 -
125 -RDEPEND="${DEPEND}"
126 -
127 -DOCS=( "README" "README.Android" "TODO" "syscalls.txt" )
128 -
129 -PATCHES=( "${FILESDIR}/${PN}-0.11.17-makefile.patch" )
130 -
131 -src_compile() {
132 - tc-export CC
133 -
134 - default
135 -}
136 -
137 -pkg_postinst() {
138 - optfeature "AppArmor support" sys-libs/libapparmor
139 - optfeature "SCTP support" net-misc/lksctp-tools
140 -}