This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new 1a1bbed068 Add an extra flag for the cryto lib in build.xml
1a1bbed068 is described below
commit 1a1bbed068da8a21ce3f940c1ed5492ab9ac8c4a
Author: remm <[email protected]>
AuthorDate: Fri Dec 6 15:58:51 2024 +0100
Add an extra flag for the cryto lib in build.xml
---
build.properties.default | 5 +++++
build.xml | 1 +
2 files changed, 6 insertions(+)
diff --git a/build.properties.default b/build.properties.default
index c6afd4a25c..3e0cfeb40e 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -84,8 +84,13 @@ java.net.preferIPv4Stack=false
# MacOS requires non-default settings to test FFM with OpenSSL. Eg:
#openssl.ffm.1=-Dorg.apache.tomcat.util.openssl.USE_SYSTEM_LOAD_LIBRARY=true
#openssl.ffm.2=-Dorg.apache.tomcat.util.openssl.LIBRARY_NAME=ssl
+# Allows loading the crypto library using the JVM and the given name
+# if using org.apache.tomcat.util.openssl.USE_SYSTEM_LOAD_LIBRARY
+# (otherwise it is loaded later by ssl)
+#openssl.ffm.3=-Dorg.apache.tomcat.util.openssl.CRYPTO_LIBRARY_NAME=crypto
openssl.ffm.1=-DNoop1
openssl.ffm.2=-DNoop2
+openssl.ffm.3=-DNoop3
# ----- Release build settings -----
diff --git a/build.xml b/build.xml
index 920c293bd9..eea8006a86 100644
--- a/build.xml
+++ b/build.xml
@@ -2060,6 +2060,7 @@
<!-- These are managed as jvmargs rather than sysproperty because
the default varies by OS -->
<jvmarg value="${openssl.ffm.1}" />
<jvmarg value="${openssl.ffm.2}" />
+ <jvmarg value="${openssl.ffm.3}" />
<classpath refid="tomcat.test.classpath" />
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
