Date: Sun, 12 Feb 2017 13:46:40 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r433941 - head/devel/linux-c7-devtools Message-ID: <201702121346.v1CDkegL076348@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Sun Feb 12 13:46:39 2017 New Revision: 433941 URL: https://svnweb.freebsd.org/changeset/ports/433941 Log: Link usr/bin/ld to ld.bfd so gcc can find the linker. The binutils rpm does this in a post-install script. Remove libgcc_s.so links that aren't needed. Reported by: Stari Karp <starikarp@yandex.com> Modified: head/devel/linux-c7-devtools/Makefile head/devel/linux-c7-devtools/pkg-plist.amd64 head/devel/linux-c7-devtools/pkg-plist.i386 Modified: head/devel/linux-c7-devtools/Makefile ============================================================================== --- head/devel/linux-c7-devtools/Makefile Sun Feb 12 13:02:41 2017 (r433940) +++ head/devel/linux-c7-devtools/Makefile Sun Feb 12 13:46:39 2017 (r433941) @@ -3,7 +3,7 @@ PORTNAME= devtools PORTVERSION= ${LINUX_DIST_VER} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel BIN_DISTNAMES= binutils-2.25.1-22.base.el7 \ glibc-headers-2.17-157.el7_3.1 \ @@ -46,18 +46,7 @@ USE_LINUX_RPM= yes OPTIONS_DEFINE= DOCS NLS OPTIONS_SUB= yes -.include <bsd.port.pre.mk> - post-install: -.if ${LINUX_ARCH} == x86_64 - ${LN} -sf ${LINUXBASE}/usr/lib64/libgcc_s.so.1 \ - ${STAGEDIR}${PREFIX}/usr/lib/gcc/x86_64-redhat-linux/4.8.2/libgcc_s.so - - ${LN} -sf ${LINUXBASE}/usr/lib/libgcc_s.so.1 \ - ${STAGEDIR}${PREFIX}/usr/lib/gcc/x86_64-redhat-linux/4.8.2/32/libgcc_s.so -.else - ${LN} -sf ${LINUXBASE}/usr/lib/libgcc_s.so.1 \ - ${STAGEDIR}${PREFIX}/usr/lib/gcc/i686-redhat-linux/4.8.2/libgcc_s.so -.endif + ${LN} -sf ld.bfd ${STAGEDIR}${PREFIX}/usr/bin/ld -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/devel/linux-c7-devtools/pkg-plist.amd64 ============================================================================== --- head/devel/linux-c7-devtools/pkg-plist.amd64 Sun Feb 12 13:02:41 2017 (r433940) +++ head/devel/linux-c7-devtools/pkg-plist.amd64 Sun Feb 12 13:46:39 2017 (r433941) @@ -18,6 +18,7 @@ usr/bin/gcc-ranlib usr/bin/gcov usr/bin/gfortran usr/bin/gprof +usr/bin/ld usr/bin/ld.bfd usr/bin/ld.gold usr/bin/nm Modified: head/devel/linux-c7-devtools/pkg-plist.i386 ============================================================================== --- head/devel/linux-c7-devtools/pkg-plist.i386 Sun Feb 12 13:02:41 2017 (r433940) +++ head/devel/linux-c7-devtools/pkg-plist.i386 Sun Feb 12 13:46:39 2017 (r433941) @@ -21,6 +21,7 @@ usr/bin/gprof usr/bin/i686-redhat-linux-c++ usr/bin/i686-redhat-linux-g++ usr/bin/i686-redhat-linux-gcc +usr/bin/ld usr/bin/ld.bfd usr/bin/ld.gold usr/bin/nm
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702121346.v1CDkegL076348>