Revamp the parallel build improvements. Bug #335741: respect LDFLAGS. Bug #348281: Fix USE=doc building missing DEPEND. Bug #269121: Remove old versions where SRC_URI is no longer valid.

Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64

9 files changed, 128 insertions, 132 deletions

diff --git a/sys-block/btrace/ChangeLog b/sys-block/btrace/ChangeLog
index 08f928be6f0b..3fd52b53d62b 100644
--- a/sys-block/btrace/ChangeLog
+++ b/sys-block/btrace/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-block/btrace
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/btrace/ChangeLog,v 1.18 2011/01/25 04:29:56 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/btrace/ChangeLog,v 1.19 2011/02/03 03:07:06 robbat2 Exp $
+
+*btrace-1.0.1-r1 (03 Feb 2011)
+
+  03 Feb 2011; Robin H. Johnson <robbat2@gentoo.org>
+  -btrace-0.0.20060428050322.ebuild, -btrace-0.0.20060614042007.ebuild,
+  -btrace-0.0.20070730162628.ebuild, -btrace-0.99.3.ebuild,
+  btrace-1.0.0.ebuild, btrace-1.0.1.ebuild, +btrace-1.0.1-r1.ebuild,
+  +files/btrace-1.0.1-ldflags-parallel-make.patch:
+  Revamp the parallel build improvements. Bug #335741: respect LDFLAGS. Bug
+  #348281: Fix USE=doc building missing DEPEND. Bug #269121: Remove old
+  versions where SRC_URI is no longer valid.
 
 *btrace-1.0.1 (25 Jan 2011)
 
diff --git a/sys-block/btrace/Manifest b/sys-block/btrace/Manifest
index 2e4efc109418..550bddad73c3 100644
--- a/sys-block/btrace/Manifest
+++ b/sys-block/btrace/Manifest
@@ -1,17 +1,11 @@
 AUX btrace-1.0.0-parallel-make.patch 414 RMD160 2383be0d7bff790c8234ef6e7c3c2f652330dcfd SHA1 1e8b154854400ad6a8929016895df38c008ea93e SHA256 defde4bfbccdb89ef62bbacea559a9b3f603c3faba98ee84877ec9038500ebd5
-DIST blktrace-0.99.3.tar.bz2 1327983 RMD160 7451bbe58de3e5fd2cc1d87df5fb399e245046b9 SHA1 aa4b7ae57a6bea5bd8e188ff63b1b20a1303c14f SHA256 5e8d6c6c6f0d93b2bf73f773145233298630491710477fc46b87abc0a12474df
+AUX btrace-1.0.1-ldflags-parallel-make.patch 2951 RMD160 d752a66b9e62b8af5a8a7ad2168fb17ac2744137 SHA1 2255b5d21b6be5a7c29625bf903ea0dee300cb63 SHA256 9538c79943a4179e8344c6c27fe2e5297c585ea7595f9db0a1737740359bc593
 DIST blktrace-1.0.0.tar.bz2 1592300 RMD160 0457cbc3cb3dc34e0ee1cd6e01ddd670d8a5357a SHA1 30695437c11d1f4de20fe06e7588fe318c883809 SHA256 fb220463f55aaa6ead931991e2f7f6ddae18faaf5bfa65fe42f502a27afa0abf
 DIST blktrace-1.0.1.tar.bz2 292208 RMD160 94139c72b4531177c4366a80132565423043975b SHA1 5a792df60a9fec9a4e52071f695aa0ad1f6229a5 SHA256 fdd1481a69f14b916f8d835203c1189ee3076d4a5ff88163b6e6b1f27b087f6d
-DIST blktrace-20060428050322.tar.bz2 69289 RMD160 ae961b79f88d839dcf020df5932251507038759c SHA1 3de9e39bcb679c286f06d0200b1ee396e3f9aec5 SHA256 fc823e755450cfa512982cd7e9eb949d1e2f3a1daaabf41a9ef55bd178095f44
-DIST blktrace-20060614042007.tar.bz2 80884 RMD160 94c8794b4835f8ae33cae50579d260b4e5d4e1de SHA1 b261212eae9cfede0d923a6e13aa720409f8a5f2 SHA256 719bb315fee2e009577158d420fd282edf7ad2c5a9dbdb406fd2742c996f838d
-DIST blktrace-git-20070730162628.tar.gz 1119872 RMD160 11c66d61a6861e5585f0ddb433a508d5da1d3dc5 SHA1 fab0a026907462fc89991ba055ea11fff0f9a02c SHA256 70aa39a254b6c4007e5f184829a5fb7cae354efbf6801883f49853519a02cf99
 DIST blktrace-git-20071210202527.tar.gz 1163998 RMD160 082bc7f2aaa8f1a9e01a9d43faec096f45aba289 SHA1 95f3c3655f76f797c0f1dfeaba6c4c4e74236d10 SHA256 9ee49c80f0a0c1442edfa66faf9cd32c561d0c2e8855ca808d15ed53d2a7aed2
