From 375dafe3ef40eb61e831902a1ae45ecca555fec6 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 13 Oct 2022 12:28:00 +1100 Subject: Build: use bash for build environment script - Prefer bash over sh to so it's unambiguous which features can be used. - Use array syntax to specify main package list, allowing to comment why packages are required and making git-blame easier to track down commits that add/remove packages. - Add license header. --- .../build_environment/linux/linux-centos7-setup.sh | 60 +++++++++++++++++----- 1 file changed, 48 insertions(+), 12 deletions(-) diff --git a/build_files/build_environment/linux/linux-centos7-setup.sh b/build_files/build_environment/linux/linux-centos7-setup.sh index 84c14a1d2be..6cef1d718c7 100644 --- a/build_files/build_environment/linux/linux-centos7-setup.sh +++ b/build_files/build_environment/linux/linux-centos7-setup.sh @@ -1,4 +1,8 @@ -#!/bin/sh +#!/usr/bin/env bash +# SPDX-License-Identifier: GPL-2.0-or-later + +# This script is part of the official build environment, see WIKI page for details. +# https://wiki.blender.org/wiki/Building_Blender/Other/CentOS7ReleaseEnvironment set -e @@ -22,18 +26,50 @@ yum -y install centos-release-scl yum -y install devtoolset-9 # Install packages needed for Blender's dependencies. -yum -y install -y \ - git subversion bzip2 tar cmake3 patch make autoconf automake libtool \ - meson ninja-build \ - libXrandr-devel libXinerama-devel libXcursor-devel libXi-devel \ - libX11-devel libXt-devel \ - mesa-libEGL-devel mesa-libGL-devel mesa-libGLU-devel \ - zlib-devel \ - rubygem-asciidoctor \ - wget tcl yasm python36 python-setuptools bison flex \ - ncurses-devel \ - wayland-devel libwayland-client libwayland-server \ +PACKAGES=( + git + subversion + bzip2 + tar + cmake3 + patch + make + autoconf + automake + libtool + meson + ninja-build + + libXrandr-devel + libXinerama-devel + libXcursor-devel + libXi-devel + libX11-devel libXt-devel + + mesa-libEGL-devel + mesa-libGL-devel + mesa-libGLU-devel + + zlib-devel + rubygem-asciidoctor + wget + tcl + yasm + + python36 + python-setuptools + + bison + flex + ncurses-devel + + wayland-devel + libwayland-client + libwayland-server +) + +yum -y install -y ${PACKAGES[@]} # Dependencies for Mesa yum -y install expat-devel -- cgit v1.2.3