coin: Sync iodbc and postgresql provisioning with dev

Missed when cherry-picking 8b8265e81bd9afd7a6d85b4b984fd4c2707142b2

Change-Id: I2eb4169677104e4ce1f129452aefa1a7a1190408
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>

4 files changed, 6 insertions, 96 deletions

diff --git a/coin/provisioning/qtci-macos-11.0-arm/25-postgresql.sh b/coin/provisioning/qtci-macos-11.0-arm/25-postgresql.sh
index 4afcf28a..db1f5236 100755
--- a/coin/provisioning/qtci-macos-11.0-arm/25-postgresql.sh
+++ b/coin/provisioning/qtci-macos-11.0-arm/25-postgresql.sh
@@ -1,50 +1,5 @@
 #!/usr/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2020 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL21$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-# This script installs PostgreSQL
-
-# PostgreSQL is needed for Qt to be able to support PostgreSQL
-
 set -ex
 
-# shellcheck source=../common/unix/SetEnvVar.sh
-source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
-
-psqlVersion="13"
-
-brew install postgresql@$psqlVersion
-
-SetEnvVar "POSTGRESQLBINPATH" "/opt/homebrew/bin"
-echo "PostgreSQL = $psqlVersion" >> ~/versions.txt
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/macos/postgresql.sh"
diff --git a/coin/provisioning/qtci-macos-11.0-arm/26-odbc.sh b/coin/provisioning/qtci-macos-11.0-arm/26-odbc.sh
index 2aedfe7b..821c859f 100755
--- a/coin/provisioning/qtci-macos-11.0-arm/26-odbc.sh
+++ b/coin/provisioning/qtci-macos-11.0-arm/26-odbc.sh
@@ -4,4 +4,4 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-"$BASEDIR/../common/macos/libiodbc.sh"
+"$BASEDIR/../common/macos/libiodbc.sh" --with-universal
diff --git a/coin/provisioning/qtci-macos-12.0-arm/25-postgresql.sh b/coin/provisioning/qtci-macos-12.0-arm/25-postgresql.sh
index 4afcf28a..db1f5236 100755
--- a/coin/provisioning/qtci-macos-12.0-arm/25-postgresql.sh
+++ b/coin/provisioning/qtci-macos-12.0-arm/25-postgresql.sh
@@ -1,50 +1,5 @@
 #!/usr/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2020 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL21$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-# This script installs PostgreSQL
-
-# PostgreSQL is needed for Qt to be able to support PostgreSQL
-
 set -ex
 
-# shellcheck source=../common/unix/SetEnvVar.sh
-source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
-
-psqlVersion="13"
-
-brew install postgresql@$psqlVersion
-
-SetEnvVar "POSTGRESQLBINPATH" "/opt/homebrew/bin"
-echo "PostgreSQL = $psqlVersion" >> ~/versions.txt
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/macos/postgresql.sh"
diff --git a/coin/provisioning/qtci-macos-12.0-arm/26-odbc.sh b/coin/provisioning/qtci-macos-12.0-arm/26-odbc.sh
index 2aedfe7b..821c859f 100755
--- a/coin/provisioning/qtci-macos-12.0-arm/26-odbc.sh
+++ b/coin/provisioning/qtci-macos-12.0-arm/26-odbc.sh
@@ -4,4 +4,4 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-"$BASEDIR/../common/macos/libiodbc.sh"
+"$BASEDIR/../common/macos/libiodbc.sh" --with-universal