[gentoo-commits] repo/gentoo:master commit in: sys-block/blktrace/files/

2018-07-11 Thread Tony Vroon 
commit: ec4ad9b54ab14c22e8b215f2f8be878e49cefae1
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Sun Jul  8 08:14:35 2018 +
Commit: Tony Vroon  gentoo  org>
CommitDate: Wed Jul 11 11:37:25 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec4ad9b5

sys-block/blktrace: remove unused patch

 .../blktrace-1.0.1-ldflags-parallel-make.patch | 91 --
 1 file changed, 91 deletions(-)

diff --git 
a/sys-block/blktrace/files/blktrace-1.0.1-ldflags-parallel-make.patch 
b/sys-block/blktrace/files/blktrace-1.0.1-ldflags-parallel-make.patch
deleted file mode 100644
index 40c7d97d5de..000
--- a/sys-block/blktrace/files/blktrace-1.0.1-ldflags-parallel-make.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-diff -Nuar blktrace-1.0.1.orig/btreplay/Makefile 
blktrace-1.0.1/btreplay/Makefile
 blktrace-1.0.1.orig/btreplay/Makefile  2009-05-11 12:00:10.0 
+
-+++ blktrace-1.0.1/btreplay/Makefile   2011-02-03 03:01:41.161365886 +
-@@ -32,10 +32,10 @@
-   $(CC) $(CFLAGS) -c -o $*.o $<
- 
- btrecord: btrecord.o
--  $(CC) $(CFLAGS) -o $@ $(filter %.o,$^)
-+  $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^)
- 
- btreplay: btreplay.o
--  $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
-+  $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
- 
- depend:
-   @$(CC) -MM $(CFLAGS) *.c 1> .depend
-diff -Nuar blktrace-1.0.1.orig/btt/Makefile blktrace-1.0.1/btt/Makefile
 blktrace-1.0.1.orig/btt/Makefile   2009-05-11 12:00:10.0 +
-+++ blktrace-1.0.1/btt/Makefile2011-02-03 03:01:41.161365886 +
-@@ -38,7 +38,7 @@
-   $(CC) $(CFLAGS) -c -o $*.o $<
- 
- btt: $(OBJS)
--  $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
-+  $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
- 
- ifneq ($(wildcard .depend),)
- include .depend
-diff -Nuar blktrace-1.0.1.orig/Makefile blktrace-1.0.1/Makefile
 blktrace-1.0.1.orig/Makefile   2009-05-11 12:00:10.0 +
