From 738a3ccc0f422408c153aa9b3d58d7403b7aed0c Mon Sep 17 00:00:00 2001
From: "Zak B. Elep" <zakame@zakame.net>
Date: Tue, 26 Jan 2021 11:10:01 +0800
Subject: [PATCH] :gear: Regenerate Dockerfiles and patches for older Perls

---
 5.008.009-main,threaded-jessie/DevelPatchPerl.patch  |  5 +++--
 5.008.009-main-jessie/DevelPatchPerl.patch           |  5 +++--
 5.008.009-slim,threaded-jessie/DevelPatchPerl.patch  |  5 +++--
 5.008.009-slim-jessie/DevelPatchPerl.patch           |  5 +++--
 5.010.001-main,threaded-jessie/DevelPatchPerl.patch  |  5 +++--
 5.010.001-main-jessie/DevelPatchPerl.patch           |  5 +++--
 5.010.001-slim,threaded-jessie/DevelPatchPerl.patch  |  5 +++--
 5.010.001-slim-jessie/DevelPatchPerl.patch           |  5 +++--
 5.012.005-main,threaded-jessie/DevelPatchPerl.patch  | 10 +++++++---
 5.012.005-main-jessie/DevelPatchPerl.patch           | 10 +++++++---
 5.012.005-slim,threaded-jessie/DevelPatchPerl.patch  | 10 +++++++---
 5.012.005-slim-jessie/DevelPatchPerl.patch           | 10 +++++++---
 5.014.004-main,threaded-jessie/DevelPatchPerl.patch  | 10 +++++++---
 5.014.004-main-jessie/DevelPatchPerl.patch           | 10 +++++++---
 5.014.004-slim,threaded-jessie/DevelPatchPerl.patch  | 10 +++++++---
 5.014.004-slim-jessie/DevelPatchPerl.patch           | 10 +++++++---
 5.016.003-main,threaded-jessie/DevelPatchPerl.patch  | 10 +++++++---
 5.016.003-main-jessie/DevelPatchPerl.patch           | 10 +++++++---
 5.016.003-slim,threaded-jessie/DevelPatchPerl.patch  | 10 +++++++---
 5.016.003-slim-jessie/DevelPatchPerl.patch           | 10 +++++++---
 5.018.004-main,threaded-jessie/DevelPatchPerl.patch  | 10 +++++++---
 5.018.004-main-jessie/DevelPatchPerl.patch           | 10 +++++++---
 5.018.004-slim,threaded-jessie/DevelPatchPerl.patch  | 10 +++++++---
 5.018.004-slim-jessie/DevelPatchPerl.patch           | 10 +++++++---
 5.020.003-main,threaded-stretch/DevelPatchPerl.patch | 11 ++++++++++-
 5.020.003-main-stretch/DevelPatchPerl.patch          | 11 ++++++++++-
 5.020.003-slim,threaded-stretch/DevelPatchPerl.patch | 11 ++++++++++-
 5.020.003-slim-stretch/DevelPatchPerl.patch          | 11 ++++++++++-
 5.022.004-main,threaded-stretch/DevelPatchPerl.patch | 11 ++++++++++-
 5.022.004-main-stretch/DevelPatchPerl.patch          | 11 ++++++++++-
 5.022.004-slim,threaded-stretch/DevelPatchPerl.patch | 11 ++++++++++-
 5.022.004-slim-stretch/DevelPatchPerl.patch          | 11 ++++++++++-
 5.024.004-main,threaded-stretch/DevelPatchPerl.patch | 11 ++++++++++-
 5.024.004-main-stretch/DevelPatchPerl.patch          | 11 ++++++++++-
 5.024.004-slim,threaded-stretch/DevelPatchPerl.patch | 11 ++++++++++-
 5.024.004-slim-stretch/DevelPatchPerl.patch          | 11 ++++++++++-
 5.026.003-main,threaded-buster/DevelPatchPerl.patch  | 11 ++++++++++-
 5.026.003-main,threaded-stretch/DevelPatchPerl.patch | 11 ++++++++++-
 5.026.003-main-buster/DevelPatchPerl.patch           | 11 ++++++++++-
 5.026.003-main-stretch/DevelPatchPerl.patch          | 11 ++++++++++-
 5.026.003-slim,threaded-buster/DevelPatchPerl.patch  | 11 ++++++++++-
 5.026.003-slim,threaded-stretch/DevelPatchPerl.patch | 11 ++++++++++-
 5.026.003-slim-buster/DevelPatchPerl.patch           | 11 ++++++++++-
 5.026.003-slim-stretch/DevelPatchPerl.patch          | 11 ++++++++++-
 5.028.003-main,threaded-buster/DevelPatchPerl.patch  | 11 ++++++++++-
 5.028.003-main,threaded-stretch/DevelPatchPerl.patch | 11 ++++++++++-
 5.028.003-main-buster/DevelPatchPerl.patch           | 11 ++++++++++-
 5.028.003-main-stretch/DevelPatchPerl.patch          | 11 ++++++++++-
 5.028.003-slim,threaded-buster/DevelPatchPerl.patch  | 11 ++++++++++-
 5.028.003-slim,threaded-stretch/DevelPatchPerl.patch | 11 ++++++++++-
 5.028.003-slim-buster/DevelPatchPerl.patch           | 11 ++++++++++-
 5.028.003-slim-stretch/DevelPatchPerl.patch          | 11 ++++++++++-
 5.030.003-main,threaded-buster/DevelPatchPerl.patch  | 11 ++++++++++-
 5.030.003-main,threaded-stretch/DevelPatchPerl.patch | 11 ++++++++++-
 5.030.003-main-buster/DevelPatchPerl.patch           | 11 ++++++++++-
 5.030.003-main-stretch/DevelPatchPerl.patch          | 11 ++++++++++-
 5.030.003-slim,threaded-buster/DevelPatchPerl.patch  | 11 ++++++++++-
 5.030.003-slim,threaded-stretch/DevelPatchPerl.patch | 11 ++++++++++-
 5.030.003-slim-buster/DevelPatchPerl.patch           | 11 ++++++++++-
 5.030.003-slim-stretch/DevelPatchPerl.patch          | 11 ++++++++++-
 60 files changed, 496 insertions(+), 100 deletions(-)

diff --git a/5.008.009-main,threaded-jessie/DevelPatchPerl.patch b/5.008.009-main,threaded-jessie/DevelPatchPerl.patch
index 8b40a4a..202f994 100644
--- a/5.008.009-main,threaded-jessie/DevelPatchPerl.patch
+++ b/5.008.009-main,threaded-jessie/DevelPatchPerl.patch
@@ -119,7 +119,7 @@ index 6f20c5e..684f369 100644
  		or die "Cannot exec $cpp";
  	}
 diff --git a/hints/linux.sh b/hints/linux.sh
-index ac264c3..8cbe7dc 100644
+index ac264c3..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
 @@ -13,11 +13,14 @@
@@ -177,7 +177,8 @@ index ac264c3..8cbe7dc 100644
 +
  # Check if we're about to use Intel's ICC compiler
  case "`${cc:-cc} -V 2>&1`" in
- *"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
 +    # record the version, formats:
 +    # icc (ICC) 10.1 20080801
 +    # icpc (ICC) 10.1 20080801
diff --git a/5.008.009-main-jessie/DevelPatchPerl.patch b/5.008.009-main-jessie/DevelPatchPerl.patch
index 8b40a4a..202f994 100644
--- a/5.008.009-main-jessie/DevelPatchPerl.patch
+++ b/5.008.009-main-jessie/DevelPatchPerl.patch
@@ -119,7 +119,7 @@ index 6f20c5e..684f369 100644
  		or die "Cannot exec $cpp";
  	}
 diff --git a/hints/linux.sh b/hints/linux.sh
-index ac264c3..8cbe7dc 100644
+index ac264c3..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
 @@ -13,11 +13,14 @@
@@ -177,7 +177,8 @@ index ac264c3..8cbe7dc 100644
 +
  # Check if we're about to use Intel's ICC compiler
  case "`${cc:-cc} -V 2>&1`" in
- *"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
 +    # record the version, formats:
 +    # icc (ICC) 10.1 20080801
 +    # icpc (ICC) 10.1 20080801
diff --git a/5.008.009-slim,threaded-jessie/DevelPatchPerl.patch b/5.008.009-slim,threaded-jessie/DevelPatchPerl.patch
index 8b40a4a..202f994 100644
--- a/5.008.009-slim,threaded-jessie/DevelPatchPerl.patch
+++ b/5.008.009-slim,threaded-jessie/DevelPatchPerl.patch
@@ -119,7 +119,7 @@ index 6f20c5e..684f369 100644
  		or die "Cannot exec $cpp";
  	}
 diff --git a/hints/linux.sh b/hints/linux.sh
-index ac264c3..8cbe7dc 100644
+index ac264c3..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
 @@ -13,11 +13,14 @@
@@ -177,7 +177,8 @@ index ac264c3..8cbe7dc 100644
 +
  # Check if we're about to use Intel's ICC compiler
  case "`${cc:-cc} -V 2>&1`" in
- *"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
 +    # record the version, formats:
 +    # icc (ICC) 10.1 20080801
 +    # icpc (ICC) 10.1 20080801
diff --git a/5.008.009-slim-jessie/DevelPatchPerl.patch b/5.008.009-slim-jessie/DevelPatchPerl.patch
index 8b40a4a..202f994 100644
--- a/5.008.009-slim-jessie/DevelPatchPerl.patch
+++ b/5.008.009-slim-jessie/DevelPatchPerl.patch
@@ -119,7 +119,7 @@ index 6f20c5e..684f369 100644
  		or die "Cannot exec $cpp";
  	}
 diff --git a/hints/linux.sh b/hints/linux.sh
-index ac264c3..8cbe7dc 100644
+index ac264c3..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
 @@ -13,11 +13,14 @@
@@ -177,7 +177,8 @@ index ac264c3..8cbe7dc 100644
 +
  # Check if we're about to use Intel's ICC compiler
  case "`${cc:-cc} -V 2>&1`" in
- *"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
 +    # record the version, formats:
 +    # icc (ICC) 10.1 20080801
 +    # icpc (ICC) 10.1 20080801
diff --git a/5.010.001-main,threaded-jessie/DevelPatchPerl.patch b/5.010.001-main,threaded-jessie/DevelPatchPerl.patch
index 6c85c88..11cd099 100644
--- a/5.010.001-main,threaded-jessie/DevelPatchPerl.patch
+++ b/5.010.001-main,threaded-jessie/DevelPatchPerl.patch
@@ -209,7 +209,7 @@ index c5f7aa8..c7c329a 100644
  	db = sdbm_prep(dirname, pagname, flags, mode);
  	free((char *) dirname);
 diff --git a/hints/linux.sh b/hints/linux.sh
-index c88f157..8cbe7dc 100644
+index c88f157..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
 @@ -13,11 +13,14 @@
@@ -268,7 +268,8 @@ index c88f157..8cbe7dc 100644
 +
  # Check if we're about to use Intel's ICC compiler
  case "`${cc:-cc} -V 2>&1`" in
- *"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
 +    # record the version, formats:
 +    # icc (ICC) 10.1 20080801
 +    # icpc (ICC) 10.1 20080801
diff --git a/5.010.001-main-jessie/DevelPatchPerl.patch b/5.010.001-main-jessie/DevelPatchPerl.patch
index 6c85c88..11cd099 100644
--- a/5.010.001-main-jessie/DevelPatchPerl.patch
+++ b/5.010.001-main-jessie/DevelPatchPerl.patch
@@ -209,7 +209,7 @@ index c5f7aa8..c7c329a 100644
  	db = sdbm_prep(dirname, pagname, flags, mode);
  	free((char *) dirname);
 diff --git a/hints/linux.sh b/hints/linux.sh
-index c88f157..8cbe7dc 100644
+index c88f157..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
 @@ -13,11 +13,14 @@
@@ -268,7 +268,8 @@ index c88f157..8cbe7dc 100644
 +
  # Check if we're about to use Intel's ICC compiler
  case "`${cc:-cc} -V 2>&1`" in
- *"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
 +    # record the version, formats:
 +    # icc (ICC) 10.1 20080801
 +    # icpc (ICC) 10.1 20080801
diff --git a/5.010.001-slim,threaded-jessie/DevelPatchPerl.patch b/5.010.001-slim,threaded-jessie/DevelPatchPerl.patch
index 6c85c88..11cd099 100644
--- a/5.010.001-slim,threaded-jessie/DevelPatchPerl.patch
+++ b/5.010.001-slim,threaded-jessie/DevelPatchPerl.patch
@@ -209,7 +209,7 @@ index c5f7aa8..c7c329a 100644
  	db = sdbm_prep(dirname, pagname, flags, mode);
  	free((char *) dirname);
 diff --git a/hints/linux.sh b/hints/linux.sh
-index c88f157..8cbe7dc 100644
+index c88f157..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
 @@ -13,11 +13,14 @@
@@ -268,7 +268,8 @@ index c88f157..8cbe7dc 100644
 +
  # Check if we're about to use Intel's ICC compiler
  case "`${cc:-cc} -V 2>&1`" in
- *"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
 +    # record the version, formats:
 +    # icc (ICC) 10.1 20080801
 +    # icpc (ICC) 10.1 20080801
diff --git a/5.010.001-slim-jessie/DevelPatchPerl.patch b/5.010.001-slim-jessie/DevelPatchPerl.patch
index 6c85c88..11cd099 100644
--- a/5.010.001-slim-jessie/DevelPatchPerl.patch
+++ b/5.010.001-slim-jessie/DevelPatchPerl.patch
@@ -209,7 +209,7 @@ index c5f7aa8..c7c329a 100644
  	db = sdbm_prep(dirname, pagname, flags, mode);
  	free((char *) dirname);
 diff --git a/hints/linux.sh b/hints/linux.sh
-index c88f157..8cbe7dc 100644
+index c88f157..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
 @@ -13,11 +13,14 @@
@@ -268,7 +268,8 @@ index c88f157..8cbe7dc 100644
 +
  # Check if we're about to use Intel's ICC compiler
  case "`${cc:-cc} -V 2>&1`" in
- *"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
 +    # record the version, formats:
 +    # icc (ICC) 10.1 20080801
 +    # icpc (ICC) 10.1 20080801
diff --git a/5.012.005-main,threaded-jessie/DevelPatchPerl.patch b/5.012.005-main,threaded-jessie/DevelPatchPerl.patch
index 26db62c..0e5e718 100644
--- a/5.012.005-main,threaded-jessie/DevelPatchPerl.patch
+++ b/5.012.005-main,threaded-jessie/DevelPatchPerl.patch
@@ -282,7 +282,7 @@ index 61a15a8..8bf0a0b 100755
  }
  
 diff --git a/hints/linux.sh b/hints/linux.sh
-index 0519eca..8cbe7dc 100644
+index 0519eca..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
 @@ -13,11 +13,14 @@
@@ -332,7 +332,7 @@ index 0519eca..8cbe7dc 100644
  fi
  
  # Configure may fail to find lstat() since it's a static/inline
-@@ -84,6 +80,9 @@ case "$usemymalloc" in
+@@ -84,9 +80,12 @@ case "$usemymalloc" in
  '') usemymalloc='n' ;;
  esac
  
@@ -341,7 +341,11 @@ index 0519eca..8cbe7dc 100644
 +
  # Check if we're about to use Intel's ICC compiler
  case "`${cc:-cc} -V 2>&1`" in
- *"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
+     # record the version, formats:
+     # icc (ICC) 10.1 20080801
+     # icpc (ICC) 10.1 20080801
 @@ -97,7 +96,7 @@ case "`${cc:-cc} -V 2>&1`" in
      # The -no-gcc flag is needed otherwise, icc pretends (poorly) to be gcc
      ccflags="-we147 -mp -no-gcc $ccflags"
diff --git a/5.012.005-main-jessie/DevelPatchPerl.patch b/5.012.005-main-jessie/DevelPatchPerl.patch
index 26db62c..0e5e718 100644
--- a/5.012.005-main-jessie/DevelPatchPerl.patch
+++ b/5.012.005-main-jessie/DevelPatchPerl.patch
@@ -282,7 +282,7 @@ index 61a15a8..8bf0a0b 100755
  }
  
 diff --git a/hints/linux.sh b/hints/linux.sh
-index 0519eca..8cbe7dc 100644
+index 0519eca..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
 @@ -13,11 +13,14 @@
@@ -332,7 +332,7 @@ index 0519eca..8cbe7dc 100644
  fi
  
  # Configure may fail to find lstat() since it's a static/inline
-@@ -84,6 +80,9 @@ case "$usemymalloc" in
+@@ -84,9 +80,12 @@ case "$usemymalloc" in
  '') usemymalloc='n' ;;
  esac
  
@@ -341,7 +341,11 @@ index 0519eca..8cbe7dc 100644
 +
  # Check if we're about to use Intel's ICC compiler
  case "`${cc:-cc} -V 2>&1`" in
- *"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
+     # record the version, formats:
+     # icc (ICC) 10.1 20080801
+     # icpc (ICC) 10.1 20080801
 @@ -97,7 +96,7 @@ case "`${cc:-cc} -V 2>&1`" in
      # The -no-gcc flag is needed otherwise, icc pretends (poorly) to be gcc
      ccflags="-we147 -mp -no-gcc $ccflags"
diff --git a/5.012.005-slim,threaded-jessie/DevelPatchPerl.patch b/5.012.005-slim,threaded-jessie/DevelPatchPerl.patch
index 26db62c..0e5e718 100644
--- a/5.012.005-slim,threaded-jessie/DevelPatchPerl.patch
+++ b/5.012.005-slim,threaded-jessie/DevelPatchPerl.patch
@@ -282,7 +282,7 @@ index 61a15a8..8bf0a0b 100755
  }
  
 diff --git a/hints/linux.sh b/hints/linux.sh
-index 0519eca..8cbe7dc 100644
+index 0519eca..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
 @@ -13,11 +13,14 @@
@@ -332,7 +332,7 @@ index 0519eca..8cbe7dc 100644
  fi
  
  # Configure may fail to find lstat() since it's a static/inline
-@@ -84,6 +80,9 @@ case "$usemymalloc" in
+@@ -84,9 +80,12 @@ case "$usemymalloc" in
  '') usemymalloc='n' ;;
  esac
  
@@ -341,7 +341,11 @@ index 0519eca..8cbe7dc 100644
 +
  # Check if we're about to use Intel's ICC compiler
  case "`${cc:-cc} -V 2>&1`" in
- *"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
+     # record the version, formats:
+     # icc (ICC) 10.1 20080801
+     # icpc (ICC) 10.1 20080801
 @@ -97,7 +96,7 @@ case "`${cc:-cc} -V 2>&1`" in
      # The -no-gcc flag is needed otherwise, icc pretends (poorly) to be gcc
      ccflags="-we147 -mp -no-gcc $ccflags"
diff --git a/5.012.005-slim-jessie/DevelPatchPerl.patch b/5.012.005-slim-jessie/DevelPatchPerl.patch
index 26db62c..0e5e718 100644
--- a/5.012.005-slim-jessie/DevelPatchPerl.patch
+++ b/5.012.005-slim-jessie/DevelPatchPerl.patch
@@ -282,7 +282,7 @@ index 61a15a8..8bf0a0b 100755
  }
  
 diff --git a/hints/linux.sh b/hints/linux.sh
-index 0519eca..8cbe7dc 100644
+index 0519eca..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
 @@ -13,11 +13,14 @@
@@ -332,7 +332,7 @@ index 0519eca..8cbe7dc 100644
  fi
  
  # Configure may fail to find lstat() since it's a static/inline
-@@ -84,6 +80,9 @@ case "$usemymalloc" in
+@@ -84,9 +80,12 @@ case "$usemymalloc" in
  '') usemymalloc='n' ;;
  esac
  
@@ -341,7 +341,11 @@ index 0519eca..8cbe7dc 100644
 +
  # Check if we're about to use Intel's ICC compiler
  case "`${cc:-cc} -V 2>&1`" in
- *"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
+     # record the version, formats:
+     # icc (ICC) 10.1 20080801
+     # icpc (ICC) 10.1 20080801
 @@ -97,7 +96,7 @@ case "`${cc:-cc} -V 2>&1`" in
      # The -no-gcc flag is needed otherwise, icc pretends (poorly) to be gcc
      ccflags="-we147 -mp -no-gcc $ccflags"
diff --git a/5.014.004-main,threaded-jessie/DevelPatchPerl.patch b/5.014.004-main,threaded-jessie/DevelPatchPerl.patch
index 21747f5..41249b6 100644
--- a/5.014.004-main,threaded-jessie/DevelPatchPerl.patch
+++ b/5.014.004-main,threaded-jessie/DevelPatchPerl.patch
@@ -167,7 +167,7 @@ index 56bc815..cf688be 100644
  		or die "Cannot exec $cpp";
  	}
 diff --git a/hints/linux.sh b/hints/linux.sh
-index d0ac9fa..8cbe7dc 100644
+index d0ac9fa..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
 @@ -39,7 +39,7 @@ i_libutil='undef'
@@ -201,7 +201,7 @@ index d0ac9fa..8cbe7dc 100644
  fi
  
  # Configure may fail to find lstat() since it's a static/inline
-@@ -87,6 +80,9 @@ case "$usemymalloc" in
+@@ -87,9 +80,12 @@ case "$usemymalloc" in
  '') usemymalloc='n' ;;
  esac
  
@@ -210,7 +210,11 @@ index d0ac9fa..8cbe7dc 100644
 +
  # Check if we're about to use Intel's ICC compiler
  case "`${cc:-cc} -V 2>&1`" in
- *"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
+     # record the version, formats:
+     # icc (ICC) 10.1 20080801
+     # icpc (ICC) 10.1 20080801
 @@ -100,7 +96,7 @@ case "`${cc:-cc} -V 2>&1`" in
      # The -no-gcc flag is needed otherwise, icc pretends (poorly) to be gcc
      ccflags="-we147 -mp -no-gcc $ccflags"
diff --git a/5.014.004-main-jessie/DevelPatchPerl.patch b/5.014.004-main-jessie/DevelPatchPerl.patch
index 21747f5..41249b6 100644
--- a/5.014.004-main-jessie/DevelPatchPerl.patch
+++ b/5.014.004-main-jessie/DevelPatchPerl.patch
@@ -167,7 +167,7 @@ index 56bc815..cf688be 100644
  		or die "Cannot exec $cpp";
  	}
 diff --git a/hints/linux.sh b/hints/linux.sh
-index d0ac9fa..8cbe7dc 100644
+index d0ac9fa..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
 @@ -39,7 +39,7 @@ i_libutil='undef'
@@ -201,7 +201,7 @@ index d0ac9fa..8cbe7dc 100644
  fi
  
  # Configure may fail to find lstat() since it's a static/inline
-@@ -87,6 +80,9 @@ case "$usemymalloc" in
+@@ -87,9 +80,12 @@ case "$usemymalloc" in
  '') usemymalloc='n' ;;
  esac
  
@@ -210,7 +210,11 @@ index d0ac9fa..8cbe7dc 100644
 +
  # Check if we're about to use Intel's ICC compiler
  case "`${cc:-cc} -V 2>&1`" in
- *"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
+     # record the version, formats:
+     # icc (ICC) 10.1 20080801
+     # icpc (ICC) 10.1 20080801
 @@ -100,7 +96,7 @@ case "`${cc:-cc} -V 2>&1`" in
      # The -no-gcc flag is needed otherwise, icc pretends (poorly) to be gcc
      ccflags="-we147 -mp -no-gcc $ccflags"
diff --git a/5.014.004-slim,threaded-jessie/DevelPatchPerl.patch b/5.014.004-slim,threaded-jessie/DevelPatchPerl.patch
index 21747f5..41249b6 100644
--- a/5.014.004-slim,threaded-jessie/DevelPatchPerl.patch
+++ b/5.014.004-slim,threaded-jessie/DevelPatchPerl.patch
@@ -167,7 +167,7 @@ index 56bc815..cf688be 100644
  		or die "Cannot exec $cpp";
  	}
 diff --git a/hints/linux.sh b/hints/linux.sh
-index d0ac9fa..8cbe7dc 100644
+index d0ac9fa..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
 @@ -39,7 +39,7 @@ i_libutil='undef'
@@ -201,7 +201,7 @@ index d0ac9fa..8cbe7dc 100644
  fi
  
  # Configure may fail to find lstat() since it's a static/inline
-@@ -87,6 +80,9 @@ case "$usemymalloc" in
+@@ -87,9 +80,12 @@ case "$usemymalloc" in
  '') usemymalloc='n' ;;
  esac
  
@@ -210,7 +210,11 @@ index d0ac9fa..8cbe7dc 100644
 +
  # Check if we're about to use Intel's ICC compiler
  case "`${cc:-cc} -V 2>&1`" in
- *"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
+     # record the version, formats:
+     # icc (ICC) 10.1 20080801
+     # icpc (ICC) 10.1 20080801
 @@ -100,7 +96,7 @@ case "`${cc:-cc} -V 2>&1`" in
      # The -no-gcc flag is needed otherwise, icc pretends (poorly) to be gcc
      ccflags="-we147 -mp -no-gcc $ccflags"
diff --git a/5.014.004-slim-jessie/DevelPatchPerl.patch b/5.014.004-slim-jessie/DevelPatchPerl.patch
index 21747f5..41249b6 100644
--- a/5.014.004-slim-jessie/DevelPatchPerl.patch
+++ b/5.014.004-slim-jessie/DevelPatchPerl.patch
@@ -167,7 +167,7 @@ index 56bc815..cf688be 100644
  		or die "Cannot exec $cpp";
  	}
 diff --git a/hints/linux.sh b/hints/linux.sh
-index d0ac9fa..8cbe7dc 100644
+index d0ac9fa..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
 @@ -39,7 +39,7 @@ i_libutil='undef'
@@ -201,7 +201,7 @@ index d0ac9fa..8cbe7dc 100644
  fi
  
  # Configure may fail to find lstat() since it's a static/inline
-@@ -87,6 +80,9 @@ case "$usemymalloc" in
+@@ -87,9 +80,12 @@ case "$usemymalloc" in
  '') usemymalloc='n' ;;
  esac
  
@@ -210,7 +210,11 @@ index d0ac9fa..8cbe7dc 100644
 +
  # Check if we're about to use Intel's ICC compiler
  case "`${cc:-cc} -V 2>&1`" in
- *"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
+     # record the version, formats:
+     # icc (ICC) 10.1 20080801
+     # icpc (ICC) 10.1 20080801
 @@ -100,7 +96,7 @@ case "`${cc:-cc} -V 2>&1`" in
      # The -no-gcc flag is needed otherwise, icc pretends (poorly) to be gcc
      ccflags="-we147 -mp -no-gcc $ccflags"
diff --git a/5.016.003-main,threaded-jessie/DevelPatchPerl.patch b/5.016.003-main,threaded-jessie/DevelPatchPerl.patch
index d1c3fa6..8fc1fe6 100644
--- a/5.016.003-main,threaded-jessie/DevelPatchPerl.patch
+++ b/5.016.003-main,threaded-jessie/DevelPatchPerl.patch
@@ -167,7 +167,7 @@ index 439f254..a324604 100644
  		or die "Cannot exec $cpp";
  	}
 diff --git a/hints/linux.sh b/hints/linux.sh
-index 688c68d..8cbe7dc 100644
+index 688c68d..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
 @@ -39,7 +39,7 @@ i_libutil='undef'
@@ -201,7 +201,7 @@ index 688c68d..8cbe7dc 100644
  fi
  
  # Configure may fail to find lstat() since it's a static/inline
-@@ -87,6 +80,9 @@ case "$usemymalloc" in
+@@ -87,9 +80,12 @@ case "$usemymalloc" in
  '') usemymalloc='n' ;;
  esac
  
@@ -210,7 +210,11 @@ index 688c68d..8cbe7dc 100644
 +
  # Check if we're about to use Intel's ICC compiler
  case "`${cc:-cc} -V 2>&1`" in
- *"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
+     # record the version, formats:
+     # icc (ICC) 10.1 20080801
+     # icpc (ICC) 10.1 20080801
 @@ -100,7 +96,7 @@ case "`${cc:-cc} -V 2>&1`" in
      # The -no-gcc flag is needed otherwise, icc pretends (poorly) to be gcc
      ccflags="-we147 -mp -no-gcc $ccflags"
diff --git a/5.016.003-main-jessie/DevelPatchPerl.patch b/5.016.003-main-jessie/DevelPatchPerl.patch
index d1c3fa6..8fc1fe6 100644
--- a/5.016.003-main-jessie/DevelPatchPerl.patch
+++ b/5.016.003-main-jessie/DevelPatchPerl.patch
@@ -167,7 +167,7 @@ index 439f254..a324604 100644
  		or die "Cannot exec $cpp";
  	}
 diff --git a/hints/linux.sh b/hints/linux.sh
-index 688c68d..8cbe7dc 100644
+index 688c68d..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
 @@ -39,7 +39,7 @@ i_libutil='undef'
@@ -201,7 +201,7 @@ index 688c68d..8cbe7dc 100644
  fi
  
  # Configure may fail to find lstat() since it's a static/inline
-@@ -87,6 +80,9 @@ case "$usemymalloc" in
+@@ -87,9 +80,12 @@ case "$usemymalloc" in
  '') usemymalloc='n' ;;
  esac
  
@@ -210,7 +210,11 @@ index 688c68d..8cbe7dc 100644
 +
  # Check if we're about to use Intel's ICC compiler
  case "`${cc:-cc} -V 2>&1`" in
- *"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
+     # record the version, formats:
+     # icc (ICC) 10.1 20080801
+     # icpc (ICC) 10.1 20080801
 @@ -100,7 +96,7 @@ case "`${cc:-cc} -V 2>&1`" in
      # The -no-gcc flag is needed otherwise, icc pretends (poorly) to be gcc
      ccflags="-we147 -mp -no-gcc $ccflags"
diff --git a/5.016.003-slim,threaded-jessie/DevelPatchPerl.patch b/5.016.003-slim,threaded-jessie/DevelPatchPerl.patch
index d1c3fa6..8fc1fe6 100644
--- a/5.016.003-slim,threaded-jessie/DevelPatchPerl.patch
+++ b/5.016.003-slim,threaded-jessie/DevelPatchPerl.patch
@@ -167,7 +167,7 @@ index 439f254..a324604 100644
  		or die "Cannot exec $cpp";
  	}
 diff --git a/hints/linux.sh b/hints/linux.sh
-index 688c68d..8cbe7dc 100644
+index 688c68d..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
 @@ -39,7 +39,7 @@ i_libutil='undef'
@@ -201,7 +201,7 @@ index 688c68d..8cbe7dc 100644
  fi
  
  # Configure may fail to find lstat() since it's a static/inline
-@@ -87,6 +80,9 @@ case "$usemymalloc" in
+@@ -87,9 +80,12 @@ case "$usemymalloc" in
  '') usemymalloc='n' ;;
  esac
  
@@ -210,7 +210,11 @@ index 688c68d..8cbe7dc 100644
 +
  # Check if we're about to use Intel's ICC compiler
  case "`${cc:-cc} -V 2>&1`" in
- *"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
+     # record the version, formats:
+     # icc (ICC) 10.1 20080801
+     # icpc (ICC) 10.1 20080801
 @@ -100,7 +96,7 @@ case "`${cc:-cc} -V 2>&1`" in
      # The -no-gcc flag is needed otherwise, icc pretends (poorly) to be gcc
      ccflags="-we147 -mp -no-gcc $ccflags"
diff --git a/5.016.003-slim-jessie/DevelPatchPerl.patch b/5.016.003-slim-jessie/DevelPatchPerl.patch
index d1c3fa6..8fc1fe6 100644
--- a/5.016.003-slim-jessie/DevelPatchPerl.patch
+++ b/5.016.003-slim-jessie/DevelPatchPerl.patch
@@ -167,7 +167,7 @@ index 439f254..a324604 100644
  		or die "Cannot exec $cpp";
  	}
 diff --git a/hints/linux.sh b/hints/linux.sh
-index 688c68d..8cbe7dc 100644
+index 688c68d..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
 @@ -39,7 +39,7 @@ i_libutil='undef'
@@ -201,7 +201,7 @@ index 688c68d..8cbe7dc 100644
  fi
  
  # Configure may fail to find lstat() since it's a static/inline
-@@ -87,6 +80,9 @@ case "$usemymalloc" in
+@@ -87,9 +80,12 @@ case "$usemymalloc" in
  '') usemymalloc='n' ;;
  esac
  
@@ -210,7 +210,11 @@ index 688c68d..8cbe7dc 100644
 +
  # Check if we're about to use Intel's ICC compiler
  case "`${cc:-cc} -V 2>&1`" in
- *"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
+     # record the version, formats:
+     # icc (ICC) 10.1 20080801
+     # icpc (ICC) 10.1 20080801
 @@ -100,7 +96,7 @@ case "`${cc:-cc} -V 2>&1`" in
      # The -no-gcc flag is needed otherwise, icc pretends (poorly) to be gcc
      ccflags="-we147 -mp -no-gcc $ccflags"
diff --git a/5.018.004-main,threaded-jessie/DevelPatchPerl.patch b/5.018.004-main,threaded-jessie/DevelPatchPerl.patch
index 1322ce6..1c73009 100644
--- a/5.018.004-main,threaded-jessie/DevelPatchPerl.patch
+++ b/5.018.004-main,threaded-jessie/DevelPatchPerl.patch
@@ -167,7 +167,7 @@ index b707911..2588f0b 100644
  		or die "Cannot exec $cpp";
  	}
 diff --git a/hints/linux.sh b/hints/linux.sh
-index a148248..8cbe7dc 100644
+index a148248..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
 @@ -39,7 +39,7 @@ i_libutil='undef'
@@ -201,7 +201,7 @@ index a148248..8cbe7dc 100644
  fi
  
  # Configure may fail to find lstat() since it's a static/inline
-@@ -87,6 +80,9 @@ case "$usemymalloc" in
+@@ -87,9 +80,12 @@ case "$usemymalloc" in
  '') usemymalloc='n' ;;
  esac
  
@@ -210,7 +210,11 @@ index a148248..8cbe7dc 100644
 +
  # Check if we're about to use Intel's ICC compiler
  case "`${cc:-cc} -V 2>&1`" in
- *"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
+     # record the version, formats:
+     # icc (ICC) 10.1 20080801
+     # icpc (ICC) 10.1 20080801
 @@ -100,7 +96,7 @@ case "`${cc:-cc} -V 2>&1`" in
      # The -no-gcc flag is needed otherwise, icc pretends (poorly) to be gcc
      ccflags="-we147 -mp -no-gcc $ccflags"
diff --git a/5.018.004-main-jessie/DevelPatchPerl.patch b/5.018.004-main-jessie/DevelPatchPerl.patch
index 1322ce6..1c73009 100644
--- a/5.018.004-main-jessie/DevelPatchPerl.patch
+++ b/5.018.004-main-jessie/DevelPatchPerl.patch
@@ -167,7 +167,7 @@ index b707911..2588f0b 100644
  		or die "Cannot exec $cpp";
  	}
 diff --git a/hints/linux.sh b/hints/linux.sh
-index a148248..8cbe7dc 100644
+index a148248..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
 @@ -39,7 +39,7 @@ i_libutil='undef'
@@ -201,7 +201,7 @@ index a148248..8cbe7dc 100644
  fi
  
  # Configure may fail to find lstat() since it's a static/inline
-@@ -87,6 +80,9 @@ case "$usemymalloc" in
+@@ -87,9 +80,12 @@ case "$usemymalloc" in
  '') usemymalloc='n' ;;
  esac
  
@@ -210,7 +210,11 @@ index a148248..8cbe7dc 100644
 +
  # Check if we're about to use Intel's ICC compiler
  case "`${cc:-cc} -V 2>&1`" in
- *"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
+     # record the version, formats:
+     # icc (ICC) 10.1 20080801
+     # icpc (ICC) 10.1 20080801
 @@ -100,7 +96,7 @@ case "`${cc:-cc} -V 2>&1`" in
      # The -no-gcc flag is needed otherwise, icc pretends (poorly) to be gcc
      ccflags="-we147 -mp -no-gcc $ccflags"
diff --git a/5.018.004-slim,threaded-jessie/DevelPatchPerl.patch b/5.018.004-slim,threaded-jessie/DevelPatchPerl.patch
index 1322ce6..1c73009 100644
--- a/5.018.004-slim,threaded-jessie/DevelPatchPerl.patch
+++ b/5.018.004-slim,threaded-jessie/DevelPatchPerl.patch
@@ -167,7 +167,7 @@ index b707911..2588f0b 100644
  		or die "Cannot exec $cpp";
  	}
 diff --git a/hints/linux.sh b/hints/linux.sh
-index a148248..8cbe7dc 100644
+index a148248..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
 @@ -39,7 +39,7 @@ i_libutil='undef'
@@ -201,7 +201,7 @@ index a148248..8cbe7dc 100644
  fi
  
  # Configure may fail to find lstat() since it's a static/inline
-@@ -87,6 +80,9 @@ case "$usemymalloc" in
+@@ -87,9 +80,12 @@ case "$usemymalloc" in
  '') usemymalloc='n' ;;
  esac
  
@@ -210,7 +210,11 @@ index a148248..8cbe7dc 100644
 +
  # Check if we're about to use Intel's ICC compiler
  case "`${cc:-cc} -V 2>&1`" in
- *"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
+     # record the version, formats:
+     # icc (ICC) 10.1 20080801
+     # icpc (ICC) 10.1 20080801
 @@ -100,7 +96,7 @@ case "`${cc:-cc} -V 2>&1`" in
      # The -no-gcc flag is needed otherwise, icc pretends (poorly) to be gcc
      ccflags="-we147 -mp -no-gcc $ccflags"
diff --git a/5.018.004-slim-jessie/DevelPatchPerl.patch b/5.018.004-slim-jessie/DevelPatchPerl.patch
index 1322ce6..1c73009 100644
--- a/5.018.004-slim-jessie/DevelPatchPerl.patch
+++ b/5.018.004-slim-jessie/DevelPatchPerl.patch
@@ -167,7 +167,7 @@ index b707911..2588f0b 100644
  		or die "Cannot exec $cpp";
  	}
 diff --git a/hints/linux.sh b/hints/linux.sh
-index a148248..8cbe7dc 100644
+index a148248..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
 @@ -39,7 +39,7 @@ i_libutil='undef'
@@ -201,7 +201,7 @@ index a148248..8cbe7dc 100644
  fi
  
  # Configure may fail to find lstat() since it's a static/inline
-@@ -87,6 +80,9 @@ case "$usemymalloc" in
+@@ -87,9 +80,12 @@ case "$usemymalloc" in
  '') usemymalloc='n' ;;
  esac
  
@@ -210,7 +210,11 @@ index a148248..8cbe7dc 100644
 +
  # Check if we're about to use Intel's ICC compiler
  case "`${cc:-cc} -V 2>&1`" in
- *"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
+     # record the version, formats:
+     # icc (ICC) 10.1 20080801
+     # icpc (ICC) 10.1 20080801
 @@ -100,7 +96,7 @@ case "`${cc:-cc} -V 2>&1`" in
      # The -no-gcc flag is needed otherwise, icc pretends (poorly) to be gcc
      ccflags="-we147 -mp -no-gcc $ccflags"
diff --git a/5.020.003-main,threaded-stretch/DevelPatchPerl.patch b/5.020.003-main,threaded-stretch/DevelPatchPerl.patch
index ec92b6f..14c00e2 100644
--- a/5.020.003-main,threaded-stretch/DevelPatchPerl.patch
+++ b/5.020.003-main,threaded-stretch/DevelPatchPerl.patch
@@ -103,9 +103,18 @@ index 472e71a..0a852a0 100644
  }
  
 diff --git a/hints/linux.sh b/hints/linux.sh
-index 956adfc..8cbe7dc 100644
+index 956adfc..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
+@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
+ 
+ # Check if we're about to use Intel's ICC compiler
+ case "`${cc:-cc} -V 2>&1`" in
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
+     # record the version, formats:
+     # icc (ICC) 10.1 20080801
+     # icpc (ICC) 10.1 20080801
 @@ -165,6 +165,9 @@ esac
  # plibpth to bypass this check.
  if [ -x /usr/bin/gcc ] ; then
diff --git a/5.020.003-main-stretch/DevelPatchPerl.patch b/5.020.003-main-stretch/DevelPatchPerl.patch
index ec92b6f..14c00e2 100644
--- a/5.020.003-main-stretch/DevelPatchPerl.patch
+++ b/5.020.003-main-stretch/DevelPatchPerl.patch
@@ -103,9 +103,18 @@ index 472e71a..0a852a0 100644
  }
  
 diff --git a/hints/linux.sh b/hints/linux.sh
-index 956adfc..8cbe7dc 100644
+index 956adfc..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
+@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
+ 
+ # Check if we're about to use Intel's ICC compiler
+ case "`${cc:-cc} -V 2>&1`" in
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
+     # record the version, formats:
+     # icc (ICC) 10.1 20080801
+     # icpc (ICC) 10.1 20080801
 @@ -165,6 +165,9 @@ esac
  # plibpth to bypass this check.
  if [ -x /usr/bin/gcc ] ; then
diff --git a/5.020.003-slim,threaded-stretch/DevelPatchPerl.patch b/5.020.003-slim,threaded-stretch/DevelPatchPerl.patch
index ec92b6f..14c00e2 100644
--- a/5.020.003-slim,threaded-stretch/DevelPatchPerl.patch
+++ b/5.020.003-slim,threaded-stretch/DevelPatchPerl.patch
@@ -103,9 +103,18 @@ index 472e71a..0a852a0 100644
  }
  
 diff --git a/hints/linux.sh b/hints/linux.sh
-index 956adfc..8cbe7dc 100644
+index 956adfc..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
+@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
+ 
+ # Check if we're about to use Intel's ICC compiler
+ case "`${cc:-cc} -V 2>&1`" in
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
+     # record the version, formats:
+     # icc (ICC) 10.1 20080801
+     # icpc (ICC) 10.1 20080801
 @@ -165,6 +165,9 @@ esac
  # plibpth to bypass this check.
  if [ -x /usr/bin/gcc ] ; then
diff --git a/5.020.003-slim-stretch/DevelPatchPerl.patch b/5.020.003-slim-stretch/DevelPatchPerl.patch
index ec92b6f..14c00e2 100644
--- a/5.020.003-slim-stretch/DevelPatchPerl.patch
+++ b/5.020.003-slim-stretch/DevelPatchPerl.patch
@@ -103,9 +103,18 @@ index 472e71a..0a852a0 100644
  }
  
 diff --git a/hints/linux.sh b/hints/linux.sh
-index 956adfc..8cbe7dc 100644
+index 956adfc..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
+@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
+ 
+ # Check if we're about to use Intel's ICC compiler
+ case "`${cc:-cc} -V 2>&1`" in
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
+     # record the version, formats:
+     # icc (ICC) 10.1 20080801
+     # icpc (ICC) 10.1 20080801
 @@ -165,6 +165,9 @@ esac
  # plibpth to bypass this check.
  if [ -x /usr/bin/gcc ] ; then
diff --git a/5.022.004-main,threaded-stretch/DevelPatchPerl.patch b/5.022.004-main,threaded-stretch/DevelPatchPerl.patch
index 0fd98eb..7dd1f36 100644
--- a/5.022.004-main,threaded-stretch/DevelPatchPerl.patch
+++ b/5.022.004-main,threaded-stretch/DevelPatchPerl.patch
@@ -112,9 +112,18 @@ index 472e71a..0a852a0 100644
  }
  
 diff --git a/hints/linux.sh b/hints/linux.sh
-index fb5a46e..8cbe7dc 100644
+index fb5a46e..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
+@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
+ 
+ # Check if we're about to use Intel's ICC compiler
+ case "`${cc:-cc} -V 2>&1`" in
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
+     # record the version, formats:
+     # icc (ICC) 10.1 20080801
+     # icpc (ICC) 10.1 20080801
 @@ -165,6 +165,9 @@ esac
  # plibpth to bypass this check.
  if [ -x /usr/bin/gcc ] ; then
diff --git a/5.022.004-main-stretch/DevelPatchPerl.patch b/5.022.004-main-stretch/DevelPatchPerl.patch
index 0fd98eb..7dd1f36 100644
--- a/5.022.004-main-stretch/DevelPatchPerl.patch
+++ b/5.022.004-main-stretch/DevelPatchPerl.patch
@@ -112,9 +112,18 @@ index 472e71a..0a852a0 100644
  }
  
 diff --git a/hints/linux.sh b/hints/linux.sh
-index fb5a46e..8cbe7dc 100644
+index fb5a46e..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
+@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
+ 
+ # Check if we're about to use Intel's ICC compiler
+ case "`${cc:-cc} -V 2>&1`" in
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
+     # record the version, formats:
+     # icc (ICC) 10.1 20080801
+     # icpc (ICC) 10.1 20080801
 @@ -165,6 +165,9 @@ esac
  # plibpth to bypass this check.
  if [ -x /usr/bin/gcc ] ; then
diff --git a/5.022.004-slim,threaded-stretch/DevelPatchPerl.patch b/5.022.004-slim,threaded-stretch/DevelPatchPerl.patch
index 0fd98eb..7dd1f36 100644
--- a/5.022.004-slim,threaded-stretch/DevelPatchPerl.patch
+++ b/5.022.004-slim,threaded-stretch/DevelPatchPerl.patch
@@ -112,9 +112,18 @@ index 472e71a..0a852a0 100644
  }
  
 diff --git a/hints/linux.sh b/hints/linux.sh
-index fb5a46e..8cbe7dc 100644
+index fb5a46e..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
+@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
+ 
+ # Check if we're about to use Intel's ICC compiler
+ case "`${cc:-cc} -V 2>&1`" in
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
+     # record the version, formats:
+     # icc (ICC) 10.1 20080801
+     # icpc (ICC) 10.1 20080801
 @@ -165,6 +165,9 @@ esac
  # plibpth to bypass this check.
  if [ -x /usr/bin/gcc ] ; then
diff --git a/5.022.004-slim-stretch/DevelPatchPerl.patch b/5.022.004-slim-stretch/DevelPatchPerl.patch
index 0fd98eb..7dd1f36 100644
--- a/5.022.004-slim-stretch/DevelPatchPerl.patch
+++ b/5.022.004-slim-stretch/DevelPatchPerl.patch
@@ -112,9 +112,18 @@ index 472e71a..0a852a0 100644
  }
  
 diff --git a/hints/linux.sh b/hints/linux.sh
-index fb5a46e..8cbe7dc 100644
+index fb5a46e..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
+@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
+ 
+ # Check if we're about to use Intel's ICC compiler
+ case "`${cc:-cc} -V 2>&1`" in
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
+     # record the version, formats:
+     # icc (ICC) 10.1 20080801
+     # icpc (ICC) 10.1 20080801
 @@ -165,6 +165,9 @@ esac
  # plibpth to bypass this check.
  if [ -x /usr/bin/gcc ] ; then
diff --git a/5.024.004-main,threaded-stretch/DevelPatchPerl.patch b/5.024.004-main,threaded-stretch/DevelPatchPerl.patch
index eee5679..96788a0 100644
--- a/5.024.004-main,threaded-stretch/DevelPatchPerl.patch
+++ b/5.024.004-main,threaded-stretch/DevelPatchPerl.patch
@@ -112,9 +112,18 @@ index 472e71a..0a852a0 100644
  }
  
 diff --git a/hints/linux.sh b/hints/linux.sh
-index fb5a46e..8cbe7dc 100644
+index fb5a46e..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
+@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
+ 
+ # Check if we're about to use Intel's ICC compiler
+ case "`${cc:-cc} -V 2>&1`" in
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
+     # record the version, formats:
+     # icc (ICC) 10.1 20080801
+     # icpc (ICC) 10.1 20080801
 @@ -165,6 +165,9 @@ esac
  # plibpth to bypass this check.
  if [ -x /usr/bin/gcc ] ; then
diff --git a/5.024.004-main-stretch/DevelPatchPerl.patch b/5.024.004-main-stretch/DevelPatchPerl.patch
index eee5679..96788a0 100644
--- a/5.024.004-main-stretch/DevelPatchPerl.patch
+++ b/5.024.004-main-stretch/DevelPatchPerl.patch
@@ -112,9 +112,18 @@ index 472e71a..0a852a0 100644
  }
  
 diff --git a/hints/linux.sh b/hints/linux.sh
-index fb5a46e..8cbe7dc 100644
+index fb5a46e..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
+@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
+ 
+ # Check if we're about to use Intel's ICC compiler
+ case "`${cc:-cc} -V 2>&1`" in
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
+     # record the version, formats:
+     # icc (ICC) 10.1 20080801
+     # icpc (ICC) 10.1 20080801
 @@ -165,6 +165,9 @@ esac
  # plibpth to bypass this check.
  if [ -x /usr/bin/gcc ] ; then
diff --git a/5.024.004-slim,threaded-stretch/DevelPatchPerl.patch b/5.024.004-slim,threaded-stretch/DevelPatchPerl.patch
index eee5679..96788a0 100644
--- a/5.024.004-slim,threaded-stretch/DevelPatchPerl.patch
+++ b/5.024.004-slim,threaded-stretch/DevelPatchPerl.patch
@@ -112,9 +112,18 @@ index 472e71a..0a852a0 100644
  }
  
 diff --git a/hints/linux.sh b/hints/linux.sh
-index fb5a46e..8cbe7dc 100644
+index fb5a46e..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
+@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
+ 
+ # Check if we're about to use Intel's ICC compiler
+ case "`${cc:-cc} -V 2>&1`" in
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
+     # record the version, formats:
+     # icc (ICC) 10.1 20080801
+     # icpc (ICC) 10.1 20080801
 @@ -165,6 +165,9 @@ esac
  # plibpth to bypass this check.
  if [ -x /usr/bin/gcc ] ; then
diff --git a/5.024.004-slim-stretch/DevelPatchPerl.patch b/5.024.004-slim-stretch/DevelPatchPerl.patch
index eee5679..96788a0 100644
--- a/5.024.004-slim-stretch/DevelPatchPerl.patch
+++ b/5.024.004-slim-stretch/DevelPatchPerl.patch
@@ -112,9 +112,18 @@ index 472e71a..0a852a0 100644
  }
  
 diff --git a/hints/linux.sh b/hints/linux.sh
-index fb5a46e..8cbe7dc 100644
+index fb5a46e..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
+@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
+ 
+ # Check if we're about to use Intel's ICC compiler
+ case "`${cc:-cc} -V 2>&1`" in
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
+     # record the version, formats:
+     # icc (ICC) 10.1 20080801
+     # icpc (ICC) 10.1 20080801
 @@ -165,6 +165,9 @@ esac
  # plibpth to bypass this check.
  if [ -x /usr/bin/gcc ] ; then
