From 73fda1f16f2b7a5d388997dbef83f7670fc792fe Mon Sep 17 00:00:00 2001 From: Ilya Tumaykin Date: Mon, 21 Dec 2015 18:59:38 +0300 Subject: net-firewall/fwknop: re-enable in-source build wrt bug 568958 Otherwise Python C extension fails to build because it links against fko library built during src_compile stage. With out-of-source build this library resides in a separate directory from sources, thus it cannot be found during Python module compilation by normal means. This problem didn't catch my attention earlier because build failure is only reproducible if there is no fko library installed in the system from a previous version of this package. Gentoo-Bug: 568958 Package-Manager: portage-2.2.24 --- net-firewall/fwknop/fwknop-2.6.7-r2.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/net-firewall/fwknop/fwknop-2.6.7-r2.ebuild b/net-firewall/fwknop/fwknop-2.6.7-r2.ebuild index 50e95fe2c11c..a5bfe67541ab 100644 --- a/net-firewall/fwknop/fwknop-2.6.7-r2.ebuild +++ b/net-firewall/fwknop/fwknop-2.6.7-r2.ebuild @@ -5,6 +5,7 @@ EAPI=5 AUTOTOOLS_AUTORECONF=1 +AUTOTOOLS_IN_SOURCE_BUILD=1 DISABLE_AUTOFORMATTING=1 DISTUTILS_OPTIONAL=1 -- cgit v1.2.3-65-gdbad From d4ae6dbb6ed499423d516e57f5e545a063f98720 Mon Sep 17 00:00:00 2001 From: Ilya Tumaykin Date: Mon, 21 Dec 2015 19:14:49 +0300 Subject: net-firewall/fwknop: do not call distutils-r1_src_prepare Firstly, this helps to avoid potential problems with double patching because both autotools-utils_src_prepare and distutils-r1_src_prepare try to apply patches from PATCHES variable and call epatch_user. Secondly, fwknop's Python module does not need any special stuff that distutils-r1_src_prepare does. On the contrary, without extra copying of Python files, the build is happening the way it is supported and expected by upstream. Package-Manager: portage-2.2.24 --- net-firewall/fwknop/fwknop-2.6.7-r2.ebuild | 5 ----- 1 file changed, 5 deletions(-) diff --git a/net-firewall/fwknop/fwknop-2.6.7-r2.ebuild b/net-firewall/fwknop/fwknop-2.6.7-r2.ebuild index a5bfe67541ab..582a81b605dd 100644 --- a/net-firewall/fwknop/fwknop-2.6.7-r2.ebuild +++ b/net-firewall/fwknop/fwknop-2.6.7-r2.ebuild @@ -77,11 +77,6 @@ src_prepare() { fi autotools-utils_src_prepare - - if use python; then - cd "${S}"/python || die - distutils-r1_src_prepare - fi } src_configure() { -- cgit v1.2.3-65-gdbad