diff options
| author | marius <marius@FreeBSD.org> | 2005-02-19 21:51:40 +0800 |
|---|---|---|
| committer | marius <marius@FreeBSD.org> | 2005-02-19 21:51:40 +0800 |
| commit | 5f8f4cbde94a90e2f70c8e265d8a42fc29b483ee (patch) | |
| tree | 8ab68dd0187979dc9507aa5c6d94802bd27dd9b1 | |
| parent | dfed91b800e3ab6b7879ae8589f3c642395cac9f (diff) | |
| download | freebsd-ports-gnome-5f8f4cbde94a90e2f70c8e265d8a42fc29b483ee.tar.gz freebsd-ports-gnome-5f8f4cbde94a90e2f70c8e265d8a42fc29b483ee.tar.zst freebsd-ports-gnome-5f8f4cbde94a90e2f70c8e265d8a42fc29b483ee.zip | |
Account for src/include/stdbool.h and src/sys/i386/include/_types.h have
been fixed in FreeBSD >= 600013 regarding using the GCC-compatibility.
Approved by: netchild (blanket)
| -rw-r--r-- | lang/icc/Makefile | 16 | ||||
| -rw-r--r-- | lang/icc/pkg-plist | 2 |
2 files changed, 13 insertions, 5 deletions
diff --git a/lang/icc/Makefile b/lang/icc/Makefile index 7fade79427e7..754c01311d46 100644 --- a/lang/icc/Makefile +++ b/lang/icc/Makefile @@ -7,7 +7,7 @@ PORTNAME= icc PORTVERSION= 8.1.026 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= lang linux devel MASTER_SITES= DISTNAME= l_cc_pc_${PORTVERSION:C/p.+$//} @@ -60,9 +60,15 @@ EXTRACT_AFTER_ARGS= | tar -xf - \ ICCCFGVAL!= ${UNAME} -r | ${SED} -e 's/\..*//' .if ( ${OSVERSION} < 502108 ) -PLIST_SUB+= MACHINE__TYPES_H="@comment " STDARG_H="" SYS_CDEFS_H="" +PLIST_SUB+= MACHINE__TYPES_H="@comment " STDARG_H="" SYS_CDEFS_H="" \ + STDBOOL_H="" .else PLIST_SUB+= STDARG_H="@comment " SYS_CDEFS_H="@comment " +.if ( ${OSVERSION} < 600013 ) +PLIST_SUB+= MACHINE__TYPES_H="" STDBOOL_H="" +.else +PLIST_SUB+= MACHINE__TYPES_H="@comment " STDBOOL_H="@comment " +.endif .if ${OSVERSION} < 502126 GCCCOMPATVER= 330 .endif @@ -70,7 +76,6 @@ GCCCOMPATVER= 330 GCCCOMPATVER= 340 .endif GXXINCLUDE= /usr/include/c++/${GCCCOMPATVER:C/([0-9])([0-9]).+/\1.\2/} -PLIST_SUB+= MACHINE__TYPES_H="" .endif .for file in ${DISTFILES} @@ -165,15 +170,18 @@ post-patch: @${CP} ${FILESDIR}/stdarg.h ${WRKSRC}/opt/${COMPILERDIR}/include @${MKDIR} ${WRKSRC}/opt/${COMPILERDIR}/include/sys @${CP} ${FILESDIR}/cdefs.h ${WRKSRC}/opt/${COMPILERDIR}/include/sys -.else +.endif +.if ( ${OSVERSION} >= 502108 && ${OSVERSION} < 600013 ) # Work around bug for ICC support in src/sys/i386/include/_types.h. @${MKDIR} ${WRKSRC}/opt/${COMPILERDIR}/include/machine @${CP} ${FILESDIR}/_types.h ${WRKSRC}/opt/${COMPILERDIR}/include/machine .endif +.if ( ${OSVERSION} < 600013 ) # Work around a bug in stdbool.h @${SED} -e 's:__STDC_VERSION__ < 199901L.*:__STDC_VERSION__ < 199901L \&\& defined(__GNUC__) \&\& __GNUC__ < 3 \&\& !defined(__INTEL_COMPILER):g' \ </usr/include/stdbool.h \ >${WRKSRC}/opt/${COMPILERDIR}/include/stdbool.h +.endif .if ( ${OSVERSION} >= 470101 && ${OSVERSION} < 500000 ) || \ ( ${OSVERSION} >= 500042 ) diff --git a/lang/icc/pkg-plist b/lang/icc/pkg-plist index b546ebf53b6b..c4dd99dd8e08 100644 --- a/lang/icc/pkg-plist +++ b/lang/icc/pkg-plist @@ -922,7 +922,7 @@ %%COMPILERDIR%%/include/proto.h %%COMPILERDIR%%/include/sse2mmx.h %%STDARG_H%%%%COMPILERDIR%%/include/stdarg.h -%%COMPILERDIR%%/include/stdbool.h +%%STDBOOL_H%%%%COMPILERDIR%%/include/stdbool.h %%SYS_CDEFS_H%%%%COMPILERDIR%%/include/sys/cdefs.h %%SYS_CDEFS_H%%@dirrm %%COMPILERDIR%%/include/sys %%COMPILERDIR%%/include/xmm_func.h |