* [gentoo-commits] repo/gentoo:master commit in: sys-block/fio/files/, sys-block/fio/
@ 2016-04-20 17:02 Mike Frysinger
0 siblings, 0 replies; 5+ messages in thread
From: Mike Frysinger @ 2016-04-20 17:02 UTC (permalink / raw
To: gentoo-commits
commit: bdf8faba8b5aef6c2710ec2b6a43a419ff3d6b64
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 20 16:54:20 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Apr 20 17:02:27 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdf8faba
sys-block/fio: drop old <2.2.9 versions
sys-block/fio/Manifest | 6 --
.../fio/files/fio-2.0.14-pic-clobber-fix.patch | 29 --------
sys-block/fio/files/fio-2.1.10-json.patch | 32 --------
sys-block/fio/fio-1.17.2.ebuild | 29 --------
sys-block/fio/fio-1.99.10.ebuild | 44 -----------
sys-block/fio/fio-2.0.14-r1.ebuild | 52 -------------
sys-block/fio/fio-2.0.15.ebuild | 52 -------------
sys-block/fio/fio-2.1.9.ebuild | 81 ---------------------
sys-block/fio/fio-2.2.4-r1.ebuild | 85 ----------------------
9 files changed, 410 deletions(-)
diff --git a/sys-block/fio/Manifest b/sys-block/fio/Manifest
index f53ae8f..eda235f 100644
--- a/sys-block/fio/Manifest
+++ b/sys-block/fio/Manifest
@@ -1,11 +1,5 @@
-DIST fio-1.17.2.tar.bz2 1155486 SHA256 1bf40fb709b7e7dbee778139cabae6b70ec6a89a43ddd83450a6b981bf813498 SHA512 99ea0da474f2d23d17a4c8775d1ec0421c020f072e2ccfbf920cbf52edac934e365dac38cdbd15993dfa72dd09b81540b0b9802f1896f031e8682fdfd805ee4b WHIRLPOOL 61da7007e3b591b148f3ffba45c3c1ecf646c47ad08d78c258cdca2906c441285fa0db738e5b0b0113a00ed178d99973b5b380a03690fe5d2e279a361cea0201
-DIST fio-1.99.10.tar.bz2 371892 SHA256 c6af6f685dfaa32c1f5779497f8d1b3dc1e18fc54bf35f0f3bb8120cf4ac2b3a SHA512 23bc2eaeed310d092a84cac06c701ccbe7c4ec45d98323f2e5ab3e4ccbea4b901edf2099dba1aed6fb31254c177228369e5983622a078ac33dc947a532693d87 WHIRLPOOL a4727121239f592f75f1a118f63370ee811c8f8b4396a253debd5ccc8a92641624d6bee65fb9b6c882e5dde41e5144d66457f47fef79942117a1a865f7183075
-DIST fio-2.0.14.tar.bz2 253574 SHA256 4bf01f1d2baf6d4fa905e5489e446e85e01979c427b2c38e2915e039248044e5 SHA512 f58024aeb38026e62cfec5a3ec9ceffb0bd1361a65cf89513a36615aa084974461c7f132ae803d49f02c36d36a6029c52f851e7f8b2cd1c66be0dcdc9fdcf115 WHIRLPOOL cb4812b34a59df41dfc6e293518becfe43515fa228b3dcb1400af987f465d7c1251b9d2645395fb7f2991728a67133bc1f1b0124db88963a1d9b11b29d949e26
-DIST fio-2.0.15.tar.bz2 258773 SHA256 3cc1b5e6c6955f9acad016b4d2ef619061ad9937874c7663e2a29777ed845ac4 SHA512 00289a0404cb44dd670614856932fbdf61cb1508e0eb672e5778c2ba3eba661b82892f7c969e4a82cf4fc487a744eb7411bfebf3b9612863de0197a28787f556 WHIRLPOOL 08b37573b63f812ea62c4ba323f05f510a9656e74f780117bd711bcc78e7fc7b5bef009212e7ec98f0ed153cc3786ece4d75d565845c0bc5eaba59afa1b037d8
-DIST fio-2.1.9.tar.bz2 429122 SHA256 4ae877939a1a1460ad4d93f7891a15bad8ca7295f441204b12c723758a0d4493 SHA512 91913941c0d83705c156eef550eb87b388368804ee722c8c99ea638481ee657960e333c58b54e720034e92c2c34e9a8bb901336399a209a87f5eaa1ad1dfde53 WHIRLPOOL 6f44cbfe601f436b1ed0173e1dfbcf3b342f1a191c947392f0167a2dba9c4806fa422ffaedf9475f83b49fab8832aa1076ba91d27a9f2bdbcae126fa4d708824
DIST fio-2.2.10.tar.bz2 497503 SHA256 04b4490c69f82bafeccbab51d33732cfd74e7a54e74eae0d9a2450faf4f1d857 SHA512 6ff71ca78b2ffa40cd9390b3e4f0b6f07db4d50c85f89c4a9e03c7f327153c0fed3eb8b7c44f3a8f8d0b1b35b48ccb5b1aa96a95fdca08581c22b99f2961c7d3 WHIRLPOOL 7bb881ecea82f3ad568d7513af0486494dc657ede69cc4de0f71e7bdf873ccf8f7a58744ab8f1fce8a1c507c3ce0f7e95eb3a7098a01fe041f04cd29a6a4afb7
DIST fio-2.2.13.tar.bz2 503950 SHA256 66a0084c37bd8804d9f7d260d843a9a3bf51561954024d3b32062b9332281924 SHA512 b2adc4fb1b8c71bb909cfc2cfd9e0d25affcacd47908bc6d126625b448c0e964afa7c65fb88cf21662d4b9d07bfbaebbb2fd66b4c4662382ef68aaf8f053bd6d WHIRLPOOL 112af8620a73e907723760fd01caa4c582f7adba5eef5bf51bb6b695c1a15ff812957937cb67dff00b93c3e941df67d751ecf1aca1627722a6084c5494e7f70a
-DIST fio-2.2.4.tar.bz2 467312 SHA256 9e1c77216457d9e21e418a55fa28bc1f98c283723fe9dcccff6138e3fb25285b SHA512 91fa0d8f9dd8d950dd26ef5c778414acddd9d6deeb84caeecdfef08df7e00c7972566a76bd242b0d5aea33a7c588aa05cf2fdcd79ef5a475277a2139d1f111a1 WHIRLPOOL 4588601d5f44c1836f97cc223bf08cce3f29f5ea3421880c00a16dcd9e3cffd741bbdd2029518712f8808548469d7f44f1b0348189643419bfd2104eab980536
DIST fio-2.2.9.tar.bz2 492404 SHA256 c881d9cf15500bd4436970d0467c356c5c021417131587931ba78845e965bf56 SHA512 e0cd26bb8a760ef5e40ddb73246671c1988f0c0886bd24fa510fcab93fe64d8853f120355f55fa109168c7fae0b081f63278f2233644f5ed20da4e4c3cb3f3fc WHIRLPOOL 4f5ada7f1140c7229fc3173fa0582a4ae7401121768d8dec828dcd42c1c22ec828e9c000c482b155ead4fd75ee15c4d7678fc7c6d18c8fbb9c749e83f87a4881
DIST fio-2.5.tar.bz2 509978 SHA256 30f85cd6596125bd2f76b379f15a4edee1149bb0347a9c10a2dda15d7591a543 SHA512 44fc4bc342b611f9ed89685d73592389dd9e63970a9bbcc1b332aa8434a3e4a52b0c16d27b6a6dd96fcf3a9831a68af5249251895a6dbd9f7190ad0b8935eb40 WHIRLPOOL dced416aae899987ff80c6f37999a064d8a45c8ea809d7a3f3a2eea5dd3b6ae5633125326373a5da3b37429dc940f0c97fa9694e976a61819709db3b6ab7ac3e
DIST fio-2.6.tar.bz2 509685 SHA256 b4b846fca614f724b8315348cb23e2d4a1046e63f10e79b4b310acf29c4d1ac0 SHA512 9831c3de2110c509f6c99ffe0fc8256aea2b9b337e6b2799108c89d1b5e472a85e6df9cb090549db80429658717aa75f2ab10d41359386e1dde861c600645b39 WHIRLPOOL c5138eb2def4c67ee0d5cca46db6aa663e2a1e0eead05aab5938ced20dd68bc214f217724d3bd1c4a1030b4ffee2c07ee37910b57c6f11b2ed6a0ff67d3b30cc
diff --git a/sys-block/fio/files/fio-2.0.14-pic-clobber-fix.patch b/sys-block/fio/files/fio-2.0.14-pic-clobber-fix.patch
deleted file mode 100644
index fa35e27..0000000
--- a/sys-block/fio/files/fio-2.0.14-pic-clobber-fix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -Nuar fio-2.0.14.orig/arch/arch-x86-common.h fio-2.0.14/arch/arch-x86-common.h
---- fio-2.0.14.orig/arch/arch-x86-common.h 2013-02-21 18:12:32.000000000 +0000
-+++ fio-2.0.14/arch/arch-x86-common.h 2013-03-27 01:48:04.000000000 +0000
-@@ -6,10 +6,24 @@
- static inline void do_cpuid(unsigned int *eax, unsigned int *ebx,
- unsigned int *ecx, unsigned int *edx)
- {
-+#ifdef __PIC__
-+ /* 32-bit Hardened GCC (PIC) uses register EBX, so it must be preserved
-+ * Fix ported from Gentoo's x86info-1.24-pic patch
-+ * http://tuxion.com/2010/07/02/clobber-registers.html */
-+ asm volatile(
-+ "movl %%ebx,%%edi\n"
-+ "cpuid\n"
-+ "movl %%ebx,%1\n"
-+ "movl %%edi,%%ebx\n"
-+ : "=a" (*eax), "=m" (*ebx), "=c" (*ecx), "=d" (*edx)
-+ : "0" (*eax), "2" (*ecx)
-+ : "memory", "%edi");
-+#else
- asm volatile("cpuid"
- : "=a" (*eax), "=b" (*ebx), "=c" (*ecx), "=d" (*edx)
- : "0" (*eax), "2" (*ecx)
- : "memory");
-+#endif
- }
-
- static inline void cpuid(unsigned int op,
-
diff --git a/sys-block/fio/files/fio-2.1.10-json.patch b/sys-block/fio/files/fio-2.1.10-json.patch
deleted file mode 100644
index 526be9b..0000000
--- a/sys-block/fio/files/fio-2.1.10-json.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From a606a802173272002e37be6475802be8c37481d6 Mon Sep 17 00:00:00 2001
-From: Puthikorn Voravootivat <puthik@chromium.org>
-Date: Tue, 24 Jun 2014 15:59:53 -0700
-Subject: [PATCH] Cast input argument for json_object_add_value_int to long
- long
-
-The latency related (and some other) variables type is uint32_t
-but the JSON integer type is long long. So we need to cast
-the numbers to long long type to make JSON output correctly.
-
-Signed-off-by: Puthikorn Voravootivat <puthik@chromium.org>
-Signed-off-by: Jens Axboe <axboe@fb.com>
----
- json.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/json.h b/json.h
-index 081afd6..962c11c 100644
---- a/json.h
-+++ b/json.h
-@@ -52,7 +52,7 @@ void json_free_object(struct json_object *obj);
-
- int json_object_add_value_type(struct json_object *obj, const char *name, int type, ...);
- #define json_object_add_value_int(obj, name, val) \
-- json_object_add_value_type((obj), name, JSON_TYPE_INTEGER, (val))
-+ json_object_add_value_type((obj), name, JSON_TYPE_INTEGER, (long long) (val))
- #define json_object_add_value_float(obj, name, val) \
- json_object_add_value_type((obj), name, JSON_TYPE_FLOAT, (val))
- #define json_object_add_value_string(obj, name, val) \
---
-2.0.0
-
diff --git a/sys-block/fio/fio-1.17.2.ebuild b/sys-block/fio/fio-1.17.2.ebuild
deleted file mode 100644
index 1c4de44..0000000
--- a/sys-block/fio/fio-1.17.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="Jens Axboe's Flexible IO tester"
-HOMEPAGE="http://brick.kernel.dk/snaps/"
-SRC_URI="http://brick.kernel.dk/snaps/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86"
-IUSE=""
-
-DEPEND="dev-libs/libaio"
-RDEPEND="${DEPEND}"
-
-src_compile() {
- append-flags -W
- emake CC="$(tc-getCC)" OPTFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
- emake install DESTDIR="${D}" prefix="/usr" || die "emake install failed"
- dodoc README REPORTING-BUGS HOWTO
- docinto examples
- dodoc examples/*
-}
diff --git a/sys-block/fio/fio-1.99.10.ebuild b/sys-block/fio/fio-1.99.10.ebuild
deleted file mode 100644
index 03ebe00..0000000
--- a/sys-block/fio/fio-1.99.10.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit eutils toolchain-funcs flag-o-matic
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jens Axboe's Flexible IO tester"
-HOMEPAGE="http://brick.kernel.dk/snaps/"
-SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/libaio"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- sed -i \
- -e '/filter /s:-o:$(LDFLAGS) -o:' \
- -e '/: depend$/d' \
- Makefile || die
-}
-
-src_compile() {
- append-flags -W
- emake CC="$(tc-getCC)" OPTFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
- emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man" || die "emake install failed"
- dodoc README REPORTING-BUGS HOWTO
- docinto examples
- dodoc examples/*
- doman fio.1
-}
diff --git a/sys-block/fio/fio-2.0.14-r1.ebuild b/sys-block/fio/fio-2.0.14-r1.ebuild
deleted file mode 100644
index 4791127..0000000
--- a/sys-block/fio/fio-2.0.14-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit toolchain-funcs flag-o-matic eutils
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jens Axboe's Flexible IO tester"
-HOMEPAGE="http://brick.kernel.dk/snaps/"
-SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ia64 ~ppc ppc64 x86"
-IUSE=""
-
-DEPEND="dev-libs/libaio"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- sed -i \
- -e '/filter /s:-o:$(LDFLAGS) -o:' \
- -e '/: depend$/d' \
- -e '/^DEBUGFLAGS/s, -D_FORTIFY_SOURCE=2,,g' \
- Makefile || die
- epatch "$FILESDIR"/fio-2.0.14-pic-clobber-fix.patch
-}
-
-src_configure() {
- chmod g-w "${T}"
- : # not a real configure script
- ./configure --extra-cflags="${CFLAGS}" --cc="$(tc-getCC)"
-}
-
-src_compile() {
- append-flags -W
- emake V=1
-}
-
-src_install() {
- emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man"
- dodoc README REPORTING-BUGS HOWTO
- docinto examples
- dodoc examples/*
- doman fio.1
-}
diff --git a/sys-block/fio/fio-2.0.15.ebuild b/sys-block/fio/fio-2.0.15.ebuild
deleted file mode 100644
index 628d378..0000000
--- a/sys-block/fio/fio-2.0.15.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit toolchain-funcs flag-o-matic eutils
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Write job files matching the I/O load one wants to simulate"
-HOMEPAGE="http://brick.kernel.dk/snaps/"
-SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/libaio"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- sed -i \
- -e '/filter /s:-o:$(LDFLAGS) -o:' \
- -e '/: depend$/d' \
- -e '/^DEBUGFLAGS/s, -D_FORTIFY_SOURCE=2,,g' \
- Makefile || die
- epatch "$FILESDIR"/fio-2.0.14-pic-clobber-fix.patch
-}
-
-src_configure() {
- chmod g-w "${T}"
- : # not a real configure script
- ./configure --extra-cflags="${CFLAGS}" --cc="$(tc-getCC)"
-}
-
-src_compile() {
- append-flags -W
- emake V=1
-}
-
-src_install() {
- emake install DESTDIR="${D}" prefix="/usr" mandir="/usr/share/man"
- dodoc README REPORTING-BUGS HOWTO
- docinto examples
- dodoc examples/*
- doman fio.1
-}
diff --git a/sys-block/fio/fio-2.1.9.ebuild b/sys-block/fio/fio-2.1.9.ebuild
deleted file mode 100644
index 07dc69d..0000000
--- a/sys-block/fio/fio-2.1.9.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-inherit eutils python-r1 toolchain-funcs
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jens Axboe's Flexible IO tester"
-HOMEPAGE="http://brick.kernel.dk/snaps/"
-SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="aio gnuplot gtk numa zlib"
-
-DEPEND="aio? ( dev-libs/libaio )
- gtk? (
- dev-libs/glib:2
- x11-libs/gtk+:2
- )
- numa? ( sys-process/numactl )
- zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}
- gnuplot? (
- sci-visualization/gnuplot
- ${PYTHON_DEPS}
- )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- sed -i '/^DEBUGFLAGS/s, -D_FORTIFY_SOURCE=2,,g' Makefile || die
- epatch_user
-
- # Many checks don't have configure flags.
- sed -i \
- -e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
- -e '/if compile_prog "" "-lz" "zlib" *; *then/ '"s::if $(usex zlib true false) ; then:" \
- -e '/if compile_prog "" "-laio" "libaio" ; then/'"s::if $(usex aio true false) ; then:" \
- configure || die
-}
-
-src_configure() {
- chmod g-w "${T}"
- # not a real configure script
- ./configure \
- --extra-cflags="${CFLAGS} ${CPPFLAGS}" \
- --cc="$(tc-getCC)" \
- $(usex gtk '--enable-gfio' '') \
- $(usex numa '' '--disable-numa') \
- || die 'configure failed'
-}
-
-src_compile() {
- emake V=1 OPTFLAGS=
-}
-
-src_install() {
- emake install DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir="${EPREFIX}/usr/share/man"
-
- if use gnuplot ; then
- python_replicate_script "${ED}/usr/bin/fio2gnuplot"
- else
- rm "${ED}"/usr/bin/{fio2gnuplot,fio_generate_plots} || die
- rm "${ED}"/usr/share/man/man1/{fio2gnuplot,fio_generate_plots}.1 || die
- rm "${ED}"/usr/share/fio/*.gpm || die
- rmdir "${ED}"/usr/share/fio/ 2>/dev/null
- fi
-
- # This tool has security/parallel issues -- it hardcodes /tmp/template.fio.
- rm "${ED}"/usr/bin/genfio || die
-
- dodoc README REPORTING-BUGS HOWTO
- docinto examples
- dodoc examples/*
-}
diff --git a/sys-block/fio/fio-2.2.4-r1.ebuild b/sys-block/fio/fio-2.2.4-r1.ebuild
deleted file mode 100644
index d645612..0000000
--- a/sys-block/fio/fio-2.2.4-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-inherit eutils python-r1 toolchain-funcs
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jens Axboe's Flexible IO tester"
-HOMEPAGE="http://brick.kernel.dk/snaps/"
-SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="aio glusterfs gnuplot gtk numa rbd rdma zlib"
-
-DEPEND="aio? ( dev-libs/libaio )
- glusterfs? ( sys-cluster/glusterfs )
- gtk? (
- dev-libs/glib:2
- x11-libs/gtk+:2
- )
- numa? ( sys-process/numactl )
- rbd? ( sys-cluster/ceph )
- zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}
- gnuplot? (
- sci-visualization/gnuplot
- ${PYTHON_DEPS}
- )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- sed -i '/^DEBUGFLAGS/s, -D_FORTIFY_SOURCE=2,,g' Makefile || die
- epatch_user
-
- # Many checks don't have configure flags.
- sed -i \
- -e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
- -e '/if compile_prog "" "-lz" "zlib" *; *then/ '"s::if $(usex zlib true false) ; then:" \
- -e '/if compile_prog "" "-laio" "libaio" ; then/'"s::if $(usex aio true false) ; then:" \
- configure || die
-}
-
-src_configure() {
- chmod g-w "${T}"
- # not a real configure script
- ./configure \
- --extra-cflags="${CFLAGS} ${CPPFLAGS}" \
- --cc="$(tc-getCC)" \
- $(usex glusterfs '' '--disable-gfapi') \
- $(usex gtk '--enable-gfio' '') \
- $(usex numa '' '--disable-numa') \
- $(usex rbd '' '--disable-rbd') \
- || die 'configure failed'
-}
-
-src_compile() {
- emake V=1 OPTFLAGS=
-}
-
-src_install() {
- emake install DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir="${EPREFIX}/usr/share/man"
-
- if use gnuplot ; then
- python_replicate_script "${ED}/usr/bin/fio2gnuplot"
- else
- rm "${ED}"/usr/bin/{fio2gnuplot,fio_generate_plots} || die
- rm "${ED}"/usr/share/man/man1/{fio2gnuplot,fio_generate_plots}.1 || die
- rm "${ED}"/usr/share/fio/*.gpm || die
- rmdir "${ED}"/usr/share/fio/ 2>/dev/null
- fi
-
- # This tool has security/parallel issues -- it hardcodes /tmp/template.fio.
- rm "${ED}"/usr/bin/genfio || die
-
- dodoc README REPORTING-BUGS HOWTO
- docinto examples
- dodoc examples/*
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-block/fio/files/, sys-block/fio/
@ 2020-07-04 18:45 Matthew Thode
0 siblings, 0 replies; 5+ messages in thread
From: Matthew Thode @ 2020-07-04 18:45 UTC (permalink / raw
To: gentoo-commits
commit: 871c6d66637b79f8b3652c1c7ce897cfaa0775bb
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 4 18:45:14 2020 +0000
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sat Jul 4 18:45:14 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=871c6d66
sys-block/fio: 3.20 fix gcc fno-common issue
backported patch from upstream
Closes: https://bugs.gentoo.org/730546
Package-Manager: Portage-2.3.99, Repoman-2.3.23
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>
sys-block/fio/files/fio-3.20-fno-common.patch | 51 +++++++++
sys-block/fio/fio-3.20-r1.ebuild | 157 ++++++++++++++++++++++++++
2 files changed, 208 insertions(+)
diff --git a/sys-block/fio/files/fio-3.20-fno-common.patch b/sys-block/fio/files/fio-3.20-fno-common.patch
new file mode 100644
index 00000000000..f7306bd6a09
--- /dev/null
+++ b/sys-block/fio/files/fio-3.20-fno-common.patch
@@ -0,0 +1,51 @@
+From 63a4b9cca4ba3aa4101051402cbbe946ced17a49 Mon Sep 17 00:00:00 2001
+From: Jens Axboe <axboe@kernel.dk>
+Date: Tue, 2 Jun 2020 08:20:03 -0600
+Subject: [PATCH] gfio: don't have multiple versions of main_ui
+
+Also comment a fall-through case appropriately, so newer GCC
+don't warn.
+
+Signed-off-by: Jens Axboe <axboe@kernel.dk>
+---
+ gfio.c | 4 +++-
+ gfio.h | 4 +++-
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/gfio.c b/gfio.c
+index 280539685..734651b67 100644
+--- a/gfio.c
++++ b/gfio.c
+@@ -38,6 +38,8 @@
+ #include "gclient.h"
+ #include "graph.h"
+
++struct gui main_ui;
++
+ static bool gfio_server_running;
+ static unsigned int gfio_graph_limit = 100;
+
+@@ -223,7 +225,7 @@ static void update_button_states(struct gui *ui, struct gui_entry *ge)
+ switch (ge->state) {
+ default:
+ gfio_report_error(ge, "Bad client state: %u\n", ge->state);
+- /* fall through to new state */
++ /* fall-through */
+ case GE_STATE_NEW:
+ connect_state = 1;
+ edit_state = 1;
+diff --git a/gfio.h b/gfio.h
+index aa14e3c7d..2bf0ea242 100644
+--- a/gfio.h
++++ b/gfio.h
+@@ -78,7 +78,9 @@ struct gui {
+ int handler_running;
+
+ GHashTable *ge_hash;
+-} main_ui;
++};
++
++extern struct gui main_ui;
+
+ enum {
+ GE_STATE_NEW = 1,
diff --git a/sys-block/fio/fio-3.20-r1.ebuild b/sys-block/fio/fio-3.20-r1.ebuild
new file mode 100644
index 00000000000..445de828e1e
--- /dev/null
+++ b/sys-block/fio/fio-3.20-r1.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit python-r1 toolchain-funcs
+
+MY_PV="${PV/_rc/-rc}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Jens Axboe's Flexible IO tester"
+HOMEPAGE="https://brick.kernel.dk/snaps/"
+SRC_URI="https://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="aio curl glusterfs gnuplot gtk libressl io-uring numa python rbd rdma static tcmalloc test zbc zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+ libressl? ( curl )
+ gnuplot? ( python )
+ io-uring? ( aio )"
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+
+# GTK+:2 does not offer static libaries.
+LIB_DEPEND="aio? ( dev-libs/libaio[static-libs(+)] )
+ curl? (
+ net-misc/curl:=[static-libs(+)]
+ !libressl? ( dev-libs/openssl:0=[static-libs(+)] )
+ libressl? ( dev-libs/libressl:0=[static-libs(+)] )
+ )
+ glusterfs? ( sys-cluster/glusterfs[static-libs(+)] )
+ gtk? ( dev-libs/glib:2[static-libs(+)] )
+ io-uring? ( sys-libs/liburing[static-libs(+)] )
+ numa? ( sys-process/numactl[static-libs(+)] )
+ rbd? ( sys-cluster/ceph[static-libs(+)] )
+ rdma? (
+ sys-fabric/libibverbs[static-libs(+)]
+ sys-fabric/librdmacm[static-libs(+)]
+ )
+ tcmalloc? ( dev-util/google-perftools:=[static-libs(+)] )
+ zbc? ( >=sys-block/libzbc-5 )
+ zlib? ( sys-libs/zlib[static-libs(+)] )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+ gtk? ( x11-libs/gtk+:2 )"
+DEPEND="${RDEPEND}
+ static? ( ${LIB_DEPEND} )
+ test? ( dev-util/cunit )"
+RDEPEND+="
+ python? (
+ ${PYTHON_DEPS}
+ $(python_gen_any_dep 'dev-python/pandas[${PYTHON_USEDEP}]')
+ )
+ gnuplot? ( sci-visualization/gnuplot )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}"/fio-2.2.13-libmtd.patch
+ "${FILESDIR}"/fio-3.20-fno-common.patch
+)
+
+python_check_deps() {
+ has_version "dev-python/pandas[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+ default
+
+ sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die
+
+ # Many checks don't have configure flags.
+ sed -i \
+ -e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
+ -e '/if compile_prog "" "-lzbc" "libzbc" *; *then/ '"s::if $(usex zbc true false) ; then:" \
+ -e '/if compile_prog "" "-lz" "zlib" *; *then/ '"s::if $(usex zlib true false) ; then:" \
+ -e '/if compile_prog "" "-laio" "libaio" *; *then/'"s::if $(usex aio true false) ; then:" \
+ -e '/if compile_prog "" "-lcunit" "CUnit" *; *then/'"s::if $(usex test true false) ; then:" \
+ configure || die
+}
+
+src_configure() {
+ chmod g-w "${T}"
+ # not a real configure script
+ # TODO: cuda
+ # TODO: libnbd - not packaged in Gentoo
+ # TODO: pmem - not packaged in Gentoo
+ set -- \
+ ./configure \
+ --disable-optimizations \
+ --extra-cflags="${CFLAGS} ${CPPFLAGS}" \
+ --cc="$(tc-getCC)" \
+ --disable-pmem \
+ $(usex curl '' '--disable-http') \
+ $(usex glusterfs '' '--disable-gfapi') \
+ $(usex gtk '--enable-gfio' '') \
+ $(usex io-uring '--enable-libaio-uring' '') \
+ $(usex numa '' '--disable-numa') \
+ $(usex rbd '' '--disable-rbd') \
+ $(usex rdma '' '--disable-rdma') \
+ $(usex static '--build-static' '') \
+ $(usex tcmalloc '' '--disable-tcmalloc')
+ echo "$@"
+ "$@" || die 'configure failed'
+}
+
+src_compile() {
+ emake V=1 OPTFLAGS=
+}
+
+src_install() {
+ emake install DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir="${EPREFIX}/usr/share/man"
+
+ local python2_7_files=(
+ "${ED}"/usr/bin/fiologparser_hist.py
+ "${ED}"/usr/bin/fiologparser.py
+ )
+ local python_files=(
+ "${python2_7_files[@]}"
+ "${ED}"/usr/bin/fio_jsonplus_clat2csv
+ )
+ if use python ; then
+ sed -i 's:python2.7:python:g' "${python2_7_files[@]}" || die
+ python_replicate_script "${python2_7_files[@]}"
+ else
+ rm "${python_files[@]}" || die
+ fi
+
+ local gnuplot_python2_7_files=(
+ "${ED}"/usr/bin/fio2gnuplot
+ )
+ local gnuplot_files=(
+ "${gnuplot_python2_7_files[@]}"
+ "${ED}"/usr/bin/fio_generate_plots
+ "${ED}"/usr/share/man/man1/fio_generate_plots.1
+ "${ED}"/usr/share/man/man1/fio2gnuplot.1
+ "${ED}"/usr/share/fio/*.gpm
+ )
+ if use gnuplot ; then
+ sed -i 's:python2.7:python:g' "${gnuplot_python2_7_files[@]}" || die
+ python_replicate_script "${gnuplot_python2_7_files[@]}"
+ else
+ rm "${gnuplot_files[@]}" || die
+ rmdir "${ED}"/usr/share/fio/ || die
+ fi
+
+ # This tool has security/parallel issues -- it hardcodes /tmp/template.fio.
+ rm "${ED}"/usr/bin/genfio || die
+
+ dodoc README REPORTING-BUGS HOWTO
+ docinto examples
+ dodoc examples/*
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-block/fio/files/, sys-block/fio/
@ 2017-03-01 5:41 Mike Frysinger
0 siblings, 0 replies; 5+ messages in thread
From: Mike Frysinger @ 2017-03-01 5:41 UTC (permalink / raw
To: gentoo-commits
commit: 67a1886bdb446cfcbfa82b1a3e9caa4b5c74bb73
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 1 05:31:19 2017 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Mar 1 05:40:55 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67a1886b
sys-block/fio: add a configure flag to control rdma deps #542640
sys-block/fio/files/fio-2.2.15-rdma.patch | 52 +++++++++++++++++++++++++++++++
sys-block/fio/fio-2.15.ebuild | 2 ++
sys-block/fio/fio-2.16.ebuild | 2 ++
3 files changed, 56 insertions(+)
diff --git a/sys-block/fio/files/fio-2.2.15-rdma.patch b/sys-block/fio/files/fio-2.2.15-rdma.patch
new file mode 100644
index 00000000000..3ca9198840e
--- /dev/null
+++ b/sys-block/fio/files/fio-2.2.15-rdma.patch
@@ -0,0 +1,52 @@
+From fd6d9c789bcb8b7c7b1edf34249e034094d341fc Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Tue, 28 Feb 2017 22:25:58 -0700
+Subject: [PATCH] configure: add a --disable-rdma flag to control rdma deps
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ configure | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index 15b87fac0e4c..187ac3583805 100755
+--- a/configure
++++ b/configure
+@@ -166,6 +166,8 @@ for opt do
+ ;;
+ --disable-numa) disable_numa="yes"
+ ;;
++ --disable-rdma) disable_rdma="yes"
++ ;;
+ --disable-rbd) disable_rbd="yes"
+ ;;
+ --disable-rbd-blkin) disable_rbd_blkin="yes"
+@@ -204,6 +206,7 @@ if test "$show_help" = "yes" ; then
+ echo "--esx Configure build options for esx"
+ echo "--enable-gfio Enable building of gtk gfio"
+ echo "--disable-numa Disable libnuma even if found"
++ echo "--disable-rdma Disable RDMA support even if found"
+ echo "--disable-gfapi Disable gfapi"
+ echo "--enable-libhdfs Enable hdfs support"
+ echo "--disable-lex Disable use of lex/yacc for math"
+@@ -642,7 +645,7 @@ int main(int argc, char **argv)
+ return 0;
+ }
+ EOF
+-if compile_prog "" "-libverbs" "libverbs" ; then
++if test "$disable_rdma" != "yes" && compile_prog "" "-libverbs" "libverbs" ; then
+ libverbs="yes"
+ LIBS="-libverbs $LIBS"
+ fi
+@@ -660,7 +663,7 @@ int main(int argc, char **argv)
+ return 0;
+ }
+ EOF
+-if compile_prog "" "-lrdmacm" "rdma"; then
++if test "$disable_rdma" != "yes" && compile_prog "" "-lrdmacm" "rdma"; then
+ rdmacm="yes"
+ LIBS="-lrdmacm $LIBS"
+ fi
+--
+2.11.1
+
diff --git a/sys-block/fio/fio-2.15.ebuild b/sys-block/fio/fio-2.15.ebuild
index 1158dbdae90..8080c1b7e60 100644
--- a/sys-block/fio/fio-2.15.ebuild
+++ b/sys-block/fio/fio-2.15.ebuild
@@ -40,6 +40,7 @@ S="${WORKDIR}/${MY_P}"
src_prepare() {
epatch "${FILESDIR}"/fio-2.2.13-libmtd.patch
+ epatch "${FILESDIR}"/fio-2.2.15-rdma.patch #542640
sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die
epatch_user
@@ -63,6 +64,7 @@ src_configure() {
$(usex gtk '--enable-gfio' '') \
$(usex numa '' '--disable-numa') \
$(usex rbd '' '--disable-rbd') \
+ $(usex rdma '' '--disable-rdma') \
$(usex static '--build-static' '')
echo "$@"
"$@" || die 'configure failed'
diff --git a/sys-block/fio/fio-2.16.ebuild b/sys-block/fio/fio-2.16.ebuild
index c57607e80a2..64a01dc145f 100644
--- a/sys-block/fio/fio-2.16.ebuild
+++ b/sys-block/fio/fio-2.16.ebuild
@@ -40,6 +40,7 @@ S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}"/fio-2.2.13-libmtd.patch
+ "${FILESDIR}"/fio-2.2.15-rdma.patch #542640
)
src_prepare() {
@@ -66,6 +67,7 @@ src_configure() {
$(usex gtk '--enable-gfio' '') \
$(usex numa '' '--disable-numa') \
$(usex rbd '' '--disable-rbd') \
+ $(usex rdma '' '--disable-rdma') \
$(usex static '--build-static' '')
echo "$@"
"$@" || die 'configure failed'
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-block/fio/files/, sys-block/fio/
@ 2016-04-20 17:02 Mike Frysinger
0 siblings, 0 replies; 5+ messages in thread
From: Mike Frysinger @ 2016-04-20 17:02 UTC (permalink / raw
To: gentoo-commits
commit: f5ab535e7e6329f24ecb4c8395fcd642e15aca2b
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 20 17:02:21 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Apr 20 17:02:27 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5ab535e
sys-block/fio: fix build w/newer glibc #580592
sys-block/fio/files/fio-2.8-sysmacros.patch | 47 +++++++++++++++++++++++++++++
sys-block/fio/fio-2.6.ebuild | 1 +
sys-block/fio/fio-2.8.ebuild | 1 +
3 files changed, 49 insertions(+)
diff --git a/sys-block/fio/files/fio-2.8-sysmacros.patch b/sys-block/fio/files/fio-2.8-sysmacros.patch
new file mode 100644
index 0000000..0881c1b
--- /dev/null
+++ b/sys-block/fio/files/fio-2.8-sysmacros.patch
@@ -0,0 +1,47 @@
+https://bugs.gentoo.org/580592
+
+From a254805d9ca1872adced3f8be2a053211b8f27eb Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Wed, 20 Apr 2016 12:51:23 -0400
+Subject: [PATCH] include sys/sysmacros.h for major/minor
+
+These functions have always been defined in sys/sysmacros.h under
+Linux C libraries. For some, including sys/types.h implicitly
+includes that as well, but glibc wants to deprecate that, and some
+others already have. Include the header explicitly for the funcs.
+
+The mtd change is already in upstream mtd-utils too.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ os/os-linux.h | 1 +
+ oslib/libmtd_common.h | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/os/os-linux.h b/os/os-linux.h
+index 9e708f0..23c16b6 100644
+--- a/os/os-linux.h
++++ b/os/os-linux.h
+@@ -6,6 +6,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/uio.h>
+ #include <sys/syscall.h>
++#include <sys/sysmacros.h>
+ #include <sys/vfs.h>
+ #include <sys/mman.h>
+ #include <unistd.h>
+diff --git a/oslib/libmtd_common.h b/oslib/libmtd_common.h
+index a123323..9768066 100644
+--- a/oslib/libmtd_common.h
++++ b/oslib/libmtd_common.h
+@@ -30,6 +30,7 @@
+ #include <errno.h>
+ #include <features.h>
+ #include <inttypes.h>
++#include <sys/sysmacros.h>
+
+ #ifndef PROGRAM_NAME
+ # error "You must define PROGRAM_NAME before including this header"
+--
+2.7.4
+
diff --git a/sys-block/fio/fio-2.6.ebuild b/sys-block/fio/fio-2.6.ebuild
index f7a5277..e66d13c 100644
--- a/sys-block/fio/fio-2.6.ebuild
+++ b/sys-block/fio/fio-2.6.ebuild
@@ -38,6 +38,7 @@ RDEPEND="${DEPEND}
S="${WORKDIR}/${MY_P}"
src_prepare() {
+ epatch "${FILESDIR}"/fio-2.8-sysmacros.patch #580592
epatch "${FILESDIR}"/fio-2.2.13-libmtd.patch
sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die
epatch_user
diff --git a/sys-block/fio/fio-2.8.ebuild b/sys-block/fio/fio-2.8.ebuild
index cc55989..cff874b 100644
--- a/sys-block/fio/fio-2.8.ebuild
+++ b/sys-block/fio/fio-2.8.ebuild
@@ -39,6 +39,7 @@ RDEPEND+="
S="${WORKDIR}/${MY_P}"
src_prepare() {
+ epatch "${FILESDIR}"/fio-2.8-sysmacros.patch #580592
epatch "${FILESDIR}"/fio-2.2.13-libmtd.patch
sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die
epatch_user
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-block/fio/files/, sys-block/fio/
@ 2016-02-03 16:32 Robin H. Johnson
0 siblings, 0 replies; 5+ messages in thread
From: Robin H. Johnson @ 2016-02-03 16:32 UTC (permalink / raw
To: gentoo-commits
commit: 27074e80a34f3ad5c66500b802bb940a844b7b16
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 3 16:32:14 2016 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Feb 3 16:32:38 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27074e80
sys-block/fio: fix bug 572446 caused by newer kernel headers, also version bump.
Package-Manager: portage-2.2.27
sys-block/fio/Manifest | 1 +
sys-block/fio/files/fio-2.2.10-libmtd.patch | 12 ++++++++++++
sys-block/fio/files/fio-2.2.13-libmtd.patch | 12 ++++++++++++
sys-block/fio/fio-2.2.10.ebuild | 1 +
sys-block/fio/fio-2.2.13.ebuild | 1 +
sys-block/fio/fio-2.5.ebuild | 1 +
sys-block/fio/{fio-2.2.10.ebuild => fio-2.6.ebuild} | 1 +
7 files changed, 29 insertions(+)
diff --git a/sys-block/fio/Manifest b/sys-block/fio/Manifest
index 5fca220..f53ae8f 100644
--- a/sys-block/fio/Manifest
+++ b/sys-block/fio/Manifest
@@ -8,3 +8,4 @@ DIST fio-2.2.13.tar.bz2 503950 SHA256 66a0084c37bd8804d9f7d260d843a9a3bf51561954
DIST fio-2.2.4.tar.bz2 467312 SHA256 9e1c77216457d9e21e418a55fa28bc1f98c283723fe9dcccff6138e3fb25285b SHA512 91fa0d8f9dd8d950dd26ef5c778414acddd9d6deeb84caeecdfef08df7e00c7972566a76bd242b0d5aea33a7c588aa05cf2fdcd79ef5a475277a2139d1f111a1 WHIRLPOOL 4588601d5f44c1836f97cc223bf08cce3f29f5ea3421880c00a16dcd9e3cffd741bbdd2029518712f8808548469d7f44f1b0348189643419bfd2104eab980536
DIST fio-2.2.9.tar.bz2 492404 SHA256 c881d9cf15500bd4436970d0467c356c5c021417131587931ba78845e965bf56 SHA512 e0cd26bb8a760ef5e40ddb73246671c1988f0c0886bd24fa510fcab93fe64d8853f120355f55fa109168c7fae0b081f63278f2233644f5ed20da4e4c3cb3f3fc WHIRLPOOL 4f5ada7f1140c7229fc3173fa0582a4ae7401121768d8dec828dcd42c1c22ec828e9c000c482b155ead4fd75ee15c4d7678fc7c6d18c8fbb9c749e83f87a4881
DIST fio-2.5.tar.bz2 509978 SHA256 30f85cd6596125bd2f76b379f15a4edee1149bb0347a9c10a2dda15d7591a543 SHA512 44fc4bc342b611f9ed89685d73592389dd9e63970a9bbcc1b332aa8434a3e4a52b0c16d27b6a6dd96fcf3a9831a68af5249251895a6dbd9f7190ad0b8935eb40 WHIRLPOOL dced416aae899987ff80c6f37999a064d8a45c8ea809d7a3f3a2eea5dd3b6ae5633125326373a5da3b37429dc940f0c97fa9694e976a61819709db3b6ab7ac3e
+DIST fio-2.6.tar.bz2 509685 SHA256 b4b846fca614f724b8315348cb23e2d4a1046e63f10e79b4b310acf29c4d1ac0 SHA512 9831c3de2110c509f6c99ffe0fc8256aea2b9b337e6b2799108c89d1b5e472a85e6df9cb090549db80429658717aa75f2ab10d41359386e1dde861c600645b39 WHIRLPOOL c5138eb2def4c67ee0d5cca46db6aa663e2a1e0eead05aab5938ced20dd68bc214f217724d3bd1c4a1030b4ffee2c07ee37910b57c6f11b2ed6a0ff67d3b30cc
diff --git a/sys-block/fio/files/fio-2.2.10-libmtd.patch b/sys-block/fio/files/fio-2.2.10-libmtd.patch
new file mode 100644
index 0000000..7e0a0c0
--- /dev/null
+++ b/sys-block/fio/files/fio-2.2.10-libmtd.patch
@@ -0,0 +1,12 @@
+diff -Nuar --exclude config.log fio-2.2.10/lib/libmtd.h fio-2.2.10.new/lib/libmtd.h
+--- fio-2.2.10/lib/libmtd.h 2016-01-26 18:02:07.000000000 -0800
++++ fio-2.2.10.new/lib/libmtd.h 2016-02-03 08:10:19.104693006 -0800
+@@ -29,6 +29,8 @@
+ extern "C" {
+ #endif
+
++#include <stdint.h>
++
+ /* Maximum MTD device name length */
+ #define MTD_NAME_MAX 127
+ /* Maximum MTD device type string length */
diff --git a/sys-block/fio/files/fio-2.2.13-libmtd.patch b/sys-block/fio/files/fio-2.2.13-libmtd.patch
new file mode 100644
index 0000000..7ab9a96
--- /dev/null
+++ b/sys-block/fio/files/fio-2.2.13-libmtd.patch
@@ -0,0 +1,12 @@
+diff -Nuar --exclude config.log fio-2.2.13/oslib/libmtd.h fio-2.2.13.new/oslib/libmtd.h
+--- fio-2.2.13/oslib/libmtd.h 2016-01-26 18:02:07.000000000 -0800
++++ fio-2.2.13.new/oslib/libmtd.h 2016-02-03 08:10:19.104693006 -0800
+@@ -29,6 +29,8 @@
+ extern "C" {
+ #endif
+
++#include <stdint.h>
++
+ /* Maximum MTD device name length */
+ #define MTD_NAME_MAX 127
+ /* Maximum MTD device type string length */
diff --git a/sys-block/fio/fio-2.2.10.ebuild b/sys-block/fio/fio-2.2.10.ebuild
index 1d6b7d4..27c39cd 100644
--- a/sys-block/fio/fio-2.2.10.ebuild
+++ b/sys-block/fio/fio-2.2.10.ebuild
@@ -38,6 +38,7 @@ RDEPEND="${DEPEND}
S="${WORKDIR}/${MY_P}"
src_prepare() {
+ epatch "${FILESDIR}"/fio-2.2.10-libmtd.patch
sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die
epatch_user
diff --git a/sys-block/fio/fio-2.2.13.ebuild b/sys-block/fio/fio-2.2.13.ebuild
index 1d6b7d4..f7a5277 100644
--- a/sys-block/fio/fio-2.2.13.ebuild
+++ b/sys-block/fio/fio-2.2.13.ebuild
@@ -38,6 +38,7 @@ RDEPEND="${DEPEND}
S="${WORKDIR}/${MY_P}"
src_prepare() {
+ epatch "${FILESDIR}"/fio-2.2.13-libmtd.patch
sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die
epatch_user
diff --git a/sys-block/fio/fio-2.5.ebuild b/sys-block/fio/fio-2.5.ebuild
index 1d6b7d4..f7a5277 100644
--- a/sys-block/fio/fio-2.5.ebuild
+++ b/sys-block/fio/fio-2.5.ebuild
@@ -38,6 +38,7 @@ RDEPEND="${DEPEND}
S="${WORKDIR}/${MY_P}"
src_prepare() {
+ epatch "${FILESDIR}"/fio-2.2.13-libmtd.patch
sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die
epatch_user
diff --git a/sys-block/fio/fio-2.2.10.ebuild b/sys-block/fio/fio-2.6.ebuild
similarity index 98%
copy from sys-block/fio/fio-2.2.10.ebuild
copy to sys-block/fio/fio-2.6.ebuild
index 1d6b7d4..f7a5277 100644
--- a/sys-block/fio/fio-2.2.10.ebuild
+++ b/sys-block/fio/fio-2.6.ebuild
@@ -38,6 +38,7 @@ RDEPEND="${DEPEND}
S="${WORKDIR}/${MY_P}"
src_prepare() {
+ epatch "${FILESDIR}"/fio-2.2.13-libmtd.patch
sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die
epatch_user
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-07-04 18:45 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-20 17:02 [gentoo-commits] repo/gentoo:master commit in: sys-block/fio/files/, sys-block/fio/ Mike Frysinger
-- strict thread matches above, loose matches on Subject: below --
2020-07-04 18:45 Matthew Thode
2017-03-01 5:41 Mike Frysinger
2016-04-20 17:02 Mike Frysinger
2016-02-03 16:32 Robin H. Johnson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox