diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2017-10-20 17:09:15 +0200 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2017-10-20 17:09:25 +0200 |
| commit | b2be39932660fa5ae0df51ee4cbc5a514fe941f7 (patch) | |
| tree | 0e22ad5d99a593dab29cdf2fdc9fb711d3244ba0 /sys-block/thin-provisioning-tools | |
| parent | app-text/fbreader: use Qt-5 (diff) | |
| download | gentoo-b2be39932660fa5ae0df51ee4cbc5a514fe941f7.tar.gz gentoo-b2be39932660fa5ae0df51ee4cbc5a514fe941f7.tar.bz2 gentoo-b2be39932660fa5ae0df51ee4cbc5a514fe941f7.zip | |
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
Diffstat (limited to 'sys-block/thin-provisioning-tools')
| -rw-r--r-- | sys-block/thin-provisioning-tools/files/thin-provisioning-tools-0.7.4-disabled-tests_build_fix.patch | 32 | ||||
| -rw-r--r-- | sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.4.ebuild | 5 |
2 files changed, 36 insertions, 1 deletions
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 000000000000..f9a64b2188d0 --- /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@offog.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 36d3cd79766f..b0807e8fcff4 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 |