From owner-svn-ports-head@freebsd.org Sun Feb 12 13:46:41 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A2701CDB09A; Sun, 12 Feb 2017 13:46:41 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4A2091A44; Sun, 12 Feb 2017 13:46:41 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1CDketZ076351; Sun, 12 Feb 2017 13:46:40 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1CDkegL076348; Sun, 12 Feb 2017 13:46:40 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201702121346.v1CDkegL076348@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Sun, 12 Feb 2017 13:46:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r433941 - head/devel/linux-c7-devtools X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Feb 2017 13:46:41 -0000 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 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 - 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 +.include 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