From b073e4c5d80bca39600c64e15287f81b66e72700 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20=C3=85lund?= <fredrik.alund@mimer.com>
Date: Mon, 16 Oct 2023 14:40:47 +0200
Subject: [PATCH] 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
Pick-to: 6.6
Change-Id: I5f1bf3413103c07a94a47b5421c41b8b1234ca22
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
---
 coin/provisioning/common/macos/mimersql.sh | 21 ++++++++++++++++++---
 1 file 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