Mirrors_UI_SDK/wxWidgets
1
0
Fork 0
mirror of https://github.com/wxWidgets/wxWidgets.git synced 2026-08-17 17:02:51 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Fix readlink problem in configure build under macOS < 12

Browse Source 
Don't use "readlink -f" as readlink doesn't support this option in macOS
11 and earlier. Just construct the full path ourselves instead.

Closes #25675.
This commit is contained in:
Vadim Zeitlin
2025-08-02 15:22:14 +02:00
parent a456327d50
commit 30c0f6a675
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure
Vendored
+6 -4
View File
@@ -34271,15 +34271,17 @@ rm -f core conftest.err conftest.$ac_objext \
DYLIB_RPATH_POSTLINK="${HOST_PREFIX}install_name_tool -id \$@ \$@"
cat <<EOF >change-install-names
#!/bin/sh
set -e
libdir=\$(cd lib ; pwd -P)
libnames=\$(cd lib ; ls -1 libwx*${WX_RELEASE}.dylib)
changes=''
for dep in \${libnames} ; do
target=\$(readlink -f \${4}/\${dep})
changes="\${changes} -change \${target} \${3}/\${dep}"
target=\$(readlink \${4}/\${dep})
changes="\${changes} -change \${libdir}\${target} \${3}/\${dep}"
done
for i in \${libnames} ; do
lib=\$(readlink -f \${1}/\${i})
${HOST_PREFIX}install_name_tool \${changes} -id \${3}/\${i} \${lib}
lib=\$(readlink \${1}/\${i})
${HOST_PREFIX}install_name_tool \${changes} -id \${3}/\${i} \${libdir}/\${lib}
done
if test -f "\${2}/wxrc-${WX_RELEASE}" ; then
configure.in
+6 -4
View File
@@ -4142,15 +4142,17 @@ if test "$wxUSE_SHARED" = "yes"; then
DYLIB_RPATH_POSTLINK="${HOST_PREFIX}install_name_tool -id \$@ \$@"
cat <<EOF >change-install-names
#!/bin/sh
set -e
libdir=\$(cd lib ; pwd -P)
libnames=\$(cd lib ; ls -1 libwx*${WX_RELEASE}.dylib)
changes=''
for dep in \${libnames} ; do
target=\$(readlink -f \${4}/\${dep})
changes="\${changes} -change \${target} \${3}/\${dep}"
target=\$(readlink \${4}/\${dep})
changes="\${changes} -change \${libdir}\${target} \${3}/\${dep}"
done
for i in \${libnames} ; do
lib=\$(readlink -f \${1}/\${i})
${HOST_PREFIX}install_name_tool \${changes} -id \${3}/\${i} \${lib}
lib=\$(readlink \${1}/\${i})
${HOST_PREFIX}install_name_tool \${changes} -id \${3}/\${i} \${libdir}/\${lib}
done
if test -f "\${2}/wxrc-${WX_RELEASE}" ; then
docs/changes.txt
+1
View File
@@ -285,6 +285,7 @@ wxOSX:
- Fix crash on startup when using Farsi as system language (#25561).
- Do not activate "Close" button on Cmd-C (nobugshere, #25346).
- Fix memory leak in wxColour::Set() (#25569).
- Fix regression with configure build under macOS < 12 (#25675).
3.2.8.1: (released 2025-05-25)