diff --git a/5.026.003-main,threaded-buster/DevelPatchPerl.patch b/5.026.003-main,threaded-buster/DevelPatchPerl.patch
index 17a26d5..c28bcd4 100644
--- a/5.026.003-main,threaded-buster/DevelPatchPerl.patch
+++ b/5.026.003-main,threaded-buster/DevelPatchPerl.patch
@@ -154,9 +154,18 @@ index 6341396..701d22d 100644
  {
      skip 'These tests only run for the package maintainer.', 8
 diff --git a/hints/linux.sh b/hints/linux.sh
-index 3f38ea0..8cbe7dc 100644
+index 3f38ea0..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
+@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
+ 
+ # Check if we're about to use Intel's ICC compiler
+ case "`${cc:-cc} -V 2>&1`" in
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
+     # record the version, formats:
+     # icc (ICC) 10.1 20080801
+     # icpc (ICC) 10.1 20080801
 @@ -165,6 +165,9 @@ esac
  # plibpth to bypass this check.
  if [ -x /usr/bin/gcc ] ; then
diff --git a/5.026.003-main,threaded-stretch/DevelPatchPerl.patch b/5.026.003-main,threaded-stretch/DevelPatchPerl.patch
index 17a26d5..c28bcd4 100644
--- a/5.026.003-main,threaded-stretch/DevelPatchPerl.patch
+++ b/5.026.003-main,threaded-stretch/DevelPatchPerl.patch
@@ -154,9 +154,18 @@ index 6341396..701d22d 100644
  {
      skip 'These tests only run for the package maintainer.', 8
 diff --git a/hints/linux.sh b/hints/linux.sh
-index 3f38ea0..8cbe7dc 100644
+index 3f38ea0..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
+@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
+ 
+ # Check if we're about to use Intel's ICC compiler
+ case "`${cc:-cc} -V 2>&1`" in
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
+     # record the version, formats:
+     # icc (ICC) 10.1 20080801
+     # icpc (ICC) 10.1 20080801
 @@ -165,6 +165,9 @@ esac
  # plibpth to bypass this check.
  if [ -x /usr/bin/gcc ] ; then
diff --git a/5.026.003-main-buster/DevelPatchPerl.patch b/5.026.003-main-buster/DevelPatchPerl.patch
index 17a26d5..c28bcd4 100644
--- a/5.026.003-main-buster/DevelPatchPerl.patch
+++ b/5.026.003-main-buster/DevelPatchPerl.patch
@@ -154,9 +154,18 @@ index 6341396..701d22d 100644
  {
      skip 'These tests only run for the package maintainer.', 8
 diff --git a/hints/linux.sh b/hints/linux.sh
-index 3f38ea0..8cbe7dc 100644
+index 3f38ea0..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
+@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
+ 
+ # Check if we're about to use Intel's ICC compiler
+ case "`${cc:-cc} -V 2>&1`" in
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
+     # record the version, formats:
+     # icc (ICC) 10.1 20080801
+     # icpc (ICC) 10.1 20080801
 @@ -165,6 +165,9 @@ esac
  # plibpth to bypass this check.
  if [ -x /usr/bin/gcc ] ; then
diff --git a/5.026.003-main-stretch/DevelPatchPerl.patch b/5.026.003-main-stretch/DevelPatchPerl.patch
index 17a26d5..c28bcd4 100644
--- a/5.026.003-main-stretch/DevelPatchPerl.patch
+++ b/5.026.003-main-stretch/DevelPatchPerl.patch
@@ -154,9 +154,18 @@ index 6341396..701d22d 100644
  {
      skip 'These tests only run for the package maintainer.', 8
 diff --git a/hints/linux.sh b/hints/linux.sh
-index 3f38ea0..8cbe7dc 100644
+index 3f38ea0..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
+@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
+ 
+ # Check if we're about to use Intel's ICC compiler
+ case "`${cc:-cc} -V 2>&1`" in
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
+     # record the version, formats:
+     # icc (ICC) 10.1 20080801
+     # icpc (ICC) 10.1 20080801
 @@ -165,6 +165,9 @@ esac
  # plibpth to bypass this check.
  if [ -x /usr/bin/gcc ] ; then
diff --git a/5.026.003-slim,threaded-buster/DevelPatchPerl.patch b/5.026.003-slim,threaded-buster/DevelPatchPerl.patch
index 17a26d5..c28bcd4 100644
--- a/5.026.003-slim,threaded-buster/DevelPatchPerl.patch
+++ b/5.026.003-slim,threaded-buster/DevelPatchPerl.patch
@@ -154,9 +154,18 @@ index 6341396..701d22d 100644
  {
      skip 'These tests only run for the package maintainer.', 8
 diff --git a/hints/linux.sh b/hints/linux.sh
-index 3f38ea0..8cbe7dc 100644
+index 3f38ea0..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
+@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
+ 
+ # Check if we're about to use Intel's ICC compiler
+ case "`${cc:-cc} -V 2>&1`" in
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
+     # record the version, formats:
+     # icc (ICC) 10.1 20080801
+     # icpc (ICC) 10.1 20080801
 @@ -165,6 +165,9 @@ esac
  # plibpth to bypass this check.
  if [ -x /usr/bin/gcc ] ; then
diff --git a/5.026.003-slim,threaded-stretch/DevelPatchPerl.patch b/5.026.003-slim,threaded-stretch/DevelPatchPerl.patch
index 17a26d5..c28bcd4 100644
--- a/5.026.003-slim,threaded-stretch/DevelPatchPerl.patch
+++ b/5.026.003-slim,threaded-stretch/DevelPatchPerl.patch
@@ -154,9 +154,18 @@ index 6341396..701d22d 100644
  {
      skip 'These tests only run for the package maintainer.', 8
 diff --git a/hints/linux.sh b/hints/linux.sh
-index 3f38ea0..8cbe7dc 100644
+index 3f38ea0..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
+@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
+ 
+ # Check if we're about to use Intel's ICC compiler
+ case "`${cc:-cc} -V 2>&1`" in
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
+     # record the version, formats:
+     # icc (ICC) 10.1 20080801
+     # icpc (ICC) 10.1 20080801
 @@ -165,6 +165,9 @@ esac
  # plibpth to bypass this check.
  if [ -x /usr/bin/gcc ] ; then
diff --git a/5.026.003-slim-buster/DevelPatchPerl.patch b/5.026.003-slim-buster/DevelPatchPerl.patch
index 17a26d5..c28bcd4 100644
--- a/5.026.003-slim-buster/DevelPatchPerl.patch
+++ b/5.026.003-slim-buster/DevelPatchPerl.patch
@@ -154,9 +154,18 @@ index 6341396..701d22d 100644
  {
      skip 'These tests only run for the package maintainer.', 8
 diff --git a/hints/linux.sh b/hints/linux.sh
-index 3f38ea0..8cbe7dc 100644
+index 3f38ea0..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
+@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
+ 
+ # Check if we're about to use Intel's ICC compiler
+ case "`${cc:-cc} -V 2>&1`" in
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
+     # record the version, formats:
+     # icc (ICC) 10.1 20080801
+     # icpc (ICC) 10.1 20080801
 @@ -165,6 +165,9 @@ esac
  # plibpth to bypass this check.
  if [ -x /usr/bin/gcc ] ; then
diff --git a/5.026.003-slim-stretch/DevelPatchPerl.patch b/5.026.003-slim-stretch/DevelPatchPerl.patch
index 17a26d5..c28bcd4 100644
--- a/5.026.003-slim-stretch/DevelPatchPerl.patch
+++ b/5.026.003-slim-stretch/DevelPatchPerl.patch
@@ -154,9 +154,18 @@ index 6341396..701d22d 100644
  {
      skip 'These tests only run for the package maintainer.', 8
 diff --git a/hints/linux.sh b/hints/linux.sh
-index 3f38ea0..8cbe7dc 100644
+index 3f38ea0..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
+@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
+ 
+ # Check if we're about to use Intel's ICC compiler
+ case "`${cc:-cc} -V 2>&1`" in
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
+     # record the version, formats:
+     # icc (ICC) 10.1 20080801
+     # icpc (ICC) 10.1 20080801
 @@ -165,6 +165,9 @@ esac
  # plibpth to bypass this check.
  if [ -x /usr/bin/gcc ] ; then
diff --git a/5.028.003-main,threaded-buster/DevelPatchPerl.patch b/5.028.003-main,threaded-buster/DevelPatchPerl.patch
index 504674a..c72bc46 100644
--- a/5.028.003-main,threaded-buster/DevelPatchPerl.patch
+++ b/5.028.003-main,threaded-buster/DevelPatchPerl.patch
@@ -154,9 +154,18 @@ index 6341396..701d22d 100644
  {
      skip 'These tests only run for the package maintainer.', 8
 diff --git a/hints/linux.sh b/hints/linux.sh
-index a985a8e..8cbe7dc 100644
+index a985a8e..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
+@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
+ 
+ # Check if we're about to use Intel's ICC compiler
+ case "`${cc:-cc} -V 2>&1`" in
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
+     # record the version, formats:
+     # icc (ICC) 10.1 20080801
+     # icpc (ICC) 10.1 20080801
 @@ -165,6 +165,9 @@ esac
  # plibpth to bypass this check.
  if [ -x /usr/bin/gcc ] ; then
diff --git a/5.028.003-main,threaded-stretch/DevelPatchPerl.patch b/5.028.003-main,threaded-stretch/DevelPatchPerl.patch
index 504674a..c72bc46 100644
--- a/5.028.003-main,threaded-stretch/DevelPatchPerl.patch
+++ b/5.028.003-main,threaded-stretch/DevelPatchPerl.patch
@@ -154,9 +154,18 @@ index 6341396..701d22d 100644
  {
      skip 'These tests only run for the package maintainer.', 8
 diff --git a/hints/linux.sh b/hints/linux.sh
-index a985a8e..8cbe7dc 100644
+index a985a8e..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
+@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
+ 
+ # Check if we're about to use Intel's ICC compiler
+ case "`${cc:-cc} -V 2>&1`" in
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
+     # record the version, formats:
+     # icc (ICC) 10.1 20080801
+     # icpc (ICC) 10.1 20080801
 @@ -165,6 +165,9 @@ esac
  # plibpth to bypass this check.
  if [ -x /usr/bin/gcc ] ; then
diff --git a/5.028.003-main-buster/DevelPatchPerl.patch b/5.028.003-main-buster/DevelPatchPerl.patch
index 504674a..c72bc46 100644
--- a/5.028.003-main-buster/DevelPatchPerl.patch
+++ b/5.028.003-main-buster/DevelPatchPerl.patch
@@ -154,9 +154,18 @@ index 6341396..701d22d 100644
  {
      skip 'These tests only run for the package maintainer.', 8
 diff --git a/hints/linux.sh b/hints/linux.sh
-index a985a8e..8cbe7dc 100644
+index a985a8e..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
+@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
+ 
+ # Check if we're about to use Intel's ICC compiler
+ case "`${cc:-cc} -V 2>&1`" in
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
+     # record the version, formats:
+     # icc (ICC) 10.1 20080801
+     # icpc (ICC) 10.1 20080801
 @@ -165,6 +165,9 @@ esac
  # plibpth to bypass this check.
  if [ -x /usr/bin/gcc ] ; then
diff --git a/5.028.003-main-stretch/DevelPatchPerl.patch b/5.028.003-main-stretch/DevelPatchPerl.patch
index 504674a..c72bc46 100644
--- a/5.028.003-main-stretch/DevelPatchPerl.patch
+++ b/5.028.003-main-stretch/DevelPatchPerl.patch
@@ -154,9 +154,18 @@ index 6341396..701d22d 100644
  {
      skip 'These tests only run for the package maintainer.', 8
 diff --git a/hints/linux.sh b/hints/linux.sh
-index a985a8e..8cbe7dc 100644
+index a985a8e..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
+@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
+ 
+ # Check if we're about to use Intel's ICC compiler
+ case "`${cc:-cc} -V 2>&1`" in
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
+     # record the version, formats:
+     # icc (ICC) 10.1 20080801
+     # icpc (ICC) 10.1 20080801
 @@ -165,6 +165,9 @@ esac
  # plibpth to bypass this check.
  if [ -x /usr/bin/gcc ] ; then
diff --git a/5.028.003-slim,threaded-buster/DevelPatchPerl.patch b/5.028.003-slim,threaded-buster/DevelPatchPerl.patch
index 504674a..c72bc46 100644
--- a/5.028.003-slim,threaded-buster/DevelPatchPerl.patch
+++ b/5.028.003-slim,threaded-buster/DevelPatchPerl.patch
@@ -154,9 +154,18 @@ index 6341396..701d22d 100644
  {
      skip 'These tests only run for the package maintainer.', 8
 diff --git a/hints/linux.sh b/hints/linux.sh
-index a985a8e..8cbe7dc 100644
+index a985a8e..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
+@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
+ 
+ # Check if we're about to use Intel's ICC compiler
+ case "`${cc:-cc} -V 2>&1`" in
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
+     # record the version, formats:
+     # icc (ICC) 10.1 20080801
+     # icpc (ICC) 10.1 20080801
 @@ -165,6 +165,9 @@ esac
  # plibpth to bypass this check.
  if [ -x /usr/bin/gcc ] ; then
diff --git a/5.028.003-slim,threaded-stretch/DevelPatchPerl.patch b/5.028.003-slim,threaded-stretch/DevelPatchPerl.patch
index 504674a..c72bc46 100644
--- a/5.028.003-slim,threaded-stretch/DevelPatchPerl.patch
+++ b/5.028.003-slim,threaded-stretch/DevelPatchPerl.patch
@@ -154,9 +154,18 @@ index 6341396..701d22d 100644
  {
      skip 'These tests only run for the package maintainer.', 8
 diff --git a/hints/linux.sh b/hints/linux.sh
-index a985a8e..8cbe7dc 100644
+index a985a8e..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
+@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
+ 
+ # Check if we're about to use Intel's ICC compiler
+ case "`${cc:-cc} -V 2>&1`" in
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
+     # record the version, formats:
+     # icc (ICC) 10.1 20080801
+     # icpc (ICC) 10.1 20080801
 @@ -165,6 +165,9 @@ esac
  # plibpth to bypass this check.
  if [ -x /usr/bin/gcc ] ; then
diff --git a/5.028.003-slim-buster/DevelPatchPerl.patch b/5.028.003-slim-buster/DevelPatchPerl.patch
index 504674a..c72bc46 100644
--- a/5.028.003-slim-buster/DevelPatchPerl.patch
+++ b/5.028.003-slim-buster/DevelPatchPerl.patch
@@ -154,9 +154,18 @@ index 6341396..701d22d 100644
  {
      skip 'These tests only run for the package maintainer.', 8
 diff --git a/hints/linux.sh b/hints/linux.sh
-index a985a8e..8cbe7dc 100644
+index a985a8e..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
+@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
+ 
+ # Check if we're about to use Intel's ICC compiler
+ case "`${cc:-cc} -V 2>&1`" in
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
+     # record the version, formats:
+     # icc (ICC) 10.1 20080801
+     # icpc (ICC) 10.1 20080801
 @@ -165,6 +165,9 @@ esac
  # plibpth to bypass this check.
  if [ -x /usr/bin/gcc ] ; then
diff --git a/5.028.003-slim-stretch/DevelPatchPerl.patch b/5.028.003-slim-stretch/DevelPatchPerl.patch
index 504674a..c72bc46 100644
--- a/5.028.003-slim-stretch/DevelPatchPerl.patch
+++ b/5.028.003-slim-stretch/DevelPatchPerl.patch
@@ -154,9 +154,18 @@ index 6341396..701d22d 100644
  {
      skip 'These tests only run for the package maintainer.', 8
 diff --git a/hints/linux.sh b/hints/linux.sh
-index a985a8e..8cbe7dc 100644
+index a985a8e..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
+@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
+ 
+ # Check if we're about to use Intel's ICC compiler
+ case "`${cc:-cc} -V 2>&1`" in
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
+     # record the version, formats:
+     # icc (ICC) 10.1 20080801
+     # icpc (ICC) 10.1 20080801
 @@ -165,6 +165,9 @@ esac
  # plibpth to bypass this check.
  if [ -x /usr/bin/gcc ] ; then
diff --git a/5.030.003-main,threaded-buster/DevelPatchPerl.patch b/5.030.003-main,threaded-buster/DevelPatchPerl.patch
index 11fdab0..7eca6ba 100644
--- a/5.030.003-main,threaded-buster/DevelPatchPerl.patch
+++ b/5.030.003-main,threaded-buster/DevelPatchPerl.patch
@@ -1,7 +1,16 @@
 diff --git a/hints/linux.sh b/hints/linux.sh
-index a985a8e..8cbe7dc 100644
+index a985a8e..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
+@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
+ 
+ # Check if we're about to use Intel's ICC compiler
+ case "`${cc:-cc} -V 2>&1`" in
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
+     # record the version, formats:
+     # icc (ICC) 10.1 20080801
+     # icpc (ICC) 10.1 20080801
 @@ -165,6 +165,9 @@ esac
  # plibpth to bypass this check.
  if [ -x /usr/bin/gcc ] ; then
diff --git a/5.030.003-main,threaded-stretch/DevelPatchPerl.patch b/5.030.003-main,threaded-stretch/DevelPatchPerl.patch
index 11fdab0..7eca6ba 100644
--- a/5.030.003-main,threaded-stretch/DevelPatchPerl.patch
+++ b/5.030.003-main,threaded-stretch/DevelPatchPerl.patch
@@ -1,7 +1,16 @@
 diff --git a/hints/linux.sh b/hints/linux.sh
-index a985a8e..8cbe7dc 100644
+index a985a8e..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
+@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
+ 
+ # Check if we're about to use Intel's ICC compiler
+ case "`${cc:-cc} -V 2>&1`" in
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
+     # record the version, formats:
+     # icc (ICC) 10.1 20080801
+     # icpc (ICC) 10.1 20080801
 @@ -165,6 +165,9 @@ esac
  # plibpth to bypass this check.
  if [ -x /usr/bin/gcc ] ; then
diff --git a/5.030.003-main-buster/DevelPatchPerl.patch b/5.030.003-main-buster/DevelPatchPerl.patch
index 11fdab0..7eca6ba 100644
--- a/5.030.003-main-buster/DevelPatchPerl.patch
+++ b/5.030.003-main-buster/DevelPatchPerl.patch
@@ -1,7 +1,16 @@
 diff --git a/hints/linux.sh b/hints/linux.sh
-index a985a8e..8cbe7dc 100644
+index a985a8e..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
+@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
+ 
+ # Check if we're about to use Intel's ICC compiler
+ case "`${cc:-cc} -V 2>&1`" in
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
+     # record the version, formats:
+     # icc (ICC) 10.1 20080801
+     # icpc (ICC) 10.1 20080801
 @@ -165,6 +165,9 @@ esac
  # plibpth to bypass this check.
  if [ -x /usr/bin/gcc ] ; then
diff --git a/5.030.003-main-stretch/DevelPatchPerl.patch b/5.030.003-main-stretch/DevelPatchPerl.patch
index 11fdab0..7eca6ba 100644
--- a/5.030.003-main-stretch/DevelPatchPerl.patch
+++ b/5.030.003-main-stretch/DevelPatchPerl.patch
@@ -1,7 +1,16 @@
 diff --git a/hints/linux.sh b/hints/linux.sh
-index a985a8e..8cbe7dc 100644
+index a985a8e..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
+@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
+ 
+ # Check if we're about to use Intel's ICC compiler
+ case "`${cc:-cc} -V 2>&1`" in
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
+     # record the version, formats:
+     # icc (ICC) 10.1 20080801
+     # icpc (ICC) 10.1 20080801
 @@ -165,6 +165,9 @@ esac
  # plibpth to bypass this check.
  if [ -x /usr/bin/gcc ] ; then
diff --git a/5.030.003-slim,threaded-buster/DevelPatchPerl.patch b/5.030.003-slim,threaded-buster/DevelPatchPerl.patch
index 11fdab0..7eca6ba 100644
--- a/5.030.003-slim,threaded-buster/DevelPatchPerl.patch
+++ b/5.030.003-slim,threaded-buster/DevelPatchPerl.patch
@@ -1,7 +1,16 @@
 diff --git a/hints/linux.sh b/hints/linux.sh
-index a985a8e..8cbe7dc 100644
+index a985a8e..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
+@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
+ 
+ # Check if we're about to use Intel's ICC compiler
+ case "`${cc:-cc} -V 2>&1`" in
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
+     # record the version, formats:
+     # icc (ICC) 10.1 20080801
+     # icpc (ICC) 10.1 20080801
 @@ -165,6 +165,9 @@ esac
  # plibpth to bypass this check.
  if [ -x /usr/bin/gcc ] ; then
diff --git a/5.030.003-slim,threaded-stretch/DevelPatchPerl.patch b/5.030.003-slim,threaded-stretch/DevelPatchPerl.patch
index 11fdab0..7eca6ba 100644
--- a/5.030.003-slim,threaded-stretch/DevelPatchPerl.patch
+++ b/5.030.003-slim,threaded-stretch/DevelPatchPerl.patch
@@ -1,7 +1,16 @@
 diff --git a/hints/linux.sh b/hints/linux.sh
-index a985a8e..8cbe7dc 100644
+index a985a8e..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
+@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
+ 
+ # Check if we're about to use Intel's ICC compiler
+ case "`${cc:-cc} -V 2>&1`" in
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
+     # record the version, formats:
+     # icc (ICC) 10.1 20080801
+     # icpc (ICC) 10.1 20080801
 @@ -165,6 +165,9 @@ esac
  # plibpth to bypass this check.
  if [ -x /usr/bin/gcc ] ; then
diff --git a/5.030.003-slim-buster/DevelPatchPerl.patch b/5.030.003-slim-buster/DevelPatchPerl.patch
index 11fdab0..7eca6ba 100644
--- a/5.030.003-slim-buster/DevelPatchPerl.patch
+++ b/5.030.003-slim-buster/DevelPatchPerl.patch
@@ -1,7 +1,16 @@
 diff --git a/hints/linux.sh b/hints/linux.sh
-index a985a8e..8cbe7dc 100644
+index a985a8e..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
+@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
+ 
+ # Check if we're about to use Intel's ICC compiler
+ case "`${cc:-cc} -V 2>&1`" in
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
+     # record the version, formats:
+     # icc (ICC) 10.1 20080801
+     # icpc (ICC) 10.1 20080801
 @@ -165,6 +165,9 @@ esac
  # plibpth to bypass this check.
  if [ -x /usr/bin/gcc ] ; then
diff --git a/5.030.003-slim-stretch/DevelPatchPerl.patch b/5.030.003-slim-stretch/DevelPatchPerl.patch
index 11fdab0..7eca6ba 100644
--- a/5.030.003-slim-stretch/DevelPatchPerl.patch
+++ b/5.030.003-slim-stretch/DevelPatchPerl.patch
@@ -1,7 +1,16 @@
 diff --git a/hints/linux.sh b/hints/linux.sh
-index a985a8e..8cbe7dc 100644
+index a985a8e..c749f0f 100644
 --- a/hints/linux.sh
 +++ b/hints/linux.sh
+@@ -85,7 +85,7 @@ uname_minus_m="${uname_minus_m:-"$targetarch"}"
+ 
+ # Check if we're about to use Intel's ICC compiler
+ case "`${cc:-cc} -V 2>&1`" in
+-*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*)
++*"Intel(R) C"*" Compiler"*)
+     # record the version, formats:
+     # icc (ICC) 10.1 20080801
+     # icpc (ICC) 10.1 20080801
 @@ -165,6 +165,9 @@ esac
  # plibpth to bypass this check.
  if [ -x /usr/bin/gcc ] ; then