-+++ blktrace-1.0.1/Makefile2011-02-03 03:03:32.713725832 +
-@@ -4,38 +4,35 @@
- PROGS = blkparse blktrace verify_blkparse blkrawverify blkiomon
- LIBS  = -lpthread
- SCRIPTS   = btrace
-+SUBDIRS = btreplay btt
- 
--ALL = $(PROGS) $(SCRIPTS) btt/btt btreplay/btrecord btreplay/btreplay \
-+ALL = $(PROGS) $(SCRIPTS)
-+INSTALL_ALL = $(ALL) btt/btt btreplay/btrecord btreplay/btreplay \
-   btt/bno_plot.py
- 
--all: $(ALL)
-+all: $(ALL) $(SUBDIRS)
-+.PHONY: $(SUBDIRS)
- 
--btt/btt:
--  $(MAKE) -C btt
--
--btreplay/btrecord:
--  $(MAKE) -C btreplay
--
--btreplay/btreplay:
--  $(MAKE) -C btreplay
-+$(SUBDIRS): $(PROGS)
-+  $(MAKE) -C $@
- 
- %.o: %.c
-   $(CC) -o $*.o -c $(ALL_CFLAGS) $<
- 
- blkparse: blkparse.o blkparse_fmt.o rbtree.o act_mask.o
--  $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^)
-+  $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^)
- 
- blktrace: blktrace.o act_mask.o
--  $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
-+  $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
- 
- verify_blkparse: verify_blkparse.o
--  $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^)
-+  $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^)
- 
- blkrawverify: blkrawverify.o
--  $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^)
-+  $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^)
- 
- blkiomon: blkiomon.o rbtree.o
--  $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) -lrt
-+  $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS) -lrt
- 
- $(PROGS): | depend
- 
-@@ -81,7 +78,7 @@
-   $(INSTALL) -m 755 -d $(DESTDIR)$(bindir)
-   $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1
-   $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man8
--  $(INSTALL) -m 755 $(ALL) $(DESTDIR)$(bindir)
-+  $(INSTALL) -m 755 $(INSTALL_ALL) $(DESTDIR)$(bindir)
-   $(INSTALL) -m 644 doc/*.1 $(DESTDIR)$(mandir)/man1
-   $(INSTALL) -m 644 doc/*.8 $(DESTDIR)$(mandir)/man8
-

[gentoo-commits] repo/gentoo:master commit in: sys-block/blktrace/files/, sys-block/blktrace/

2018-01-23 Thread Mike Frysinger 
commit: e7bbdf12131702c78cdeb20ef55ecbb6796af3f0
Author: Mike Frysinger  chromium  org>
AuthorDate: Tue Jan 23 23:02:25 2018 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Tue Jan 23 23:02:36 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7bbdf12

sys-block/blktrace: version bump to 1.2.0

 sys-block/blktrace/Manifest|  1 +
 sys-block/blktrace/blktrace-1.2.0.ebuild   | 53 +
 .../blktrace/files/blktrace-1.2.0-ldflags.patch| 89 ++
 .../blktrace-1.2.0-overlapping-io-stats.patch  | 68 +
 .../files/blktrace-1.2.0-parallel-build.patch  | 71 +
 5 files changed, 282 insertions(+)

diff --git a/sys-block/blktrace/Manifest b/sys-block/blktrace/Manifest
index fa4a5450133..9180af75b9a 100644
--- a/sys-block/blktrace/Manifest
+++ b/sys-block/blktrace/Manifest
@@ -1,2 +1,3 @@
 DIST blktrace-1.0.3.tar.bz2 359325 BLAKE2B 
c776fe0445eadbb2d077435626e6ffdd330ba2f49d053bfd247ed7f421b9bd588d38acd32133ebac69e0fc63f165fe0e6b3324bf8313a14000cf02e3a5e735cf
 SHA512 
f20a33b5309146304277a5f8a4c7f2c61e804b2caa5c62d00425ef26fcd1cd628521067b2502d05c368e10d2cd38a98c246030705ba358f835e8a6921444f9a5
 DIST blktrace-1.1.0.tar.bz2 395445 BLAKE2B 
8a19142991527813942e6377baa5de825572196e75ea43606f2ae2db73d9278c8178f104910ecd92593a70fe9c86c36ebd718e09599e88824f5faaddca5bd7cd
 SHA512 
52ed3b66e1ec62c2204d44037d4d13218fd0229ae694493a21f1e83bfc8aeb029edc96b2be83f39cc3e79500abad56cd5a71c8c4e6dd836661777662f3628355
+DIST blktrace-1.2.0.tar.bz2 395193 BLAKE2B 
8f8505f27985f0451f75ced0e438a88758482227e83ba8de235986ab3f116cf38d5aec340d1e7ce3dc3aa5a97c0bd4c46265687976e7326a54ea2e7cce4afc82
 SHA512 
ce82c8010ca5c2868746d8eb7c6a107fc7382c05df949eeff79e612f5b1a98301a5aa5ab39de0766ea1c074f95e378ba985401cbeba9a296e3182da7d7a23b86

diff --git a/sys-block/blktrace/blktrace-1.2.0.ebuild 
b/sys-block/blktrace/blktrace-1.2.0.ebuild
new file mode 100644
index 000..063a913b54b
--- /dev/null
+++ b/sys-block/blktrace/blktrace-1.2.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs flag-o-matic linux-info
+
+MY_PN="blktrace"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="show detailed info about what is happening on a block device io 
queue"
+HOMEPAGE="http://git.kernel.dk/cgit/blktrace/";
+SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="doc"
+
+RDEPEND="dev-libs/libaio"
+# This is a Linux specific app!
+DEPEND="${RDEPEND}
+   sys-kernel/linux-headers
+   doc? (
+   virtual/latex-base
+   || ( >=app-text/texlive-core-2014 app-text/dvipdfm )
+   )
+"
+S="${WORKDIR}/${MY_P}"
+
+CONFIG_CHECK="~BLK_DEV_IO_TRACE"
+WARNING_BLK_DEV_IO_TRACE="you need to enable BLK_DEV_IO_TRACE kernel option if 
you want to gather traces from this machine"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-overlapping-io-stats.patch
+   "${FILESDIR}"/${PN}-1.2.0-ldflags.patch #335741
+   "${FILESDIR}"/${PN}-1.2.0-parallel-build.patch #335741
+)
+
+src_compile() {
+   append-cppflags -DLVM_REMAP_WORKAROUND -W -I"${S}"
+   emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${CPPFLAGS}"
+   if use doc; then
+   export VARTEXFONTS="${T}/fonts"
+   emake docs
+   fi
+}
+
+src_install() {
+   emake install DESTDIR="${ED}" prefix="/usr" mandir="/usr/share/man"
+   einstalldocs
+   use doc && dodoc doc/blktrace.pdf btt/doc/btt.pdf
+}

diff --git a/sys-block/blktrace/files/blktrace-1.2.0-ldflags.patch 
b/sys-block/blktrace/files/blktrace-1.2.0-ldflags.patch
new file mode 100644
index 000..b8e2aebfff4
--- /dev/null
+++ b/sys-block/blktrace/files/blktrace-1.2.0-ldflags.patch
@@ -0,0 +1,89 @@
+http://git.kernel.dk/?p=blktrace.git;a=commit;h=d1398e339585f6750f7158c50c98861b68dddc8b
+
+From 6d8c3d7a10f62b26514a56b25a3744c5f35219a6 Mon Sep 17 00:00:00 2001
+From: "Robin H. Johnson" 
+Date: Tue, 23 Jan 2018 17:40:48 -0500
+Subject: [PATCH] respect LDFLAGS when linking programs
+
+---
+ Makefile   | 10 +-
+ btreplay/Makefile  |  4 ++--
+ btt/Makefile   |  2 +-
+ iowatcher/Makefile |  2 +-
+ 4 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index fdbded02ee0a..68de59183a73 100644
+--- a/Makefile
 b/Makefile
+@@ -26,19 +26,19 @@ btreplay/btreplay:
+   $(CC) -o $*.o -c $(ALL_CFLAGS) $<
+ 
+ blkparse: blkparse.o blkparse_fmt.o rbtree.o act_mask.o
+-  $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^)
++  $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^)
+ 
+ blktrace: blktrace.o act_mask.o
+-  $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
++  $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
+ 
+ verify_blkparse: verify_blkparse.o
+-  $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^)
++