This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new ca04585256 Add an extra flag for the cryto lib in build.xml
ca04585256 is described below
commit ca045852561a010dcb16784ebe11bd992265ec9c
Author: remm <r...@apache.org>
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 a5c1dd4edc..f6e71d271e 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 044442c9bb..f47b137d1c 100644
--- a/build.xml
+++ b/build.xml
@@ -2059,6 +2059,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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
