diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2020-01-08 18:46:58 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2020-01-08 18:46:58 +0300 |
| commit | ba505510f2b9dfd3e14905649a887d42275afbde (patch) | |
| tree | b56dec439c0c9d89a405c0355660781d68d7cece /scripts/ci | |
| parent | 34dee0ea4e969d6d5b37cb842fc3b9f73f2dc2ae (diff) | |
FreeBSD: fix provisioning script to force reinstall perl5 at the end
It didn't work otherwise.
Diffstat (limited to 'scripts/ci')
| -rwxr-xr-x | scripts/ci/provisioning/freebsd.sh | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/scripts/ci/provisioning/freebsd.sh b/scripts/ci/provisioning/freebsd.sh index 76c1ba59f11..c43762cffd9 100755 --- a/scripts/ci/provisioning/freebsd.sh +++ b/scripts/ci/provisioning/freebsd.sh @@ -29,21 +29,6 @@ if ! pkg info > /dev/null; then exit 1 fi -## Jan 7 2020 - work around image having mangled perl defaults -if pkg info perl5.26; then - pkg remove -y perl5.26 -fi -if ! pkg info perl5-5.30; then - if ! pkg install -y perl5-5.30; then - echo "[FATAL] Cannot install a working perl5" - exit 1 - fi -fi -if [ ! -f /usr/local/bin/perl ]; then - ## Force reinstall so it places /usr/local/bin/perl binary - pkg install -f -y perl5-5.30 -fi - ## These packages are MUST have. if ! pkg install -y bash git gmake autoconf automake cmake libtool python27 python36 ca_root_nss; then ## Kill the attempt quickly if we definitely cannot build. @@ -56,6 +41,12 @@ for pn in gettext-runtime gettext-tools cairo libdrm mesa-dri mesa-libs openjdk8 pkg install -y $pn || true done +## Jan 7 2020 - work around image having mangled perl defaults +if [ ! -f /usr/local/bin/perl ]; then + ## Force reinstall so it places /usr/local/bin/perl binary + pkg install -f -y perl5 +fi + # for compatibility with the mono build scripts, ideally shouldn't be necessary ln -s /usr/local/bin/bash /bin/bash ## Do not remove, instead rename; otherwise it's impossible to support ports infrastructure testing |