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 e4ffa0fe09 Retest new library loading code on MacOS using GH CI e4ffa0fe09 is described below commit e4ffa0fe0985a848eecbd3d7c6c3250ecc025ea0 Author: remm <r...@apache.org> AuthorDate: Thu Jun 27 22:25:56 2024 +0200 Retest new library loading code on MacOS using GH CI --- .github/workflows/ci.yml | 4 +++- java/org/apache/tomcat/util/openssl/openssl_h.java | 14 +++----------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5ee36e337c..89a3f1eb4c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,12 +33,14 @@ jobs: isMain: - ${{ contains(github.ref, 'main') }} java: [ 17, 21, 22 ] - os: [ ubuntu-latest, windows-latest ] + os: [ ubuntu-latest, windows-latest, macos-latest ] exclude: - isMain: true java: 17 - os: windows-latest java: 21 + - os: macos-latest + java: 21 name: JDK${{ matrix.java }} ${{ matrix.os }} runs-on: ${{ matrix.os }} steps: diff --git a/java/org/apache/tomcat/util/openssl/openssl_h.java b/java/org/apache/tomcat/util/openssl/openssl_h.java index 3c0dcd2046..a8f5777bdb 100644 --- a/java/org/apache/tomcat/util/openssl/openssl_h.java +++ b/java/org/apache/tomcat/util/openssl/openssl_h.java @@ -22,7 +22,6 @@ package org.apache.tomcat.util.openssl; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.util.Arrays; -import java.util.Locale; import java.util.stream.Collectors; import java.lang.foreign.*; import static java.lang.foreign.ValueLayout.*; @@ -50,16 +49,9 @@ public class openssl_h { static final boolean TRACE_DOWNCALLS = Boolean.getBoolean("jextract.trace.downcalls"); static final SymbolLookup SYMBOL_LOOKUP; static { - String os = System.getProperty("os.name").toLowerCase(Locale.ENGLISH); - // Note: Library loading is not portable for MacOS https://github.com/sergot/openssl/issues/81 - if (os.indexOf("mac") >= 0) { - System.loadLibrary("ssl"); - SYMBOL_LOOKUP = SymbolLookup.loaderLookup().or(Linker.nativeLinker().defaultLookup()); - } else { - SYMBOL_LOOKUP = SymbolLookup.libraryLookup(System.mapLibraryName("ssl"), LIBRARY_ARENA) - .or(SymbolLookup.loaderLookup()) - .or(Linker.nativeLinker().defaultLookup()); - } + SYMBOL_LOOKUP = SymbolLookup.libraryLookup(System.mapLibraryName("ssl"), LIBRARY_ARENA) + .or(SymbolLookup.loaderLookup()) + .or(Linker.nativeLinker().defaultLookup()); } static void traceDowncall(String name, Object... args) { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org