diff options
| -rw-r--r-- | lang/icc/Makefile | 14 | ||||
| -rw-r--r-- | lang/icc/distinfo | 2 | ||||
| -rw-r--r-- | lang/icc/files/ld.c | 4 | ||||
| -rw-r--r-- | lang/icc7/Makefile | 14 | ||||
| -rw-r--r-- | lang/icc7/distinfo | 2 | ||||
| -rw-r--r-- | lang/icc7/files/ld.c | 4 |
6 files changed, 24 insertions, 16 deletions
diff --git a/lang/icc/Makefile b/lang/icc/Makefile index af00f31..04ef871 100644 --- a/lang/icc/Makefile +++ b/lang/icc/Makefile @@ -6,7 +6,7 @@ # PORTNAME= icc -PORTVERSION= 7.1.025 +PORTVERSION= 7.1.027 #PORTREVISION= 1 CATEGORIES= lang linux devel MASTER_SITES= @@ -64,12 +64,12 @@ post-extract: ${FILESDIR}/cpio-exclude_noportdocs >>${WRKDIR}/cpio-exclude .endif .for i in \ - intel-icc7-7.1-26.i386.rpm -# intel-iidb7-7.2.2-54.i386.rpm \ -# intel-isubh7-7.1-26.i386.rpm \ -# intel-ecc7-7.1-26.ia64.rpm \ -# intel-eidb7-7.2.2-54.ia64.rpm \ -# intel-esubh7-7.1-26.ia64.rpm + intel-icc7-7.1-28.i386.rpm +# intel-iidb7-7.2.2-58.i386.rpm \ +# intel-isubh7-7.1-28.i386.rpm \ +# intel-ecc7-7.1-28.ia64.rpm \ +# intel-eidb7-7.2.2-58.ia64.rpm \ +# intel-esubh7-7.1-28.ia64.rpm @cd ${WRKSRC} && rpm2cpio 2>/dev/null ${i} | \ ${CPIO} -idfuE ${WRKDIR}/cpio-exclude --quiet .endfor diff --git a/lang/icc/distinfo b/lang/icc/distinfo index 9f7b77e..3ade615 100644 --- a/lang/icc/distinfo +++ b/lang/icc/distinfo @@ -1 +1 @@ -MD5 (l_cc_pc_7.1.025.tar) = e88a237ced338e51db24d9bb8b8f12cb +MD5 (l_cc_pc_7.1.027.tar) = 3f3335576f61d8b94e6cd43b620e001c diff --git a/lang/icc/files/ld.c b/lang/icc/files/ld.c index fb34af1..01425e2 100644 --- a/lang/icc/files/ld.c +++ b/lang/icc/files/ld.c @@ -328,7 +328,11 @@ main(int argc, char *argv[], char *envp[]) /* Switch Linux stuff to FreeBSD counterparts. */ if (ARGCMP("/lib/ld-linux.so.2")) { +#if __FreeBSD_version >= 501105 + addarg(&al, "/libexec/ld-elf.so.1", 1); +#else addarg(&al, "/usr/libexec/ld-elf.so.1", 1); +#endif continue; } if (ARGCMP("-L/usr/lib")) { diff --git a/lang/icc7/Makefile b/lang/icc7/Makefile index af00f31..04ef871 100644 --- a/lang/icc7/Makefile +++ b/lang/icc7/Makefile @@ -6,7 +6,7 @@ # PORTNAME= icc -PORTVERSION= 7.1.025 +PORTVERSION= 7.1.027 #PORTREVISION= 1 CATEGORIES= lang linux devel MASTER_SITES= @@ -64,12 +64,12 @@ post-extract: ${FILESDIR}/cpio-exclude_noportdocs >>${WRKDIR}/cpio-exclude .endif .for i in \ - intel-icc7-7.1-26.i386.rpm -# intel-iidb7-7.2.2-54.i386.rpm \ -# intel-isubh7-7.1-26.i386.rpm \ -# intel-ecc7-7.1-26.ia64.rpm \ -# intel-eidb7-7.2.2-54.ia64.rpm \ -# intel-esubh7-7.1-26.ia64.rpm + intel-icc7-7.1-28.i386.rpm +# intel-iidb7-7.2.2-58.i386.rpm \ +# intel-isubh7-7.1-28.i386.rpm \ +# intel-ecc7-7.1-28.ia64.rpm \ +# intel-eidb7-7.2.2-58.ia64.rpm \ +# intel-esubh7-7.1-28.ia64.rpm @cd ${WRKSRC} && rpm2cpio 2>/dev/null ${i} | \ ${CPIO} -idfuE ${WRKDIR}/cpio-exclude --quiet .endfor diff --git a/lang/icc7/distinfo b/lang/icc7/distinfo index 9f7b77e..3ade615 100644 --- a/lang/icc7/distinfo +++ b/lang/icc7/distinfo @@ -1 +1 @@ -MD5 (l_cc_pc_7.1.025.tar) = e88a237ced338e51db24d9bb8b8f12cb +MD5 (l_cc_pc_7.1.027.tar) = 3f3335576f61d8b94e6cd43b620e001c diff --git a/lang/icc7/files/ld.c b/lang/icc7/files/ld.c index fb34af1..01425e2 100644 --- a/lang/icc7/files/ld.c +++ b/lang/icc7/files/ld.c @@ -328,7 +328,11 @@ main(int argc, char *argv[], char *envp[]) /* Switch Linux stuff to FreeBSD counterparts. */ if (ARGCMP("/lib/ld-linux.so.2")) { +#if __FreeBSD_version >= 501105 + addarg(&al, "/libexec/ld-elf.so.1", 1); +#else addarg(&al, "/usr/libexec/ld-elf.so.1", 1); +#endif continue; } if (ARGCMP("-L/usr/lib")) { |
