Fix dylib symlinks on Apple Silicon Macs

See #23143, #24524. (cherry picked from commit fa2fb36)
wxWidgets · May 13, 2024 · 7fdc132 · 7fdc132
1 parent ad7eb3a
commit 7fdc132
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/configure b/configure
@@ -33993,6 +33993,10 @@ for dep in \${libnames} ; do
     changes="\${changes} -change \${4}/\${dep} \${3}/\${dep}"
 done
 for i in \${libnames} ; do
+    if test -L \${1}/\${i}; then
+        # skip symbolic links
+        continue
+    fi
     ${HOST_PREFIX}install_name_tool \${changes} -id \${3}/\${i} \${1}/\${i}
 done
 

diff --git a/configure.in b/configure.in
@@ -4067,6 +4067,10 @@ for dep in \${libnames} ; do
     changes="\${changes} -change \${4}/\${dep} \${3}/\${dep}"
 done
 for i in \${libnames} ; do
+    if test -L \${1}/\${i}; then
+        # skip symbolic links
+        continue
+    fi
     ${HOST_PREFIX}install_name_tool \${changes} -id \${3}/\${i} \${1}/\${i}
 done
 

diff --git a/docs/changes.txt b/docs/changes.txt
@@ -323,6 +323,7 @@ wxOSX:
 - Fix handling of nested modal dialogs (WakA, #24418).
 - Fix translations when using zh-Hans-CN locale (#24396).
 - Add filters support to wxFileDialog::ShowWindowModal() (Gammasoft, #24438).
+- Fix installation on some Apple Silicon Macs (Thomas Holder, #23143, #24524).
 
 wxQt: