From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Thu, 28 Dec 2023 09:21:12 +0000 (+0100)
Subject: [3.12] gh-110459: Make sure --with-openssl-rpath works on macOS (GH-113441) (#113535)
X-Git-Tag: v3.12.2~245
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=72073ca5603bbd8d8a00b51fe508d3465f95f634;p=thirdparty%2FPython%2Fcpython.git

[3.12] gh-110459: Make sure --with-openssl-rpath works on macOS (GH-113441) (#113535)

gh-110459: Make sure --with-openssl-rpath works on macOS (GH-113441)

* gh-110459: Make sure --with-openssl-rpath works on macOS

On macOS the `-rpath` linker flag is spelled differently
than on on platforms.
(cherry picked from commit cc13eabc7ce08accf49656e258ba500f74a1dae8)

Co-authored-by: Ronald Oussoren <ronaldoussoren@mac.com>
---

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
index 000000000000..44ffd857785f
--- /dev/null
+++ b/Misc/NEWS.d/next/macOS/2023-12-23-22-41-07.gh-issue-110459.NaMBJy.rst
@@ -0,0 +1,2 @@
+Running ``configure ... --with-openssl-rpath=X/Y/Z`` no longer fails to detect
+OpenSSL on macOS.
diff --git a/configure b/configure
index 99dd1fe59580..89cb0af392e5 100755
--- a/configure
+++ b/configure
@@ -28114,7 +28114,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
 
diff --git a/configure.ac b/configure.ac
index bd2be94b47cb..4ae70a10ef81 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7002,7 +7002,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])