components/runtime/erlang/patches/configure.patch

   1 diff -Nuraw otp_src_26.2.2_O/lib/crypto/configure otp_src_26.2.2/lib/crypto/configure
   2 --- otp_src_26.2.2_O/lib/crypto/configure       2024-02-07 15:00:00.000000000 +0100
   3 +++ otp_src_26.2.2/lib/crypto/configure 2024-02-18 05:14:02.000000000 +0100
   4 @@ -5594,21 +5594,8 @@
   5
   6
   7
   8 -std_ssl_locations="\
   9 -/usr/local \
  10 -/usr/sfw \
  11 -/usr \
  12 -/opt/local \
  13 -/usr/pkg \
  14 -/usr/local/openssl \
  15 -/usr/local/opt/openssl \
  16 -/opt/homebrew/opt/openssl \
  17 -/usr/lib/openssl \
  18 -/usr/openssl \
  19 -/usr/local/ssl \
  20 -/usr/lib/ssl \
  21 -/usr/ssl \
  22 -/"
  23 +std_ssl_locations="/usr"
  24 +
  25
  26
  27  # Check whether --with-ssl was given.
  28 @@ -5736,7 +5723,7 @@
  29  # Setup subdirectories to search in...
  30  search_subdirs="lib"
  31  if test "$ac_cv_sizeof_void_p" = "8"; then
  32 -   search_subdirs="$search_subdirs lib64 lib/64"
  33 +   search_subdirs="lib/amd64"
  34  else
  35     search_subdirs="$search_subdirs lib32 lib/32"
  36  fi
  37 @@ -7251,7 +7238,7 @@
  38                        # If none of the above links, we skip runtime
  39                        # library path...
  40                        #
  41 -                      for type in std x_std curr; do
  42 +                      for type in curr; do
  43
  44                            ded_ld_rpath="$ded_ld_rflg$SSL_RUNTIME_LIBDIR"
  45                            rpath="$SSL_RUNTIME_LIBDIR"
  46 diff -Nuraw otp_src_26.2.2_O/lib/crypto/configure.ac otp_src_26.2.2/lib/crypto/configure.ac
  47 --- otp_src_26.2.2_O/lib/crypto/configure.ac    2024-02-07 15:00:00.000000000 +0100
  48 +++ otp_src_26.2.2/lib/crypto/configure.ac      2024-02-18 05:12:06.000000000 +0100
  49 @@ -54,6 +54,7 @@
  50  LM_WINDOWS_ENVIRONMENT
  51
  52  ERL_DED
  53 +DED_EXT=so
  54
  55  AC_MSG_CHECKING([for multiarch directory])
  56  multiarch_dir=
  57 @@ -81,21 +82,7 @@
  58
  59  AC_CHECK_SIZEOF(void *)
  60
  61 -std_ssl_locations="\
  62 -/usr/local \
  63 -/usr/sfw \
  64 -/usr \
  65 -/opt/local \
  66 -/usr/pkg \
  67 -/usr/local/openssl \
  68 -/usr/local/opt/openssl \
  69 -/opt/homebrew/opt/openssl \
  70 -/usr/lib/openssl \
  71 -/usr/openssl \
  72 -/usr/local/ssl \
  73 -/usr/lib/ssl \
  74 -/usr/ssl \
  75 -/"
  76 +std_ssl_locations="/usr"
  77
  78  AC_ARG_WITH(ssl,
  79  AS_HELP_STRING([--with-ssl=PATH], [base location of OpenSSL include and lib directories])
  80 @@ -395,7 +382,7 @@
  81  # Setup subdirectories to search in...
  82  search_subdirs="lib"
  83  if test "$ac_cv_sizeof_void_p" = "8"; then
  84 -   search_subdirs="$search_subdirs lib64 lib/64"
  85 +   search_subdirs="lib/amd64"
  86  else
  87     search_subdirs="$search_subdirs lib32 lib/32"
  88  fi
  89 @@ -747,7 +734,7 @@
  90                        # If none of the above links, we skip runtime
  91                        # library path...
  92                        #
  93 -                      for type in std x_std curr; do
  94 +                      for type in curr; do
  95
  96                            ded_ld_rpath="$ded_ld_rflg$SSL_RUNTIME_LIBDIR"
  97                            rpath="$SSL_RUNTIME_LIBDIR"