diff options
| author |   Volkmar W. Pogatzki <gentoo@pogatzki.net> | 2024-03-19 20:52:28 +0100 |
|---|---|---|
| committer |   Miroslav Šulc <fordfrog@gentoo.org> | 2024-04-04 09:48:10 +0200 |
| commit | 8921750856abf7b98ec4e6162fa0d2ffcc570b55 (patch) | |
| tree | a3621d69eb611271c8400a2dcf0cdf9ea2a6e867 /www-servers/tomcat/files/tomcat-10.1.20-do-not-copy.patch | |
| parent | sec-keys/openpgp-keys-apache-tomcat: add 10.1.20 (diff) | |
| download | gentoo-8921750856abf7b98ec4e6162fa0d2ffcc570b55.tar.gz gentoo-8921750856abf7b98ec4e6162fa0d2ffcc570b55.tar.bz2 gentoo-8921750856abf7b98ec4e6162fa0d2ffcc570b55.zip | |
www-servers/tomcat: add 10.1.20 unbundling bnd
Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/35320
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
Diffstat (limited to 'www-servers/tomcat/files/tomcat-10.1.20-do-not-copy.patch')
| -rw-r--r-- | www-servers/tomcat/files/tomcat-10.1.20-do-not-copy.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/www-servers/tomcat/files/tomcat-10.1.20-do-not-copy.patch b/www-servers/tomcat/files/tomcat-10.1.20-do-not-copy.patch new file mode 100644 index 000000000000..ade8527d11f1 --- /dev/null +++ b/www-servers/tomcat/files/tomcat-10.1.20-do-not-copy.patch @@ -0,0 +1,29 @@ +--- a/build.xml ++++ b/build.xml +#<!-- we provide tomcat native as another package and we don't need commons-daemon +@@ -1469,7 +1469,6 @@ + <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples" + description="Default. Builds a working Tomcat instance"> + +- <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> + + <!-- Copy scripts --> + <copy todir="${tomcat.build}/bin"> +#<!-- we provide jdt jar externally +@@ -1530,7 +1529,6 @@ + <exclude name="${jdt.jar.filename}"/> + </fileset> + </delete> +- <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> + + <!-- Delete all other versions of Tomcat Migration Tool for Jakarta EE and copy the current one --> + <local name="migration.jar.filename" /> +#<!-- we provide migration tool externally +@@ -1541,7 +1539,6 @@ + <exclude name="${migration-lib.jar.filename}"/> + </fileset> + </delete> +- <copy file="${migration-lib.jar}" todir="${tomcat.build}/lib"/> + + <!-- Delete all other versions of OpenSSL support for Tomcat and copy the current one --> + <!-- After module release |