- update to 7.0.082

- fix [dfi]vec.h with stlport-iostreams
- do not install a Windows header (mathf.h)
- do not install libompstub (depends on pthread_atfork(), see PR 17437)

Submitted by:	marius@alchemy.franken.de

- point to the icc errata after make install

7 files changed, 64 insertions, 8 deletions

diff --git a/lang/icc7/files/cpio-exclude b/lang/icc7/files/cpio-exclude
index be25b951fc6..6f8fc41c587 100644
--- a/lang/icc7/files/cpio-exclude
+++ b/lang/icc7/files/cpio-exclude
@@ -29,12 +29,14 @@
 */opt/intel/%%COMPILERDIR%%/ia32/include/list.h
 */opt/intel/%%COMPILERDIR%%/ia32/include/locale
 */opt/intel/%%COMPILERDIR%%/ia32/include/map
+*/opt/intel/%%COMPILERDIR%%/ia32/include/mathf.h
 */opt/intel/%%COMPILERDIR%%/ia32/include/memory
 */opt/intel/%%COMPILERDIR%%/ia32/include/numeric
 */opt/intel/%%COMPILERDIR%%/ia32/include/omp.h
 */opt/intel/%%COMPILERDIR%%/ia32/include/omp_lib.h
 */opt/intel/%%COMPILERDIR%%/ia32/include/ostream
 */opt/intel/%%COMPILERDIR%%/ia32/include/queue
+*/opt/intel/%%COMPILERDIR%%/ia32/include/regex.h
 */opt/intel/%%COMPILERDIR%%/ia32/include/set
 */opt/intel/%%COMPILERDIR%%/ia32/include/slist
 */opt/intel/%%COMPILERDIR%%/ia32/include/sstream
@@ -82,6 +84,7 @@
 */opt/intel/%%COMPILERDIR%%/ia32/lib/libguide.so
 */opt/intel/%%COMPILERDIR%%/ia32/lib/libguide_stats.a
 */opt/intel/%%COMPILERDIR%%/ia32/lib/libguide_stats.so
+*/opt/intel/%%COMPILERDIR%%/ia32/lib/libompstub.a
 */opt/intel/%%COMPILERDIR%%/ia32/lib/libunwind.so
 */opt/intel/%%COMPILERDIR%%/ia32/lib/libunwind.so.3
 */opt/intel/%%COMPILERDIR%%/man/man1/ecc.1
diff --git a/lang/icc7/files/patch-ia32::bin::icc b/lang/icc7/files/patch-ia32::bin::icc
index 55406344c47..596787d71cc 100644
--- a/lang/icc7/files/patch-ia32::bin::icc
+++ b/lang/icc7/files/patch-ia32::bin::icc
@@ -1,12 +1,19 @@
 --- ia32/bin/icc.orig	Fri Jan 10 16:57:18 2003
 +++ ia32/bin/icc	Fri Jan 10 17:09:38 2003
-@@ -1,29 +1,62 @@
+@@ -1,34 +1,68 @@
  #!/bin/sh
  
--INTEL_LICENSE_FILE=<INSTALLDIR>/licenses;
 +PREFIX=@@PREFIX@@
 +export PREFIX;
-+INTEL_LICENSE_FILE=${INTEL_LICENSE_FILE:-${PREFIX}/intel/licenses}
++
+ if [ -z INTEL_LICENSE_FILE ]
+ then
+-INTEL_LICENSE_FILE=<INSTALLDIR>/licenses;
++INTEL_LICENSE_FILE=${PREFIX}/intel/licenses;
+ else
+-INTEL_LICENSE_FILE=$INTEL_LICENSE_FILE:<INSTALLDIR>/licenses;
++INTEL_LICENSE_FILE=$INTEL_LICENSE_FILE:${PREFIX}/intel/licenses;
+ fi
  export INTEL_LICENSE_FILE;
  
  if [ -z LD_LIBRARY_PATH ]
diff --git a/lang/icc7/files/patch-ia32::bin::icpc b/lang/icc7/files/patch-ia32::bin::icpc
index 49c3609b345..a4cc5026d00 100644
--- a/lang/icc7/files/patch-ia32::bin::icpc
+++ b/lang/icc7/files/patch-ia32::bin::icpc
@@ -1,12 +1,19 @@
 --- ia32/bin/icpc.orig	Fri Jan 10 16:47:29 2003
 +++ ia32/bin/icpc	Fri Jan 10 17:19:03 2003
-@@ -1,29 +1,55 @@
+@@ -1,34 +1,61 @@
  #!/bin/sh
  
--INTEL_LICENSE_FILE=<INSTALLDIR>/licenses;
 +PREFIX=@@PREFIX@@
 +export PREFIX;
