[gentoo-commits] repo/gentoo:master commit in: sys-block/thin-provisioning-tools/, sys-block/thin-provisioning-tools/files/

[Lars Wendler]

commit:     b2be39932660fa5ae0df51ee4cbc5a514fe941f7
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 20 15:09:15 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Oct 20 15:09:25 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2be3993

sys-block/thin-provisioning-tools: Fixed build without tests.

Closes: https://bugs.gentoo.org/634868
Package-Manager: Portage-2.3.12, Repoman-2.3.3

 ...ning-tools-0.7.4-disabled-tests_build_fix.patch | 32 ++++++++++++++++++++++
 .../thin-provisioning-tools-0.7.4.ebuild           |  5 +++-
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/sys-block/thin-provisioning-tools/files/thin-provisioning-tools-0.7.4-disabled-tests_build_fix.patch b/sys-block/thin-provisioning-tools/files/thin-provisioning-tools-0.7.4-disabled-tests_build_fix.patch
new file mode 100644
index 00000000000..f9a64b2188d
--- /dev/null
+++ b/sys-block/thin-provisioning-tools/files/thin-provisioning-tools-0.7.4-disabled-tests_build_fix.patch
@@ -0,0 +1,32 @@
+From 8d75be81120b9cf172c95d0153c5f845ed804234 Mon Sep 17 00:00:00 2001
+From: Adam Sampson <ats-github@×××××.org>
+Date: Mon, 16 Oct 2017 13:07:36 +0100
+Subject: [PATCH] [functional-tests] fix build with testing disabled (#88)
+
+The rule for lib/libft.so is only enabled with --enable-testing,
+so the default target shouldn't depend unconditionally on it.
+With the default configure options, the build failed with:
+make: *** No rule to make target 'lib/libft.so', needed by 'all'.  Stop.
+---
+ Makefile.in | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index e745739..02b75dd 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -21,8 +21,13 @@ V=@
+ PROGRAMS=\
+ 	bin/pdata_tools
+ 
++ifeq ("@TESTING@", "yes")
++TESTLIBS=\
++	lib/libft.so
++endif
++
+ .PHONY: all
+-all: $(PROGRAMS) lib/libft.so
++all: $(PROGRAMS) $(TESTLIBS)
+ 
+ SOURCE=\
+ 	base/output_file_requirements.cc \

diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.4.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.4.ebuild
index 36d3cd79766..b0807e8fcff 100644
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.4.ebuild
+++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.4.ebuild
@@ -29,7 +29,10 @@ DEPEND="${RDEPEND}
 	)
 	dev-libs/boost"
 
-PATCHES=( "${FILESDIR}"/${PN}-0.7.0-build-fixes.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.7.0-build-fixes.patch
+	"${FILESDIR}/${P}-disabled-tests_build_fix.patch" #634868
+)
 
 src_prepare() {
 	default