| 1 |
commit: 41a142b4a90546124996e732aa305b3984b6189b |
| 2 |
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Oct 12 20:59:25 2021 +0000 |
| 4 |
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Oct 12 20:59:41 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41a142b4 |
| 7 |
|
| 8 |
www-apache/mod_jk: fix linker |
| 9 |
|
| 10 |
Build systems passes CFLAGS to linker and prefixes them all with '-Wl,' |
| 11 |
which will always cause the linker to fail with unknown options. |
| 12 |
|
| 13 |
Closes: https://bugs.gentoo.org/817896 |
| 14 |
Package-Manager: Portage-3.0.28, Repoman-3.0.3 |
| 15 |
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> |
| 16 |
|
| 17 |
www-apache/mod_jk/mod_jk-1.2.48.ebuild | 6 +++++- |
| 18 |
1 file changed, 5 insertions(+), 1 deletion(-) |
| 19 |
|
| 20 |
diff --git a/www-apache/mod_jk/mod_jk-1.2.48.ebuild b/www-apache/mod_jk/mod_jk-1.2.48.ebuild |
| 21 |
index f84c81d573c..f731284a89e 100644 |
| 22 |
--- a/www-apache/mod_jk/mod_jk-1.2.48.ebuild |
| 23 |
+++ b/www-apache/mod_jk/mod_jk-1.2.48.ebuild |
| 24 |
@@ -5,7 +5,7 @@ EAPI=7 |
| 25 |
|
| 26 |
MY_P="tomcat-connectors-${PV#-*}-src" |
| 27 |
|
| 28 |
-inherit apache-module |
| 29 |
+inherit apache-module autotools |
| 30 |
|
| 31 |
DESCRIPTION="Provides an AJP Apache2-JK-connector for the Tomcat servlet engine" |
| 32 |
HOMEPAGE="https://tomcat.apache.org/connectors-doc/" |
| 33 |
@@ -36,6 +36,10 @@ pkg_setup() { |
| 34 |
src_prepare() { |
| 35 |
default |
| 36 |
|
| 37 |
+ # Don't add '-Wl,' as prefix for CFLAGS, as linker will fail |
| 38 |
+ sed -e '/JK_PREFIX_IF_MISSING/d' -i configure.ac || die |
| 39 |
+ eautoreconf |
| 40 |
+ |
| 41 |
# Adjust confpath and logpath for Gentoo |
| 42 |
local logs_path="/var/log/apache2" |
| 43 |
sed -e "s|conf|${APACHE_CONFDIR}|g" -e "s|logs|${logs_path}|g" -i ../conf/httpd-jk.conf || die |
Archives