From 7c5313a0d70a9769aac80e5b30f3968a47f373bb Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 26 Apr 2021 11:03:47 +0300 Subject: Provisioning: Move GCC toolset script under right platform folder MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I93ba0f12c4377d77d5336b01089ed3bcf95e2c64 Reviewed-by: Tony Sarajärvi --- .../03-install-gcc-toolset.sh | 41 ++++++++++++++++++++++ .../03-install-gcc-toolset.sh | 41 ---------------------- 2 files changed, 41 insertions(+), 41 deletions(-) create mode 100644 coin/provisioning/qtci-linux-CentOS-8.1-x86_64/03-install-gcc-toolset.sh delete mode 100644 coin/provisioning/qtci-linux-CentOS-8.3-x86_64/03-install-gcc-toolset.sh diff --git a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/03-install-gcc-toolset.sh b/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/03-install-gcc-toolset.sh new file mode 100644 index 00000000..54b9d774 --- /dev/null +++ b/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/03-install-gcc-toolset.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2021 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$ +## +############################################################################# + +set -ex + +sudo yum -y install gcc-toolset-9 + +echo "source /opt/rh/gcc-toolset-9/enable" >> ~/.bashrc + diff --git a/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/03-install-gcc-toolset.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/03-install-gcc-toolset.sh deleted file mode 100644 index 54b9d774..00000000 --- a/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/03-install-gcc-toolset.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2021 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$ -## -############################################################################# - -set -ex - -sudo yum -y install gcc-toolset-9 - -echo "source /opt/rh/gcc-toolset-9/enable" >> ~/.bashrc - -- cgit v1.2.3