diff options
| author | Fredrik Ålund <fredrik.alund@mimer.com> | 2023-10-16 14:40:47 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-10-21 16:20:25 +0000 |
| commit | 3d9db597b89452318919251c69156330f751a23f (patch) | |
| tree | 3dc3f77ecec44c2a33f677084a6fa97af21a4f8c | |
| parent | 5f844c1f9e37859c829b3e163d89070416e38738 (diff) | |
Mimer SQL: Do not unpack directly to /usr/local and use sudo
Unpacking the Mimer SQL universal binary package fails on macOS 14-arm.
Do not unpack directly to /usr/local and use sudo. Verify that all
directories exist.
Fixes: QTBUG-111219
Change-Id: I5f1bf3413103c07a94a47b5421c41b8b1234ca22
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
(cherry picked from commit b073e4c5d80bca39600c64e15287f81b66e72700)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rwxr-xr-x | coin/provisioning/common/macos/mimersql.sh | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/coin/provisioning/common/macos/mimersql.sh b/coin/provisioning/common/macos/mimersql.sh index 4f207700..4ec79f5a 100755 --- a/coin/provisioning/common/macos/mimersql.sh +++ b/coin/provisioning/common/macos/mimersql.sh @@ -34,9 +34,24 @@ appPrefix="" DownloadURL "$PrimaryUrl" "$AltUrl" "$SHA1" "/tmp/$mimerSqlPackageName" echo "Installing $mimerSqlPackageName" -tar -C /usr/local -zxf /tmp/$mimerSqlPackageName - +if [ -e /tmp/mimersql_${mimerSqlVersion} ]; then + rm -r /tmp/mimersql_${mimerSqlVersion} +fi +mkdir /tmp/mimersql_${mimerSqlVersion} +tar -C /tmp/mimersql_${mimerSqlVersion} -zxf /tmp/$mimerSqlPackageName +if [ ! -e /usr/local/include ]; then + sudo mkdir -p /usr/local/include + sudo chmod 777 /usr/local/include +fi +if [ ! -e /usr/local/lib ]; then + sudo mkdir -p /usr/local/lib + sudo chmod 777 /usr/local/lib +fi +sudo cp /tmp/mimersql_${mimerSqlVersion}/include/*.h /usr/local/include/ +sudo chmod 755 /usr/local/include/mimer*.h +sudo cp /tmp/mimersql_${mimerSqlVersion}/lib/libmimerapi.dylib /usr/local/lib/ +sudo chmod 755 /usr/local/lib/libmimerapi.dylib echo "Removing $mimerSqlPackageName" rm "/tmp/$mimerSqlPackageName" - +rm -r /tmp/mimersql_${mimerSqlVersion} echo "Mimer SQL = $mimerSqlVersion" >> ~/versions.txt |