cmake-jni.patch

   1 --- cmake-3.27.3/Modules/FindJNI.cmake.orig     2023-08-16 19:46:35.000000000 +0200
   2 +++ cmake-3.27.3/Modules/FindJNI.cmake  2023-08-23 18:20:08.029434273 +0200
   3 @@ -141,7 +141,7 @@ macro(java_append_library_directories _v
   4      # 1.6.0_18 + icedtea patches. However, it would be much better to base the
   5      # guess on the first part of the GNU config.guess platform triplet.
   6      if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
   7 -      if(CMAKE_LIBRARY_ARCHITECTURE STREQUAL "x86_64-linux-gnux32")
   8 +      if(CMAKE_LIBRARY_ARCHITECTURE STREQUAL "x86_64-linux-gnux32" OR LIB_SUFFIX STREQUAL "x32")
   9          set(_java_libarch "x32" "amd64" "i386")
  10        else()
  11          set(_java_libarch "amd64" "i386")
  12 @@ -272,56 +272,27 @@ if (WIN32)
  13  endif()
  14
  15  set(_JNI_JAVA_DIRECTORIES_BASE
  16 -  /usr/lib/jvm/java
  17 -  /usr/lib/java
  18 -  /usr/lib/jvm
  19 -  /usr/local/lib/java
  20 +  /usr/lib${LIB_SUFFIX}/jvm/java
  21 +  /usr/lib${LIB_SUFFIX}/java
  22 +  /usr/lib${LIB_SUFFIX}/jvm
  23 +  /usr/local/lib${LIB_SUFFIX}/java
  24    /usr/local/share/java
  25 -  /usr/lib/j2sdk1.4-sun
  26 -  /usr/lib/j2sdk1.5-sun
  27    /opt/sun-jdk-1.5.0.04
  28 -  /usr/lib/jvm/java-6-sun
  29 -  /usr/lib/jvm/java-1.5.0-sun
  30 -  /usr/lib/jvm/java-6-sun-1.6.0.00       # can this one be removed according to #8821 ? Alex
  31 -  /usr/lib/jvm/java-6-openjdk
  32 -  /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0        # fedora
  33 +  /usr/lib${LIB_SUFFIX}/jvm/java-6-sun
  34 +  /usr/lib${LIB_SUFFIX}/jvm/java-1.5.0-sun
  35 +  /usr/lib${LIB_SUFFIX}/jvm/java-6-sun-1.6.0.00       # can this one be removed according to #8821 ? Alex
  36 +  /usr/lib${LIB_SUFFIX}/jvm/java-6-openjdk
  37 +  /usr/lib${LIB_SUFFIX}/jvm/java-1.6.0-openjdk-1.6.0.0        # fedora
  38    # Debian specific paths for default JVM
  39 -  /usr/lib/jvm/default-java
  40 +  /usr/lib${LIB_SUFFIX}/jvm/default-java
  41    # Arch Linux specific paths for default JVM
  42 -  /usr/lib/jvm/default
  43 -  # Ubuntu specific paths for default JVM
  44 -  /usr/lib/jvm/java-21-openjdk-{libarch}    # Ubuntu 23.04
  45 -  /usr/lib/jvm/java-20-openjdk-{libarch}    # Ubuntu 22.10
  46 -  /usr/lib/jvm/java-19-openjdk-{libarch}    # Ubuntu 22.04 LTS
  47 -  /usr/lib/jvm/java-18-openjdk-{libarch}    # Ubuntu 22.04 LTS
  48 -  /usr/lib/jvm/java-17-openjdk-{libarch}    # Ubuntu 18.04 LTS
  49 -  /usr/lib/jvm/java-16-openjdk-{libarch}    # Ubuntu 20.04 LTS
  50 -  /usr/lib/jvm/java-13-openjdk-{libarch}    # Ubuntu 20.04 LTS
  51 -  /usr/lib/jvm/java-11-openjdk-{libarch}    # Ubuntu 18.04 LTS
  52 -  /usr/lib/jvm/java-8-openjdk-{libarch}     # Ubuntu 15.10
  53 -  /usr/lib/jvm/java-7-openjdk-{libarch}     # Ubuntu 15.10
  54 -  /usr/lib/jvm/java-6-openjdk-{libarch}     # Ubuntu 15.10
  55 -  # OpenBSD specific paths for default JVM
  56 -  /usr/local/jdk-1.7.0
  57 -  /usr/local/jre-1.7.0
  58 -  /usr/local/jdk-1.6.0
  59 -  /usr/local/jre-1.6.0
  60 -  # FreeBSD specific paths for default JVM
  61 -  /usr/local/openjdk15
  62 -  /usr/local/openjdk14
  63 -  /usr/local/openjdk13
  64 -  /usr/local/openjdk12
  65 -  /usr/local/openjdk11
  66 -  /usr/local/openjdk8
  67 -  /usr/local/openjdk7
  68 -  # SuSE specific paths for default JVM
  69 -  /usr/lib64/jvm/java
  70 -  /usr/lib64/jvm/jre
  71 +  /usr/lib${LIB_SUFFIX}/jvm/default
  72    )
  73
  74  set(_JNI_JAVA_AWT_LIBRARY_TRIES)
  75  set(_JNI_JAVA_INCLUDE_TRIES)
  76
  77 +if(NOT _JAVA_HOME_EXPLICIT)
  78  foreach(_java_dir IN LISTS _JNI_JAVA_DIRECTORIES_BASE)
  79    list(APPEND _JNI_JAVA_AWT_LIBRARY_TRIES
  80      ${_java_dir}/jre/lib/{libarch}
  81 @@ -338,6 +309,7 @@ endforeach()
  82  JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
  83      ${_JNI_JAVA_AWT_LIBRARY_TRIES}
  84    )
  85 +endif()
  86
  87  set(JAVA_JVM_LIBRARY_DIRECTORIES)
  88  foreach(dir ${JAVA_AWT_LIBRARY_DIRECTORIES})
  89 @@ -365,6 +337,7 @@ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT
  90    ${_JNI_JAVA_INCLUDE_TRIES}
  91    )
  92
  93 +if(NOT _JAVA_HOME_EXPLICIT)
  94  foreach(JAVA_PROG "${JAVA_RUNTIME}" "${JAVA_COMPILE}" "${JAVA_ARCHIVE}")
  95    get_filename_component(jpath "${JAVA_PROG}" PATH)
  96    foreach(JAVA_INC_PATH ../include ../java/include ../share/java/include)
  97 @@ -381,6 +354,7 @@ foreach(JAVA_PROG "${JAVA_RUNTIME}" "${J
  98      endif()
  99    endforeach()
 100  endforeach()
 101 +endif()
 102
 103  if(APPLE)
 104    if(DEFINED XCODE_VERSION)