]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
gh-110459: Make sure --with-openssl-rpath works on macOS (#113441)
authorRonald Oussoren <ronaldoussoren@mac.com>
Thu, 28 Dec 2023 08:42:05 +0000 (09:42 +0100)
committerGitHub <noreply@github.com>
Thu, 28 Dec 2023 08:42:05 +0000 (09:42 +0100)
* gh-110459: Make sure --with-openssl-rpath works on macOS

On macOS the `-rpath` linker flag is spelled differently
than on on platforms.

Misc/NEWS.d/next/macOS/2023-12-23-22-41-07.gh-issue-110459.NaMBJy.rst [new file with mode: 0644]
configure
configure.ac

diff --git a/Misc/NEWS.d/next/macOS/2023-12-23-22-41-07.gh-issue-110459.NaMBJy.rst b/Misc/NEWS.d/next/macOS/2023-12-23-22-41-07.gh-issue-110459.NaMBJy.rst
new file mode 100644 (file)
index 0000000..44ffd85
--- /dev/null
@@ -0,0 +1,2 @@
+Running ``configure ... --with-openssl-rpath=X/Y/Z`` no longer fails to detect
+OpenSSL on macOS.
index 7e50abc29d0c1a9c64746a7d0b90b3a51a724e6c..6d65d3abc1811b1a2d9a122bbf8c6767903b1baf 100755 (executable)
--- a/configure
+++ b/configure
@@ -27478,7 +27478,12 @@ then :
 
 else $as_nop
 
-  rpath_arg="-Wl,-rpath="
+  if test "$ac_sys_system" = "Darwin"
+  then
+     rpath_arg="-Wl,-rpath,"
+  else
+     rpath_arg="-Wl,-rpath="
+  fi
 
 fi
 
index e064848af9ed1b63f309732c624660b99de94abd..bfdabc4474e5eb97f45cf39db99ba119dea9302f 100644 (file)
@@ -6808,7 +6808,12 @@ AX_CHECK_OPENSSL([have_openssl=yes],[have_openssl=no])
 AS_VAR_IF([GNULD], [yes], [
   rpath_arg="-Wl,--enable-new-dtags,-rpath="
 ], [
-  rpath_arg="-Wl,-rpath="
+  if test "$ac_sys_system" = "Darwin"
+  then
+     rpath_arg="-Wl,-rpath,"
+  else
+     rpath_arg="-Wl,-rpath="
+  fi
 ])
 
 AC_MSG_CHECKING([for --with-openssl-rpath])