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 F3B681396D9 for ; Fri, 20 Oct 2017 15:09:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 330F2E0EE1; Fri, 20 Oct 2017 15:09:33 +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 05D0FE0EE1 for ; Fri, 20 Oct 2017 15:09:32 +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 B8E6433BF0F for ; Fri, 20 Oct 2017 15:09:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7D9CE805 for ; Fri, 20 Oct 2017 15:09:30 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1508512165.b2be39932660fa5ae0df51ee4cbc5a514fe941f7.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-block/thin-provisioning-tools/, sys-block/thin-provisioning-tools/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-block/thin-provisioning-tools/files/thin-provisioning-tools-0.7.4-disabled-tests_build_fix.patch sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.4.ebuild X-VCS-Directories: sys-block/thin-provisioning-tools/ sys-block/thin-provisioning-tools/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: b2be39932660fa5ae0df51ee4cbc5a514fe941f7 X-VCS-Branch: master Date: Fri, 20 Oct 2017 15:09:30 +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-Archives-Salt: e3aa4c61-5c0c-4071-8313-09a0d75da551 X-Archives-Hash: b48c8ad2f37cda1211465aef5027de07 commit: b2be39932660fa5ae0df51ee4cbc5a514fe941f7 Author: Lars Wendler gentoo org> AuthorDate: Fri Oct 20 15:09:15 2017 +0000 Commit: Lars Wendler gentoo 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 +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