fix linux SDK without DTS

NatronGitHub · Jun 7, 2020 · 513a249 · 513a249
1 parent 880bb03
commit 513a249
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/tools/jenkins/include/scripts/pkg/gnutls.sh b/tools/jenkins/include/scripts/pkg/gnutls.sh
@@ -4,7 +4,7 @@
 # see http://www.linuxfromscratch.org/blfs/view/cvs/postlfs/gnutls.html
 GNUTLS_VERSION=3.6.13
 GNUTLS_VERSION_MICRO= #.1
-if [ "${CENTOS}" = 6 ] && [ -z "${DTS}" ]; then
+if [ "${CENTOS:-0}" = 6 ] && [ -z "${DTS+x}" ]; then
     GNUTLS_VERSION=3.6.8
     GNUTLS_VERSION_MICRO=
     # 3.6.9 and later fail on CentOS6 (probably needs an updated binutils/gas) with:

diff --git a/tools/jenkins/include/scripts/pkg/imagemagick6.sh b/tools/jenkins/include/scripts/pkg/imagemagick6.sh
@@ -3,7 +3,7 @@
 # Install ImageMagick6
 # see http://www.linuxfromscratch.org/blfs/view/cvs/general/imagemagick6.html
 MAGICK_VERSION=6.9.11-6
-if [ "${CENTOS}" = 6 ] && [ -z "${DTS}" ]; then
+if [ "${CENTOS:-0}" = 6 ] && [ -z "${DTS+x}" ]; then
     MAGICK_VERSION=6.9.10-78 # 6.9.10-79 and later fail to compile on CentOS6 with "undefined reference to `aligned_alloc'"
 fi
 MAGICK_VERSION_SHORT=${MAGICK_VERSION%-*}

diff --git a/tools/jenkins/include/scripts/pkg/imagemagick7.sh b/tools/jenkins/include/scripts/pkg/imagemagick7.sh
@@ -3,7 +3,7 @@
 # install ImageMagick7
 # see http://www.linuxfromscratch.org/blfs/view/cvs/general/imagemagick.html
 MAGICK7_VERSION=7.0.10-6
-if [ "${CENTOS}" = 6 ] && [ -z "${DTS}" ]; then
+if [ "${CENTOS:-0}" = 6 ] && [ -z "${DTS+x}" ]; then
     MAGICK7_VERSION=7.0.9-8 # 7.0.9-9 (probably) and later fail to compile on CentOS6 with "undefined reference to `aligned_alloc'"
 fi
 MAGICK7_VERSION_SHORT=${MAGICK7_VERSION%-*}