-EBUILD btrace-0.0.20060428050322.ebuild 1147 RMD160 b0b32b4e2867f62e8dfc37dbc6bee1d70d410a20 SHA1 d0bb72310618f9c410d242a1a51493a272d58e1e SHA256 8c527125de2fd20e4a3b71ef465d83de651b3e7f9972b0d2538facdc9a229682
-EBUILD btrace-0.0.20060614042007.ebuild 1206 RMD160 3cb8636259c8f0f066b749ae961a5fae1fb08822 SHA1 78765fe842c42a58fedea5d999fa3cda47a5ad2b SHA256 b9fb0e9081b08ed12ed603ff0d5f144c8e6e2f2fca0e04b7b35cd9193a112824
-EBUILD btrace-0.0.20070730162628.ebuild 1194 RMD160 bd8f704334bfab52d8b0bcf9a240a966e40b5fe8 SHA1 63dd9d52fbcafd92e3274a4480a1ed40752da6a5 SHA256 7be5737c170eadaa06f31d6ebe28c4d37959b25a6c465f78a5e6473a0f1e2bb8
 EBUILD btrace-0.0.20071210202527.ebuild 1233 RMD160 e55e8e2f06a35a6abea5c43a7da31d05315cb21f SHA1 9089bacc2211c539ca6e0ef4f525d069e6b367df SHA256 ad77eb65cf1bd42e40d094ce92442a8e719cb67961a9d4345750242fb6d7789b
-EBUILD btrace-0.99.3.ebuild 1163 RMD160 0d074630ae5ef3342de22a1f91abe0511c3e83e6 SHA1 74d320d36d5b72a2a9be76fb7b8a84f8873f5a6b SHA256 b100dd107a22c49c9f2f83d8c8dbed750fe206d70194112546cf8a9d3558be84
-EBUILD btrace-1.0.0.ebuild 1450 RMD160 4b4ecd7eb8c36ca4be17dc6d8c0cdb7ce15b9eef SHA1 e41bc87ad59b2700350859be63029c974693eed1 SHA256 510485e484e05fe1b8a90493ba0e424b185ad72c6a8419fa93f48b767cddec6c
-EBUILD btrace-1.0.1.ebuild 1478 RMD160 dbec13cd1db4e0345c9d4c3b87a8d37c4e4da305 SHA1 229a2ceb67e703efc5dbfe04f3c60cbb82c8274a SHA256 d3a1c9836706f569625fe7069ed18c27b3f279198df1f64793136a9bc25218ed
-MISC ChangeLog 3062 RMD160 451bdb959cdb46f286549f0f5b5ea04a87b67e9a SHA1 3d1556b2694edb80e363314db37811f694641890 SHA256 1b91ffadec501d6417354e89edd64b501e40cd37da15f5c6fb653788c316edf8
+EBUILD btrace-1.0.0.ebuild 1467 RMD160 c0ace08e2d8da2b70b66da2b067a5d0f93718f53 SHA1 8b922ecfd22dc41c36ed9c01da7e43f18d00f579 SHA256 8853065e6bd34f47055e2cc117322afc55b376b7a2f3e095f7a03336420e73d9
+EBUILD btrace-1.0.1-r1.ebuild 1473 RMD160 20391c5887a24d4e95e7a8c8c60ccda2787f654a SHA1 199a4fc54ca22b1a436ce96ecc223b95b85bd0ff SHA256 a194cb3a7ec8674652fed125f4bbe86d62fe144cd21e83c1345c290ece16e9d3
+EBUILD btrace-1.0.1.ebuild 1495 RMD160 f3d5f3a9fd5ed7bae9827c87735be9bb8dce4e81 SHA1 99f1d4f710298804ec83fca024e90bab25ead62c SHA256 5399ccf1e2446b6d2c25ff96cecf352ead813fdacb7655dca462ad49f2562c2f
+MISC ChangeLog 3593 RMD160 137a72896d5d79ffec10a2893562d09ceea19a50 SHA1 9d64d9803efced4b0d8428b6e5ed0e508d7a9eb0 SHA256 df38ec285bd2b9cc5abc1a16e0fd44a7bb7c2691199a67106e2d011894eccee4
 MISC metadata.xml 223 RMD160 ffa99612cf27469c417944deed0e0c9155e64331 SHA1 607c637402dd253406aa6ee684471a702c5d1a99 SHA256 d6bb9ba68629616062b4433ab3b8fb01dfcafae5bb47804d9e06cdd6c66daa44
