* [gentoo-commits] repo/gentoo:master commit in: dev-java/tomcat-native/, dev-java/tomcat-native/files/
@ 2023-02-19 7:56 Miroslav Šulc
0 siblings, 0 replies; 3+ messages in thread
From: Miroslav Šulc @ 2023-02-19 7:56 UTC (permalink / raw
To: gentoo-commits
commit: a448699a4605f407d218418365f5b6bd7a7765fc
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Feb 18 10:36:49 2023 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Feb 19 07:55:39 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a448699a
dev-java/tomcat-native: add 2.0.3, drop 2.0.2
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/29619
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/tomcat-native/Manifest | 4 +-
...ol.patch => tomcat-native-2.0.3-slibtool.patch} | 4 +-
dev-java/tomcat-native/metadata.xml | 2 +-
...ive-2.0.2.ebuild => tomcat-native-2.0.3.ebuild} | 67 +++++++++++++---------
4 files changed, 44 insertions(+), 33 deletions(-)
diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest
index 2c0a81584235..fcad976ae8cc 100644
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -1,4 +1,4 @@
DIST tomcat-native-1.2.35-src.tar.gz 436593 BLAKE2B 808ed0396e421609092f9e59676a55501e67fef7b0ca466ad15e4fe11cc88abb8b07043364c63a53760052a6258585aa13a53378c3fb8823bc8349371ad12245 SHA512 a290eb0cd940e1f8de0caba72517d9999d4e9c96f1a19e0ef7ccdabf039ba86b48d1c6f554f59decd87e2ef03ec3e3bfcce694a92e1db130966987c1e37b5c8d
DIST tomcat-native-1.2.36-src.tar.gz 437622 BLAKE2B c553fee65bc9ff9eec099afde7516b3108ed4175915e853a720d188f684f39b9a8a040b9b9c28e64deecd0c1b0c61cd24e03a552f465c7646b0b6e47d9f12372 SHA512 ae89a872b8331035e01387665539a0c08096ae1abdb5dc7a25a197650a641ba3637f01437f1bee27b442c1c59c4d2fe2e5679d1595e8c5d121b9b219da2fb094
-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
+DIST tomcat-native-2.0.3-src.tar.gz 318403 BLAKE2B a9936ad951bd521c77b8a3fe3306cb1a7a78bdbb229f84fdf53e5bd71caa55bfcee049de406df0047341c6896e05e7da4e0e2a8524fdda91a24f007176f26503 SHA512 d80e6b76295bb253eaf6eab4d722f3ba2f683f33a96310838b4c44b99f0b47a49ed9c09bb53ed23698db057ce765e3fcbfcd4ac4b75d2bdbe691f916be3be339
+DIST tomcat-native-2.0.3-src.tar.gz.asc 873 BLAKE2B f9998b9b7c410ac7fe2c72207cec64dcd003142ede4f37abd4ebb04ee930a5d536169c84e24bc7fb328cead15da19c13a991f30bdcce80ffd5380114884ec5f6 SHA512 bc513239ccd2a4b4eb60d30513328bb008b926e702ece8ddb4a9a084d64fc7db02b894f741d7073e5f869e7df948b4539d849e8c602549bab91f7055e3c23222
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.3-slibtool.patch
similarity index 95%
rename from dev-java/tomcat-native/files/tomcat-native-2.0.2-slibtool.patch
rename to dev-java/tomcat-native/files/tomcat-native-2.0.3-slibtool.patch
index e0378669aad5..cd090afb9854 100644
--- a/dev-java/tomcat-native/files/tomcat-native-2.0.2-slibtool.patch
+++ b/dev-java/tomcat-native/files/tomcat-native-2.0.3-slibtool.patch
@@ -18,8 +18,8 @@ Gentoo bug: https://bugs.gentoo.org/778914
diff --git a/native/configure.in b/native/configure.in
index 567894b10..e082ae6d2 100644
---- a/native/configure.in
-+++ b/native/configure.in
+--- a/configure.in
++++ b/configure.in
@@ -50,6 +50,9 @@ AC_SUBST(TCN_CONFIG_LOCATION)
AC_CANONICAL_TARGET
AC_PROG_INSTALL
diff --git a/dev-java/tomcat-native/metadata.xml b/dev-java/tomcat-native/metadata.xml
index e07558c04674..1989b45b9137 100644
--- a/dev-java/tomcat-native/metadata.xml
+++ b/dev-java/tomcat-native/metadata.xml
@@ -16,9 +16,9 @@
memory, NT pipes and Unix sockets).
</longdescription>
<upstream>
- <remote-id type="github">apache/tomcat-native</remote-id>
<bugs-to>https://tomcat.apache.org/bugreport.html</bugs-to>
<doc>https://tomcat.apache.org/native-doc/</doc>
<changelog>https://tomcat.apache.org/native-doc/miscellaneous/changelog.html</changelog>
+ <remote-id type="github">apache/tomcat-native</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-java/tomcat-native/tomcat-native-2.0.2.ebuild b/dev-java/tomcat-native/tomcat-native-2.0.3.ebuild
similarity index 51%
rename from dev-java/tomcat-native/tomcat-native-2.0.2.ebuild
rename to dev-java/tomcat-native/tomcat-native-2.0.3.ebuild
index 5874a906ef17..c9cfba053ed8 100644
--- a/dev-java/tomcat-native/tomcat-native-2.0.2.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-2.0.3.ebuild
@@ -3,41 +3,57 @@
EAPI=8
-inherit autotools java-pkg-2 java-ant-2 verify-sig
+JAVA_PKG_IUSE="doc source test"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit autotools java-pkg-2 java-pkg-simple verify-sig
DESCRIPTION="Allows Tomcat to use certain native resources for better performance"
HOMEPAGE="https://tomcat.apache.org/native-doc/"
SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz
- verify-sig? ( https://downloads.apache.org/tomcat/tomcat-connectors/native/${PV}/source/tomcat-native-${PV}-src.tar.gz.asc )"
-S=${WORKDIR}/${P}-src
+ verify-sig? (
+ https://downloads.apache.org/tomcat/tomcat-connectors/native/${PV}/source/tomcat-native-${PV}-src.tar.gz.asc
+ )"
+S=${WORKDIR}/${P}-src/native
KEYWORDS="~amd64 ~x86"
LICENSE="Apache-2.0"
SLOT="2"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
+IUSE="static-libs"
-RDEPEND="dev-libs/apr:1=
+DEPEND="
+ >=virtual/jdk-1.8:*
+"
+RDEPEND="
+ dev-libs/apr:1=
dev-libs/openssl:0/3
- >=virtual/jre-1.8:*"
-
-DEPEND=">=virtual/jdk-1.8:*
- test? ( dev-java/ant-junit:0 )"
-
+ >=virtual/jre-1.8:*
+"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-tomcat-connectors )"
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-connectors.apache.org.asc"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_RESOURCE_DIRS="../resources"
+JAVA_SRC_DIR="../java"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_RESOURCE_DIRS=".libs"
+JAVA_TEST_SRC_DIR="../test"
PATCHES=(
- "${FILESDIR}"/${P}-slibtool.patch #778914
+ "${FILESDIR}"/tomcat-native-2.0.3-slibtool.patch #778914
)
+DOCS=( ../{CHANGELOG.txt,NOTICE,README.txt} )
+
src_prepare() {
+ java-pkg-2_src_prepare
+ mkdir -p "${JAVA_RESOURCE_DIRS}/META-INF" || die
+ sed -ne '/attribute name/s:^.*name="\(.*\)" value="\(.*\)".*$:\1\: \2:p' \
+ ../build.xml \
+ | sed "s:\${version}:${PV}:" \
+ > "${JAVA_RESOURCE_DIRS}/META-INF/MANIFEST.MF" || die
default
# Needed for the slibtool patch
- cd native || die
sed -i 's/configure.in/configure.ac/' configure.in || die
eautoreconf
}
@@ -47,29 +63,24 @@ src_configure() {
--with-apr="${EPREFIX}"/usr/bin/apr-1-config
--with-ssl="${EPREFIX}"/usr
)
-
- cd native || die
econf "${myeconfargs[@]}"
}
src_compile() {
- eant jar
-
- cd native || die
+ java-pkg-simple_src_compile
default
}
-src_install() {
- java-pkg_newjar "dist/${P}.jar" "${PN}.jar"
-
- cd native || die
- default
-
- ! use static-libs && find "${D}" -name '*.la' -delete || die
+src_test() {
+ JAVA_TEST_EXTRA_ARGS=( -Djava.library.path=".libs" )
+ java-pkg-simple_src_test
}
-src_test() {
- java-pkg-2_src_test
+src_install() {
+ java-pkg-simple_src_install
+ java-pkg_doso .libs/*.so
+ dodoc -r ../docs
+ ! use static-libs && find "${D}" -name '*.la' -delete || die
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/tomcat-native/, dev-java/tomcat-native/files/
@ 2023-09-15 4:51 Arthur Zamarin
0 siblings, 0 replies; 3+ messages in thread
From: Arthur Zamarin @ 2023-09-15 4:51 UTC (permalink / raw
To: gentoo-commits
commit: a869ae72d33951f8295c5016de55ecec2a1134a6
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Thu Sep 14 20:24:35 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 15 04:50:52 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a869ae72
dev-java/tomcat-native: drop 1.2.37, 2.0.4
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-java/tomcat-native/Manifest | 3 -
.../files/tomcat-native-2.0.3-slibtool.patch | 32 --------
dev-java/tomcat-native/tomcat-native-1.2.37.ebuild | 62 ---------------
dev-java/tomcat-native/tomcat-native-2.0.4.ebuild | 88 ----------------------
4 files changed, 185 deletions(-)
diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest
index b2544e5d7fb0..5fe6f34328a8 100644
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -1,7 +1,4 @@
-DIST tomcat-native-1.2.37-src.tar.gz 438373 BLAKE2B 89ec571fea09b5ee0cf5f5ffec8f5547b08da301e713361687d7aad96f70b3b789a5f26061e2277b90b845f9df1c7c140fdee4c83f1ba05d168bcabf2cf1f549 SHA512 e845239f1b6a1dab22885d39f4fd131e464c38b0d52faca0d960f99fe3e8b7d732c0112f25e5eb81ff8dc71a5e3c6799bfdf867e617d8f934068ed107036fd0b
DIST tomcat-native-1.2.38-src.tar.gz 439234 BLAKE2B 603a905db25b86792717023707598abb4da125ad16b7e69e4a48ec0eb9056bc0b566520d4df004566bbc15c8bcfe843992baebb6bd1c86b210ce9f0fc0733ca0 SHA512 973c0dc8d241827aa98f72026d4de67928344c221570abbb7f97380fe56a9ad602b159a5448c6048d88d73fa0ade8c1ab12df293fee513d0e4896847b16206e6
DIST tomcat-native-1.2.38-src.tar.gz.asc 873 BLAKE2B 6b7ccf31b7b0b7ac9493c4751309c6b62c269332f5fd49a9df391846a140f2797e1587e3c644b4aa65fa6eef8dfea8fe19b7f5714ffb5ddcf836c601f281bc5b SHA512 b6a7c12ac7387c4ee17e5b5d50d588b16470874f70bcb49b96a25159bab8b51ff5a5dc7d33fa73c8eb33e673e2b947aad4b603b1e8755f7e186052763c2575f5
-DIST tomcat-native-2.0.4-src.tar.gz 318845 BLAKE2B 44cd99ff52d5b402c2d8caa6819e2e420c84399f7f3cc0be38cd2a40985ddaaf89093005454527976ad2cf083c90d39c9c4d600671a8e5c7c07d0834b23d93e0 SHA512 276133e44ae9f9d3e853b66120937865c675eed6dd6b5b7d8a94ef741f037c0b3d99a6c065a1303c0ca42b65c109aef35b6bd370a2af0b7b2752eadf85b1d880
-DIST tomcat-native-2.0.4-src.tar.gz.asc 873 BLAKE2B 509c63dce69c767d3dd694d7994c8b2cbb4f84d40095ff89373a165d592449fc028402b17bf0e25c9ffe40d5ca8383cda50703054fcdfb2fd4cb36bdcecdff0c SHA512 80768307fd1d46ca822151977b3d9fecdb3121929e97338a78c39bc439f914694dedbfff087cd512f986532567734f04422b4764ea215ad5dbb0319380fa05d2
DIST tomcat-native-2.0.5-src.tar.gz 539017 BLAKE2B 405a4064bcf49ee04a7670c516adc64b19ebebbbfdc50735952c057d36b475c785bd9976778f491796b3fce5bd5aa158199ec624f20e8adbc65f920974543533 SHA512 03ed1951597bb6a6ade8d715546a0d635d261381737abd27b63aa552c69f9ca49405d0252b6bc2d878bfd64e87439f146ecd84ccbfc82661ba16379c493615a4
DIST tomcat-native-2.0.5-src.tar.gz.asc 873 BLAKE2B 2e043d011f482ab963088441a37d2cfddec973253f7c909a747afac71393b76bc2e33ff37e9a18e8f9b6caac8ba86ab3a076ea722577416e4b409d8e44d56e24 SHA512 22a87c14c31bc62383cfb227e8dbd106fe017f84d802ec0e4d22d48af6ad4dd0d020bc59bed3a8335e2b4b15e0fd44ec3a4062bf86c73bbf00151c4ff0d12d7c
diff --git a/dev-java/tomcat-native/files/tomcat-native-2.0.3-slibtool.patch b/dev-java/tomcat-native/files/tomcat-native-2.0.3-slibtool.patch
deleted file mode 100644
index cd090afb9854..000000000000
--- a/dev-java/tomcat-native/files/tomcat-native-2.0.3-slibtool.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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/configure.in
-+++ b/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-1.2.37.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.37.ebuild
deleted file mode 100644
index e2093e095560..000000000000
--- a/dev-java/tomcat-native/tomcat-native-1.2.37.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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
-
-DESCRIPTION="Allows Tomcat to use certain native resources for better performance"
-HOMEPAGE="https://tomcat.apache.org/native-doc/"
-SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
-
-KEYWORDS="amd64 ~x86"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/apr:1=
- dev-libs/openssl:0=
- >=virtual/jre-1.8:*"
-
-DEPEND=">=virtual/jdk-1.8:*
- test? ( dev-java/ant-junit:0 )"
-
-S=${WORKDIR}/${P}-src
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-src_configure() {
- local myeconfargs=(
- --with-apr="${EPREFIX}"/usr/bin/apr-1-config
- --with-ssl="${EPREFIX}"/usr
- )
-
- cd native || die
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- eant jar
-
- cd native || die
- default
-}
-
-src_install() {
- java-pkg_newjar "dist/${P}.jar" "${PN}.jar"
-
- cd native || die
- default
-
- ! use static-libs && find "${D}" -name '*.la' -delete || die
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-pkg_postinst() {
- elog "For more information, please visit"
- elog "https://tomcat.apache.org/tomcat-9.0-doc/apr.html"
-}
diff --git a/dev-java/tomcat-native/tomcat-native-2.0.4.ebuild b/dev-java/tomcat-native/tomcat-native-2.0.4.ebuild
deleted file mode 100644
index c1ee9d7ecc61..000000000000
--- a/dev-java/tomcat-native/tomcat-native-2.0.4.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit autotools java-pkg-2 java-pkg-simple verify-sig
-
-DESCRIPTION="Allows Tomcat to use certain native resources for better performance"
-HOMEPAGE="https://tomcat.apache.org/native-doc/"
-SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz
- verify-sig? (
- https://downloads.apache.org/tomcat/tomcat-connectors/native/${PV}/source/tomcat-native-${PV}-src.tar.gz.asc
- )"
-S=${WORKDIR}/${P}-src/native
-
-KEYWORDS="amd64 ~x86"
-LICENSE="Apache-2.0"
-SLOT="2"
-IUSE="static-libs"
-
-DEPEND="
- >=virtual/jdk-1.8:*
-"
-RDEPEND="
- dev-libs/apr:1=
- dev-libs/openssl:0/3
- >=virtual/jre-1.8:*
-"
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-tomcat-connectors )"
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-connectors.apache.org.asc"
-
-JAVA_RESOURCE_DIRS="../resources"
-JAVA_SRC_DIR="../java"
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="../test"
-
-PATCHES=(
- "${FILESDIR}"/tomcat-native-2.0.3-slibtool.patch #778914
-)
-
-DOCS=( ../{CHANGELOG.txt,NOTICE,README.txt} )
-
-src_prepare() {
- java-pkg-2_src_prepare
- mkdir -p "${JAVA_RESOURCE_DIRS}/META-INF" || die
- sed -ne '/attribute name/s:^.*name="\(.*\)" value="\(.*\)".*$:\1\: \2:p' \
- ../build.xml \
- | sed "s:\${version}:${PV}:" \
- > "${JAVA_RESOURCE_DIRS}/META-INF/MANIFEST.MF" || die
- default
-
- # Needed for the slibtool patch
- sed -i 's/configure.in/configure.ac/' configure.in || die
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- --with-apr="${EPREFIX}"/usr/bin/apr-1-config
- --with-ssl="${EPREFIX}"/usr
- )
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- java-pkg-simple_src_compile
- default
-}
-
-src_test() {
- JAVA_TEST_EXTRA_ARGS=( -Djava.library.path=".libs" )
- java-pkg-simple_src_test
-}
-
-src_install() {
- java-pkg-simple_src_install
- java-pkg_doso .libs/*.so*
- dodoc -r ../docs
- ! use static-libs && find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
- elog "For more information, please visit"
- elog "https://tomcat.apache.org/tomcat-9.0-doc/apr.html"
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/tomcat-native/, dev-java/tomcat-native/files/
@ 2024-03-15 10:17 Miroslav Šulc
0 siblings, 0 replies; 3+ messages in thread
From: Miroslav Šulc @ 2024-03-15 10:17 UTC (permalink / raw
To: gentoo-commits
commit: 4f0892e15a77b4facb3495b15a56dfa33a33dc6d
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Tue Feb 13 16:25:54 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Mar 15 10:14:45 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f0892e1
dev-java/tomcat-native: add slibtool.patch
Closes: https://bugs.gentoo.org/924337
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../files/tomcat-native-1.2.39-slibtool.patch | 26 ++++++++++++++++++++++
dev-java/tomcat-native/tomcat-native-1.2.39.ebuild | 4 +++-
2 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/dev-java/tomcat-native/files/tomcat-native-1.2.39-slibtool.patch b/dev-java/tomcat-native/files/tomcat-native-1.2.39-slibtool.patch
new file mode 100644
index 000000000000..e193a0ffd905
--- /dev/null
+++ b/dev-java/tomcat-native/files/tomcat-native-1.2.39-slibtool.patch
@@ -0,0 +1,26 @@
+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(+)
+
+--- a/configure.in
++++ b/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-1.2.39.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.39.ebuild
index 5d246c6ecdab..e1e3cd36a857 100644
--- a/dev-java/tomcat-native/tomcat-native-1.2.39.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-1.2.39.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=8
@@ -38,8 +38,10 @@ JAVA_TEST_GENTOO_CLASSPATH="junit-4"
JAVA_TEST_SRC_DIR="../test"
DOCS=( ../{CHANGELOG.txt,NOTICE,README.txt} )
+PATCHES=( "${FILESDIR}/tomcat-native-1.2.39-slibtool.patch" )
src_prepare() {
+ default #780585
java-pkg-2_src_prepare
mkdir -p "${JAVA_RESOURCE_DIRS}/META-INF" || die
sed -ne '/attribute name/s:^.*name="\(.*\)" value="\(.*\)".*$:\1\: \2:p' \
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-03-15 10:17 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-03-15 10:17 [gentoo-commits] repo/gentoo:master commit in: dev-java/tomcat-native/, dev-java/tomcat-native/files/ Miroslav Šulc
-- strict thread matches above, loose matches on Subject: below --
2023-09-15 4:51 Arthur Zamarin
2023-02-19 7:56 Miroslav Šulc
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox