commit: 20d362fcb2d6b9aaa734d460962b281d19497163 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Nov 27 14:17:33 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Nov 27 14:17:33 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20d362fc
www-apache/mod_backtrace: use pkg-config for libunwind Signed-off-by: Sam James <sam <AT> gentoo.org> ...backtrace-2.01-r1.ebuild => mod_backtrace-2.01-r2.ebuild} | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/www-apache/mod_backtrace/mod_backtrace-2.01-r1.ebuild b/www-apache/mod_backtrace/mod_backtrace-2.01-r2.ebuild similarity index 75% rename from www-apache/mod_backtrace/mod_backtrace-2.01-r1.ebuild rename to www-apache/mod_backtrace/mod_backtrace-2.01-r2.ebuild index a9e764270295..84a65ffa352c 100644 --- a/www-apache/mod_backtrace/mod_backtrace-2.01-r1.ebuild +++ b/www-apache/mod_backtrace/mod_backtrace-2.01-r2.ebuild @@ -3,11 +3,12 @@ EAPI=7 -inherit apache-module depend.apache +inherit apache-module depend.apache toolchain-funcs DESCRIPTION="Debug segmentation faults in Apache threads" HOMEPAGE="https://emptyhammock.com/projects/httpd/diag/"; SRC_URI="https://emptyhammock.com/media/downloads/wku_bt-${PV}.zip"; +S="${WORKDIR}/wku_bt-${PV}" LICENSE="Apache-2.0" SLOT="0" @@ -15,17 +16,16 @@ KEYWORDS="~amd64 ~x86" IUSE="unwind" RDEPEND="=www-servers/apache-2*[debug] - unwind? ( sys-libs/libunwind )" + unwind? ( sys-libs/libunwind:= )" DEPEND="${RDEPEND}" -BDEPEND="app-arch/unzip" +BDEPEND="app-arch/unzip + unwind? ( virtual/pkgconfig )" APACHE2_MOD_CONF="10_${PN}" APACHE2_MOD_DEFINE="BACKTRACE" need_apache2 -S="${WORKDIR}/wku_bt-${PV}" - # Work around Bug #616612 pkg_setup() { _init_apache2 @@ -35,7 +35,7 @@ pkg_setup() { src_compile() { APXS2_ARGS="-c ${PN}.c diag.c -ldl" if use unwind; then - APXS2_ARGS+=" -lunwind -DDIAG_HAVE_LIBUNWIND_BACKTRACE=1" + APXS2_ARGS+=" $($(tc-getPKG_CONFIG) --libs libunwind) -DDIAG_HAVE_LIBUNWIND_BACKTRACE=1" fi apache-module_src_compile }