diff --git a/sys-block/btrace/btrace-0.0.20060428050322.ebuild b/sys-block/btrace/btrace-0.0.20060428050322.ebuild
deleted file mode 100644
index d0b42e909a3d..000000000000
--- a/sys-block/btrace/btrace-0.0.20060428050322.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/btrace/btrace-0.0.20060428050322.ebuild,v 1.6 2009/09/23 20:29:31 patrick Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="btrace can show detailed info about what is happening on a block device io queue."
-HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/axboe/blktrace/"
-# this is in case Jens ever releases a real version
-MY_PV="${PV/0.0.}"
-MY_PN="blktrace"
-MY_P="${MY_PN}-${MY_PV}"
-SRC_URI="mirror://kernel/linux/kernel/people/axboe/${MY_PN}/${MY_P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE="doc"
-RDEPEND=""
-# This is a Linux specific app!
-DEPEND="${RDEPEND}
-		|| ( sys-kernel/linux-headers sys-kernel/mips-headers )
-		doc? ( virtual/latex-base )"
-S="${WORKDIR}/${MY_PN}"
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Wall -W" || die "emake failed"
-	if use doc; then
-		emake docs || die "emake docs failed"
-	fi
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="/usr" || die "emake install failed"
-	dodoc README
-	use doc && doc/blktrace.pdf
-}
diff --git a/sys-block/btrace/btrace-0.0.20060614042007.ebuild b/sys-block/btrace/btrace-0.0.20060614042007.ebuild
deleted file mode 100644
index ac01abd9d926..000000000000
--- a/sys-block/btrace/btrace-0.0.20060614042007.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/btrace/btrace-0.0.20060614042007.ebuild,v 1.6 2009/09/23 20:29:31 patrick Exp $
-
-inherit eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="btrace can show detailed info about what is happening on a block device io queue."
-HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/axboe/blktrace/"
-# this is in case Jens ever releases a real version
-MY_PV="${PV/0.0.}"
-MY_PN="blktrace"
-MY_P="${MY_PN}-${MY_PV}"
-SRC_URI="mirror://kernel/linux/kernel/people/axboe/${MY_PN}/${MY_P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE="doc"
-RDEPEND=""
-# This is a Linux specific app!
-DEPEND="${RDEPEND}
-		|| ( sys-kernel/linux-headers sys-kernel/mips-headers )
-		doc? ( virtual/latex-base )"
-S="${WORKDIR}/${MY_PN}"
-
-src_compile() {
-	append-flags -DLVM_REMAP_WORKAROUND -W -I"${S}"
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed"
-	if use doc; then
-		emake docs || die "emake docs failed"
-	fi
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="/usr" || die "emake install failed"
-	dodoc README
-	use doc && dodoc doc/blktrace.pdf
-}
diff --git a/sys-block/btrace/btrace-0.0.20070730162628.ebuild b/sys-block/btrace/btrace-0.0.20070730162628.ebuild
deleted file mode 100644
index 02b4603dcc25..000000000000
--- a/sys-block/btrace/btrace-0.0.20070730162628.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/btrace/btrace-0.0.20070730162628.ebuild,v 1.4 2009/09/23 20:29:31 patrick Exp $
-
-inherit eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="btrace can show detailed info about what is happening on a block device io queue."
-HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/axboe/blktrace/"
-# this is in case Jens ever releases a real version
-MY_PV="git-${PV/0.0.}"
-MY_PN="blktrace"
-MY_P="${MY_PN}-${MY_PV}"
-SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="doc"
-RDEPEND=""
-# This is a Linux specific app!
-DEPEND="${RDEPEND}
-		|| ( sys-kernel/linux-headers sys-kernel/mips-headers )
-		doc? ( virtual/latex-base )"
-S="${WORKDIR}/${MY_PN}"
-
-src_compile() {
-	append-flags -DLVM_REMAP_WORKAROUND -W -I"${S}"
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed"
-	if use doc; then
-		emake docs || die "emake docs failed"
-	fi
-}
-
-src_install() {
-	emake install DESTDIR="${D}" prefix="/usr" || die "emake install failed"
-	dodoc README
-	use doc && dodoc doc/blktrace.pdf
-}
diff --git a/sys-block/btrace/btrace-1.0.0.ebuild b/sys-block/btrace/btrace-1.0.0.ebuild
index 1c7e57e19bf5..964542869f18 100644
--- a/sys-block/btrace/btrace-1.0.0.ebuild
+++ b/sys-block/btrace/btrace-1.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/btrace/btrace-1.0.0.ebuild,v 1.2 2009/09/23 20:29:31 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/btrace/btrace-1.0.0.ebuild,v 1.3 2011/02/03 03:07:06 robbat2 Exp $
 
 inherit eutils toolchain-funcs flag-o-matic linux-info
 
