From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A3051138350 for ; Tue, 4 Feb 2020 19:13:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DB6F6E0870; Tue, 4 Feb 2020 19:13:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AC4DDE0870 for ; Tue, 4 Feb 2020 19:13:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BB83034E75E for ; Tue, 4 Feb 2020 19:13:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4BD428F for ; Tue, 4 Feb 2020 19:13:54 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1580843624.17cf8d112e79748a8116d05077aaf84790fe2c0f.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/arch/x86/, profiles/arch/base/, profiles/arch/amd64/, sys-block/fio/ X-VCS-Repository: repo/gentoo X-VCS-Files: profiles/arch/amd64/package.use.mask profiles/arch/base/package.use.mask profiles/arch/x86/package.use.mask sys-block/fio/fio-3.17-r1.ebuild X-VCS-Directories: profiles/arch/x86/ profiles/arch/amd64/ profiles/arch/base/ sys-block/fio/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 17cf8d112e79748a8116d05077aaf84790fe2c0f X-VCS-Branch: master Date: Tue, 4 Feb 2020 19:13:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2422cdc4-18d8-44fa-8ac5-ff3c0938ab99 X-Archives-Hash: 7c5929c5afc32f161a5bd359ae0c8ba8 commit: 17cf8d112e79748a8116d05077aaf84790fe2c0f Author: Trent Begin gmail com> AuthorDate: Thu Jan 30 19:22:53 2020 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Tue Feb 4 19:13:44 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17cf8d11 sys-block/fio: add python USE flag Closes: https://bugs.gentoo.org/705694 Signed-off-by: Trent Begin gmail.com> Signed-off-by: Mike Frysinger gentoo.org> profiles/arch/amd64/package.use.mask | 2 +- profiles/arch/base/package.use.mask | 2 +- profiles/arch/x86/package.use.mask | 2 +- sys-block/fio/fio-3.17-r1.ebuild | 147 +++++++++++++++++++++++++++++++++++ 4 files changed, 150 insertions(+), 3 deletions(-) diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask index 301ed55a9fc..1aa47f01a54 100644 --- a/profiles/arch/amd64/package.use.mask +++ b/profiles/arch/amd64/package.use.mask @@ -23,7 +23,7 @@ app-emulation/aranym -jit # Thomas Deutschmann (2019-11-11) # dev-python/pandas is keyworded for amd64 -sys-block/fio -gnuplot +sys-block/fio -python -gnuplot # Craig Andrews (2019-10-08) # net-misc/quiche is available on this arch diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask index 884bf63c8e9..2fb2145ebad 100644 --- a/profiles/arch/base/package.use.mask +++ b/profiles/arch/base/package.use.mask @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # dev-python/pandas is only keyworded for amd64 & x86 -sys-block/fio gnuplot +sys-block/fio python gnuplot # Craig Andrews (2019-10-08) # net-libs/quiche is not available on all arches diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask index 01bd5c47796..fcdb7cb7a8d 100644 --- a/profiles/arch/x86/package.use.mask +++ b/profiles/arch/x86/package.use.mask @@ -23,7 +23,7 @@ media-video/vlc -libplacebo # Thomas Deutschmann (2019-11-11) # dev-python/pandas is keyworded for x86 -sys-block/fio -gnuplot +sys-block/fio -python -gnuplot # Luke Dashjr (2019-09-21) # iasl is stable on x86 diff --git a/sys-block/fio/fio-3.17-r1.ebuild b/sys-block/fio/fio-3.17-r1.ebuild new file mode 100644 index 00000000000..87a629536db --- /dev/null +++ b/sys-block/fio/fio-3.17-r1.ebuild @@ -0,0 +1,147 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PYTHON_COMPAT=( python2_7 python3_6 ) + +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 numa python rbd rdma static tcmalloc zlib" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) + libressl? ( curl ) + gnuplot? ( python )" + +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(+)] ) + 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(+)] ) + zlib? ( sys-libs/zlib[static-libs(+)] )" +RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) + gtk? ( x11-libs/gtk+:2 )" +DEPEND="${RDEPEND} + static? ( ${LIB_DEPEND} )" +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.16-verify_only_numberio.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:\:$(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 + # TODO: pmem + 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 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/* +}