diff options
| author |   Conrad Kostecki <conikost@gentoo.org> | 2024-01-23 22:24:36 +0100 |
|---|---|---|
| committer | Conrad Kostecki <conikost@gentoo.org> | 2024-01-23 22:25:44 +0100 |
| commit | 579a63f5448e7c055b94a0011e9076bf0f3c47eb (patch) | |
| tree | f5f6cc3b858395bc9d7007bc8cbc4f530279802a | |
| parent | media-gfx/geeqie: fix compilation with musl (diff) | |
| download | gentoo-579a63f5.tar.gz gentoo-579a63f5.tar.bz2 gentoo-579a63f5.zip | |
www-apache/mod_jk: fix build on musl
Closes: https://bugs.gentoo.org/830179
Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
| -rw-r--r-- | www-apache/mod_jk/files/mod_jk-1.2.49-musl.patch | 26 | ||||
| -rw-r--r-- | www-apache/mod_jk/mod_jk-1.2.49.ebuild | 9 |
2 files changed, 32 insertions, 3 deletions
diff --git a/www-apache/mod_jk/files/mod_jk-1.2.49-musl.patch b/www-apache/mod_jk/files/mod_jk-1.2.49-musl.patch new file mode 100644 index 000000000000..65327fcc8bc3 --- /dev/null +++ b/www-apache/mod_jk/files/mod_jk-1.2.49-musl.patch @@ -0,0 +1,26 @@ +From 479102b941ac4c8c86ce102ec6e5bc9ad59b0d89 Mon Sep 17 00:00:00 2001 +From: Conrad Kostecki <conikost@gentoo.org> +Date: Tue, 23 Jan 2024 22:10:38 +0100 +Subject: [PATCH] native/common/jk_global.h: fix compilation on musl + +On musl, sys/socketvar.h does not exist, so we need to make sure, +not to use it. + +Signed-off-by: Conrad Kostecki <conikost@gentoo.org> +--- + common/jk_global.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/common/jk_global.h b/common/jk_global.h +index adcbd95f1..f4680ef8b 100644 +--- a/common/jk_global.h ++++ b/common/jk_global.h +@@ -148,7 +148,7 @@ extern char *strdup(const char *str); + #include <netinet/tcp.h> + #include <arpa/inet.h> + #include <sys/un.h> +-#if !defined(_OSD_POSIX) && !defined(AS400) && !defined(__CYGWIN__) && !defined(HPUX11) ++#if !defined(_OSD_POSIX) && !defined(AS400) && !defined(__CYGWIN__) && !defined(HPUX11) && !defined(PLATFORM_LINUX) + #include <sys/socketvar.h> + #endif + #if !defined(HPUX11) && !defined(AS400) diff --git a/www-apache/mod_jk/mod_jk-1.2.49.ebuild b/www-apache/mod_jk/mod_jk-1.2.49.ebuild index c096d3428647..f11868d35b60 100644 --- a/www-apache/mod_jk/mod_jk-1.2.49.ebuild +++ b/www-apache/mod_jk/mod_jk-1.2.49.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -21,11 +21,14 @@ DEPEND="dev-libs/apr:1=" RDEPEND="${DEPEND}" BDEPEND=" dev-lang/perl - verify-sig? ( sec-keys/openpgp-keys-apache-tomcat-connectors )" -VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-connectors.apache.org.asc" + verify-sig? ( sec-keys/openpgp-keys-apache-tomcat-connectors ) +" + +PATCHES=( "${FILESDIR}/${PN}-1.2.49-musl.patch" ) APACHE2_MOD_FILE="${S}/apache-2.0/${PN}.so" APACHE2_MOD_DEFINE="JK" +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-connectors.apache.org.asc" need_apache2 |