@@ -17,7 +17,7 @@ RDEPEND=""
 # This is a Linux specific app!
 DEPEND="${RDEPEND}
 		|| ( sys-kernel/linux-headers sys-kernel/mips-headers )
-		doc? ( virtual/latex-base )
+		doc? ( virtual/latex-base app-text/dvipdfm )
 		dev-libs/libaio"
 S="${WORKDIR}/${MY_PN}"
 
diff --git a/sys-block/btrace/btrace-0.99.3.ebuild b/sys-block/btrace/btrace-1.0.1-r1.ebuild
index 49f9750d7795..abe2e6fe8c63 100644
--- a/sys-block/btrace/btrace-0.99.3.ebuild
+++ b/sys-block/btrace/btrace-1.0.1-r1.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/btrace/btrace-0.99.3.ebuild,v 1.3 2009/09/23 20:29:31 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/btrace/btrace-1.0.1-r1.ebuild,v 1.1 2011/02/03 03:07:06 robbat2 Exp $
 
-inherit eutils toolchain-funcs flag-o-matic
+EAPI=2
+
+inherit eutils toolchain-funcs flag-o-matic linux-info
 
 DESCRIPTION="btrace can show detailed info about what is happening on a block device io queue."
 HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/axboe/blktrace/"
@@ -17,14 +19,22 @@ RDEPEND=""
 # This is a Linux specific app!
 DEPEND="${RDEPEND}
 		|| ( sys-kernel/linux-headers sys-kernel/mips-headers )
-		doc? ( virtual/latex-base )
+		doc? ( virtual/latex-base app-text/dvipdfm )
 		dev-libs/libaio"
-S="${WORKDIR}/${MY_PN}"
+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"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.0.1-ldflags-parallel-make.patch
+}
 
 src_compile() {
 	append-flags -DLVM_REMAP_WORKAROUND -W -I"${S}"
 	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed"
 	if use doc; then
+		export VARTEXFONTS="${T}/fonts"
 		emake docs || die "emake docs failed"
 	fi
 }
diff --git a/sys-block/btrace/btrace-1.0.1.ebuild b/sys-block/btrace/btrace-1.0.1.ebuild
index 8ea4b6420684..345b79b70f16 100644
--- a/sys-block/btrace/btrace-1.0.1.ebuild
+++ b/sys-block/btrace/btrace-1.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/btrace/btrace-1.0.1.ebuild,v 1.1 2011/01/25 04:29:56 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/btrace/btrace-1.0.1.ebuild,v 1.2 2011/02/03 03:07:06 robbat2 Exp $
 
 inherit eutils toolchain-funcs flag-o-matic linux-info
 
@@ -17,7 +17,7 @@ RDEPEND=""
 # This is a Linux specific app!
 DEPEND="${RDEPEND}
 		|| ( sys-kernel/linux-headers sys-kernel/mips-headers )
-		doc? ( virtual/latex-base )
+		doc? ( virtual/latex-base app-text/dvipdfm )
 		dev-libs/libaio"
 S="${WORKDIR}/${MY_P}"
 
diff --git a/sys-block/btrace/files/btrace-1.0.1-ldflags-parallel-make.patch b/sys-block/btrace/files/btrace-1.0.1-ldflags-parallel-make.patch
new file mode 100644
index 000000000000..40c7d97d5dea
--- /dev/null
+++ b/sys-block/btrace/files/btrace-1.0.1-ldflags-parallel-make.patch
@@ -0,0 +1,91 @@
+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.000000000 +0000
++++ blktrace-1.0.1/btreplay/Makefile	2011-02-03 03:01:41.161365886 +0000
+@@ -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.000000000 +0000
++++ blktrace-1.0.1/btt/Makefile	2011-02-03 03:01:41.161365886 +0000
+@@ -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.000000000 +0000
++++ blktrace-1.0.1/Makefile	2011-02-03 03:03:32.713725832 +0000
+@@ -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
+