diff options
Diffstat (limited to 'www-servers/tomcat/files/tomcat-9.0.72-build.xml.patch')
-rw-r--r-- | www-servers/tomcat/files/tomcat-9.0.72-build.xml.patch | 99 |
1 files changed, 99 insertions, 0 deletions
diff --git a/www-servers/tomcat/files/tomcat-9.0.72-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.72-build.xml.patch new file mode 100644 index 000000000000..985d5d4f94fb --- /dev/null +++ b/www-servers/tomcat/files/tomcat-9.0.72-build.xml.patch @@ -0,0 +1,99 @@ +diff --git a/build.xml b/build.xml +index b420c2a..abecfde 100644 +--- a/build.xml ++++ b/build.xml +@@ -1436,9 +1436,9 @@ + + <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples" + description="Default. Builds a working Tomcat instance"> +- ++<!-- not needed for us + <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> +- ++--> + <!-- Copy scripts --> + <copy todir="${tomcat.build}/bin"> + <fileset dir="bin"> +@@ -1498,7 +1498,9 @@ + <exclude name="${jdt.jar.filename}"/> + </fileset> + </delete> ++<!-- we provide jdt jar externally + <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> ++--> + + <!-- Add sources for examples --> + <antcall target="examples-sources" /> +@@ -2154,11 +2156,12 @@ + </copy> + + <!-- Source bundles for native components --> ++<!-- we provide tomcat native as another package and we don't need commons-daemon + <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz" + file="${tomcat-native.tar.gz}" /> + <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz" + file="${commons-daemon.native.src.tgz}" /> +- ++--> + <!-- platform README files --> + <echo append="false" file="${tomcat.dist}/bin/x64/README"> + Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. +@@ -2319,8 +2322,10 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. + <link href="../elapi"/> + <link href="../websocketapi"/> + <link href="../jaspicapi"/> ++<!-- net is not accessed from emerge + <link href="https://docs.oracle.com/javase/8/docs/api/"/> + <link href="https://javaee.github.io/javaee-spec/javadocs/"/> ++--> + <packageset dir="${tomcat.dist}/src/java/"> + <include name="org/**"/> + <exclude name="org/apache/el/parser/**"/> +@@ -3234,6 +3239,7 @@ asf.ldap.username=${release.asfusername} + depends="setup-bnd"> + + <!-- Download Commons Daemon --> ++<!-- not needed + <antcall target="downloadgz-2"> + <param name="sourcefile.1" value="${commons-daemon.bin.loc.1}"/> + <param name="sourcefile.2" value="${commons-daemon.bin.loc.2}"/> +@@ -3242,8 +3248,9 @@ asf.ldap.username=${release.asfusername} + <param name="checksum.algorithm" value="${commons-daemon.bin.checksum.algorithm}"/> + <param name="checksum.value" value="${commons-daemon.bin.checksum.value}"/> + </antcall> +- ++--> + <!-- Download JDT (Eclipse compiler) --> ++<!-- we provide JDT + <antcall target="downloadfile-2"> + <param name="sourcefile.1" value="${jdt.loc.1}"/> + <param name="sourcefile.2" value="${jdt.loc.2}"/> +@@ -3253,8 +3260,9 @@ asf.ldap.username=${release.asfusername} + <param name="checksum.algorithm" value="${jdt.checksum.algorithm}"/> + <param name="checksum.value" value="${jdt.checksum.value}"/> + </antcall> +- ++--> + <!-- Download WS API --> ++<!-- we provide jaxrpc + <antcall target="downloadfile"> + <param name="sourcefile" value="${jaxrpc-lib.loc}"/> + <param name="destfile" value="${jaxrpc-lib.jar}"/> +@@ -3263,6 +3271,8 @@ asf.ldap.username=${release.asfusername} + <param name="checksum.algorithm" value="${jaxrpc-lib.checksum.algorithm}"/> + <param name="checksum.value" value="${jaxrpc-lib.checksum.value}"/> + </antcall> ++--> ++<!-- we provide wsdl4j + <antcall target="downloadfile"> + <param name="sourcefile" value="${wsdl4j-lib.loc}"/> + <param name="destfile" value="${wsdl4j-lib.jar}"/> +@@ -3271,7 +3281,7 @@ asf.ldap.username=${release.asfusername} + <param name="checksum.algorithm" value="${wsdl4j-lib.checksum.algorithm}"/> + <param name="checksum.value" value="${wsdl4j-lib.checksum.value}"/> + </antcall> +- ++--> + </target> + + <target name="download-test-compile" |