-+INTEL_LICENSE_FILE=${INTEL_LICENSE_FILE:-${PREFIX}/intel/licenses}
++
+ if [ -z INTEL_LICENSE_FILE ]
+ then
+-INTEL_LICENSE_FILE=<INSTALLDIR>/licenses;
++INTEL_LICENSE_FILE=${PREFIX}/intel/licenses;
+ else
+-INTEL_LICENSE_FILE=$INTEL_LICENSE_FILE:<INSTALLDIR>/licenses;
++INTEL_LICENSE_FILE=$INTEL_LICENSE_FILE:${PREFIX}/intel/licenses;
+ fi
  export INTEL_LICENSE_FILE;
  
  if [ -z LD_LIBRARY_PATH ]
diff --git a/lang/icc7/files/patch-ia32::include::dvec.h b/lang/icc7/files/patch-ia32::include::dvec.h
index 0dd3c423d04..e269b138b91 100644
--- a/lang/icc7/files/patch-ia32::include::dvec.h
+++ b/lang/icc7/files/patch-ia32::include::dvec.h
@@ -9,3 +9,16 @@
          #define EXPLICIT explicit
  #else
     #if (__INTEL_COMPILER)
+@@ -50,10 +50,10 @@
+ #endif
+ 
+ /* Figure out whether and how to define the output operators */
+-#if defined(_IOSTREAM_) || defined(_CPP_IOSTREAM)
++#if defined(_IOSTREAM_) || defined(_CPP_IOSTREAM) || defined(_STLP_IOSTREAM)
+ #define DVEC_DEFINE_OUTPUT_OPERATORS
+ #define DVEC_STD std::
+-#elif defined(_INC_IOSTREAM) || defined(_IOSTREAM_H_)
++#elif defined(_INC_IOSTREAM) || defined(_IOSTREAM_H_) || defined(_STLP_IOSTREAM_H)
+ #define DVEC_DEFINE_OUTPUT_OPERATORS
+ #define DVEC_STD
+ #endif
diff --git a/lang/icc7/files/patch-ia32::include::fvec.h b/lang/icc7/files/patch-ia32::include::fvec.h
index 2a68afbc28e..fdbb75016ce 100644
--- a/lang/icc7/files/patch-ia32::include::fvec.h
+++ b/lang/icc7/files/patch-ia32::include::fvec.h
@@ -9,3 +9,16 @@
          #define EXPLICIT explicit
  #else
     #if (__INTEL_COMPILER)
+@@ -53,10 +53,10 @@
+ #endif
+ 
+ /* Figure out whether and how to define the output operators */
+-#if defined(_IOSTREAM_)
++#if defined(_IOSTREAM_) || defined(_STLP_IOSTREAM)
+ #define FVEC_DEFINE_OUTPUT_OPERATORS
+ #define FVEC_STD std::
+-#elif defined(_INC_IOSTREAM) || defined(_IOSTREAM_H_)
++#elif defined(_INC_IOSTREAM) || defined(_IOSTREAM_H_) || defined(_STLP_IOSTREAM_H)
+ #define FVEC_DEFINE_OUTPUT_OPERATORS
+ #define FVEC_STD
+ #endif
diff --git a/lang/icc7/files/patch-ia32::include::ivec.h b/lang/icc7/files/patch-ia32::include::ivec.h
index 50ec1c1ead5..716ae2bc1c7 100644
--- a/lang/icc7/files/patch-ia32::include::ivec.h
+++ b/lang/icc7/files/patch-ia32::include::ivec.h
@@ -9,3 +9,16 @@
          #define EXPLICIT explicit
  #else
     #if (__INTEL_COMPILER)
+@@ -36,10 +36,10 @@
+ #endif
+ 
+ /* Figure out whether and how to define the output operators */
+-#if defined(_IOSTREAM_)
++#if defined(_IOSTREAM_) || defined(_STLP_IOSTREAM)
+ #define IVEC_DEFINE_OUTPUT_OPERATORS
+ #define IVEC_STD std::
+-#elif defined(_INC_IOSTREAM) || defined(_IOSTREAM_H_)
++#elif defined(_INC_IOSTREAM) || defined(_IOSTREAM_H_) || defined(_STLP_IOSTREAM_H)
+ #define IVEC_DEFINE_OUTPUT_OPERATORS
+ #define IVEC_STD
+ #endif
diff --git a/lang/icc7/files/patch-ia32::include::yvals.h b/lang/icc7/files/patch-ia32::include::yvals.h
index e566d600079..b212cdf178b 100644
--- a/lang/icc7/files/patch-ia32::include::yvals.h
+++ b/lang/icc7/files/patch-ia32::include::yvals.h
@@ -172,11 +172,11 @@
 -typedef wchar_t _Wchart;
 -typedef wchar_t _Wintt;
 -    #else /* _HAS_WCHAR_TYPE */
--typedef int _Wchart;
+-typedef __WCHAR_TYPE__ _Wchart;
 -typedef int _Wintt;
 -    #endif /* _HAS_WCHAR_TYPE */
 -  #else /* __cplusplus */
--typedef int _Wchart;
+-typedef __WCHAR_TYPE__ _Wchart;
 -typedef int _Wintt;
 -  #endif /* __cplusplus */
 - #endif /* __CYGWIN__ */