diff options
| author | Alexander Leidinger <netchild@FreeBSD.org> | 2003-08-21 14:55:43 +0000 |
|---|---|---|
| committer | Alexander Leidinger <netchild@FreeBSD.org> | 2003-08-21 14:55:43 +0000 |
| commit | d3c350851686f8ab4f507c3bde93a4039c702204 (patch) | |
| tree | dd014e690b817301e75c9b9812b56a1b75e48c96 /lang/icc7 | |
| parent | 176d1c94fbb4d05c924d150c739dd9cdc1931d0f (diff) | |
| download | ports-d3c350851686f8ab4f507c3bde93a4039c702204.tar.gz ports-d3c350851686f8ab4f507c3bde93a4039c702204.zip | |
- Update to 7.1.027.
- Teach the ld wrapper about /libexec on a recent -current. [1]
Submitted by: Marius Strobl <marius@alchemy.franken.de> [1]
Notes
Notes:
svn path=/head/; revision=87452
Diffstat (limited to 'lang/icc7')
| -rw-r--r-- | lang/icc7/Makefile | 14 | ||||
| -rw-r--r-- | lang/icc7/distinfo | 2 | ||||
| -rw-r--r-- | lang/icc7/files/ld.c | 4 |
3 files changed, 12 insertions, 8 deletions
diff --git a/lang/icc7/Makefile b/lang/icc7/Makefile index af00f311b0e7..04ef8717e7ba 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 9f7b77e28470..3ade6156b559 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 fb34af1edf94..01425e26f6ca 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")) { |