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 64683158003 for ; Tue, 12 Oct 2021 20:59:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9BC11E0841; Tue, 12 Oct 2021 20:59:55 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 80DC8E0841 for ; Tue, 12 Oct 2021 20:59:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3B28B3431F2 for ; Tue, 12 Oct 2021 20:59:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A84C812F for ; Tue, 12 Oct 2021 20:59:52 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1634072381.41a142b4a90546124996e732aa305b3984b6189b.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-apache/mod_jk/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-apache/mod_jk/mod_jk-1.2.48.ebuild X-VCS-Directories: www-apache/mod_jk/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: 41a142b4a90546124996e732aa305b3984b6189b X-VCS-Branch: master Date: Tue, 12 Oct 2021 20:59:52 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5c833777-6ad0-4931-9440-53ea341c55cd X-Archives-Hash: 4ad0ff0497a1a6523cff39d79f88b101 commit: 41a142b4a90546124996e732aa305b3984b6189b Author: Conrad Kostecki gentoo org> AuthorDate: Tue Oct 12 20:59:25 2021 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Tue Oct 12 20:59:41 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41a142b4 www-apache/mod_jk: fix linker Build systems passes CFLAGS to linker and prefixes them all with '-Wl,' which will always cause the linker to fail with unknown options. Closes: https://bugs.gentoo.org/817896 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Conrad Kostecki gentoo.org> www-apache/mod_jk/mod_jk-1.2.48.ebuild | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/www-apache/mod_jk/mod_jk-1.2.48.ebuild b/www-apache/mod_jk/mod_jk-1.2.48.ebuild index f84c81d573c..f731284a89e 100644 --- a/www-apache/mod_jk/mod_jk-1.2.48.ebuild +++ b/www-apache/mod_jk/mod_jk-1.2.48.ebuild @@ -5,7 +5,7 @@ EAPI=7 MY_P="tomcat-connectors-${PV#-*}-src" -inherit apache-module +inherit apache-module autotools DESCRIPTION="Provides an AJP Apache2-JK-connector for the Tomcat servlet engine" HOMEPAGE="https://tomcat.apache.org/connectors-doc/" @@ -36,6 +36,10 @@ pkg_setup() { src_prepare() { default + # Don't add '-Wl,' as prefix for CFLAGS, as linker will fail + sed -e '/JK_PREFIX_IF_MISSING/d' -i configure.ac || die + eautoreconf + # Adjust confpath and logpath for Gentoo local logs_path="/var/log/apache2" sed -e "s|conf|${APACHE_CONFDIR}|g" -e "s|logs|${logs_path}|g" -i ../conf/httpd-jk.conf || die