diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-02-05 21:17:55 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-02-05 21:17:55 +0000 |
| commit | 519f4aac6d5896fe0204e6429485f95240c7ff58 (patch) | |
| tree | 467adac90d818b96465a433b66ef6bb65e369fef /dev-java/tomcat-native | |
| parent | 8afe4133ba3d8586301516885427809020a3cafa (diff) | |
gentoo auto-resync : 05:02:2023 - 21:17:55
Diffstat (limited to 'dev-java/tomcat-native')
| -rw-r--r-- | dev-java/tomcat-native/Manifest | 3 | ||||
| -rw-r--r-- | dev-java/tomcat-native/files/tomcat-native-2.0.2-slibtool.patch | 32 | ||||
| -rw-r--r-- | dev-java/tomcat-native/tomcat-native-2.0.2.ebuild | 17 |
3 files changed, 49 insertions, 3 deletions
diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest index 837de7941d71..c721f1e1875f 100644 --- a/dev-java/tomcat-native/Manifest +++ b/dev-java/tomcat-native/Manifest @@ -1,6 +1,7 @@ +AUX tomcat-native-2.0.2-slibtool.patch 1099 BLAKE2B e5c294cd96747a576afcc4ad80d0a99d97cf9037d750febe681d3e4ee3cd1c3ef96b14e73829b90aa40ec85e6a33e69ce062eeed9a91a278a67ffca94f39224c SHA512 24f890d5b697a10c702f9149679df6a70ddcc663de3abbbffa863151ed655d17ef16b585ac9c6354e1d4c56ddcb920acc6ba9236095d50b96d06c17307734353 DIST tomcat-native-1.2.35-src.tar.gz 436593 BLAKE2B 808ed0396e421609092f9e59676a55501e67fef7b0ca466ad15e4fe11cc88abb8b07043364c63a53760052a6258585aa13a53378c3fb8823bc8349371ad12245 SHA512 a290eb0cd940e1f8de0caba72517d9999d4e9c96f1a19e0ef7ccdabf039ba86b48d1c6f554f59decd87e2ef03ec3e3bfcce694a92e1db130966987c1e37b5c8d DIST tomcat-native-2.0.2-src.tar.gz 315063 BLAKE2B c044a0b6ef226a038728d5c009a7415bc95cd4317bf8fcbcc0a0a9a9ee930c0c2e74cd6c028a92cc9e96c218f38d580c7af6599c3df35e9c677d1a382727582f SHA512 a0badfaa537dd8dc24901bbf2a11dbaab7cabe5c033eb9162daa5c748269c3dace08f99c0a477c0d0e051b7d226e2e2c6c3031ab7c45d007333cb53d72738c21 DIST tomcat-native-2.0.2-src.tar.gz.asc 833 BLAKE2B 8368c96d6bff84c1281ab08699401286ce89adcf21ffda5d896e19d05f8279746070256612038c8b670b13e0cef4d43e678dfa785175b54b15aa68e33268bb29 SHA512 9d2e2c64cde1c1812192ad451610e32480ad005832e2b781f0eb5f5559a23730715ccf7bfd04937091bb6635b098badc61f73a926fcfa5ea09175d7a9fe0e002 EBUILD tomcat-native-1.2.35.ebuild 1193 BLAKE2B ce3e060b2f3d2cdaa88161e14b486040e452add5f499aaf3015b02a5c79564c281889fd8c1248f36b0f4069d472215ca8e8e58525e038b65c56186b7e7323b82 SHA512 42fbee312e571add71350399e3768b3856ec4f3ebf7a60dc1a8769f417114414cc9001ce29c7731c332b60eed1ad408c917e99975ba761707c5325231ab57710 -EBUILD tomcat-native-2.0.2.ebuild 1501 BLAKE2B b70b7b692b7e2455ce924ac7faf5db02326be88b1223f55bd6807da9a97a571732d0c050c97351a413b97b90c9788c9fb01151f1945b21629ca2035d26ad8a5c SHA512 8cf7f45c151fec212d927be25279e9916c51e00a59126ae4b892b2835d4cd326c018e5bb9cce8b1e1aa7a7eb7e58e6cd440791e4ae708ae2b6bb658829717976 +EBUILD tomcat-native-2.0.2.ebuild 1719 BLAKE2B 37404ca16bddb1af928d4d6defd7e69d31970ef12960e7a5fb5ed8071227a884d0dfd6fe8b2c4169a1bc270ab7bf50b23bc1103ed9ad3af13542aa0aa1a0c55f SHA512 d88ecaa32c6a845f8a9634d1cb590a4550d5404f55a474ac7b39a5a6a42ed426b47c279694e0afb35a9b788e7a77d12c2e8c866d94984a65522e0cc1d0db952e MISC metadata.xml 1096 BLAKE2B 5927d60847798f2e90ee40af5947bf0fec8a2a9a9b98730be22a4471155f9a627aea8f52d4f8cee6fb6b77457c7977d0aea025f2e5eedd938a64787ddeca9f29 SHA512 bbd9ec012b1b50b3c4a5967068fb2901dc184e18c5b9a8f545ff396fae4c198daeb2c5d09a377e0adeaa76580ca7c87d5b98f246db6ce83fd58d52502dc3f006 diff --git a/dev-java/tomcat-native/files/tomcat-native-2.0.2-slibtool.patch b/dev-java/tomcat-native/files/tomcat-native-2.0.2-slibtool.patch new file mode 100644 index 000000000000..e0378669aad5 --- /dev/null +++ b/dev-java/tomcat-native/files/tomcat-native-2.0.2-slibtool.patch @@ -0,0 +1,32 @@ +Upstream-PR: https://github.com/apache/tomcat-native/pull/14 +Upstream-Commit: +https://github.com/apache/tomcat-native/commit/4f7fb7f442de3d9a9bb2f72b5dabc2f4bc8e3384 + +From 54dccd3a4dc01801d9311b3160808305ec9fc2cf Mon Sep 17 00:00:00 2001 +From: orbea <orbea@riseup.net> +Date: Thu, 21 Jul 2022 17:59:14 -0700 +Subject: [PATCH] native: Fix the build with rlibtool + +When building tomcat-native with slibtool using the rlibtool symlink the +build will fail. This is because rlibtool requires the generated libtool +script to determine if the build is shared, static or both. + +Gentoo bug: https://bugs.gentoo.org/778914 +--- + native/configure.in | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/native/configure.in b/native/configure.in +index 567894b10..e082ae6d2 100644 +--- a/native/configure.in ++++ b/native/configure.in +@@ -50,6 +50,9 @@ AC_SUBST(TCN_CONFIG_LOCATION) + AC_CANONICAL_TARGET + AC_PROG_INSTALL + ++dnl Generate the libtool script which is needed for rlibtool ++LT_INIT ++ + dnl + dnl compute the top directory of the build + dnl note: this is needed for LIBTOOL and exporting the bundled Expat diff --git a/dev-java/tomcat-native/tomcat-native-2.0.2.ebuild b/dev-java/tomcat-native/tomcat-native-2.0.2.ebuild index 8fe559c51cd1..5874a906ef17 100644 --- a/dev-java/tomcat-native/tomcat-native-2.0.2.ebuild +++ b/dev-java/tomcat-native/tomcat-native-2.0.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit java-pkg-2 java-ant-2 verify-sig +inherit autotools java-pkg-2 java-ant-2 verify-sig DESCRIPTION="Allows Tomcat to use certain native resources for better performance" HOMEPAGE="https://tomcat.apache.org/native-doc/" @@ -29,6 +29,19 @@ VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-connectors.a JAVA_ANT_REWRITE_CLASSPATH="yes" +PATCHES=( + "${FILESDIR}"/${P}-slibtool.patch #778914 +) + +src_prepare() { + default + + # Needed for the slibtool patch + cd native || die + sed -i 's/configure.in/configure.ac/' configure.in || die + eautoreconf +} + src_configure() { local myeconfargs=( --with-apr="${EPREFIX}"/usr/bin/apr-1-config |