From owner-svn-ports-all@freebsd.org Sat Dec 29 15:38:32 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D5F421423865; Sat, 29 Dec 2018 15:38:31 +0000 (UTC) (envelope-from andreast@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 73CA272FF4; Sat, 29 Dec 2018 15:38:31 +0000 (UTC) (envelope-from andreast@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6261ECEB2; Sat, 29 Dec 2018 15:38:31 +0000 (UTC) (envelope-from andreast@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wBTFcVob082670; Sat, 29 Dec 2018 15:38:31 GMT (envelope-from andreast@FreeBSD.org) Received: (from andreast@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wBTFcVdt082667; Sat, 29 Dec 2018 15:38:31 GMT (envelope-from andreast@FreeBSD.org) Message-Id: <201812291538.wBTFcVdt082667@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: andreast set sender to andreast@FreeBSD.org using -f From: Andreas Tobler Date: Sat, 29 Dec 2018 15:38:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r488673 - in head: Mk lang/gcc7 X-SVN-Group: ports-head X-SVN-Commit-Author: andreast X-SVN-Commit-Paths: in head: Mk lang/gcc7 X-SVN-Commit-Revision: 488673 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 73CA272FF4 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.94 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.95)[-0.946,0]; NEURAL_HAM_LONG(-1.00)[-0.998,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Dec 2018 15:38:32 -0000 Author: andreast (src committer) Date: Sat Dec 29 15:38:30 2018 New Revision: 488673 URL: https://svnweb.freebsd.org/changeset/ports/488673 Log: Fix build of GCC on powerpc64. While building GCC itself we have to use the built GCC libraries to configure additional parts of GCC and not the libraires from the host. Install the built 32-bit libraries. This was not done up to now. PR: 231804 Approved by: gerald@ Modified: head/Mk/bsd.gcc.mk head/lang/gcc7/Makefile Modified: head/Mk/bsd.gcc.mk ============================================================================== --- head/Mk/bsd.gcc.mk Sat Dec 29 15:30:42 2018 (r488672) +++ head/Mk/bsd.gcc.mk Sat Dec 29 15:38:30 2018 (r488673) @@ -150,9 +150,16 @@ CC:= gcc${V} CXX:= g++${V} CPP:= cpp${V} _GCC_RUNTIME:= ${LOCALBASE}/lib/gcc${V} +. if ${PORTNAME} == gcc +# We don't want the rpath stuff while building GCC itself +# so we do not set the FLAGS as done in the else part. +# When building a GCC, we want the target libraries to be used and not the +# host GCC libraries. +. else CFLAGS+= -Wl,-rpath=${_GCC_RUNTIME} CXXFLAGS+= -Wl,-rpath=${_GCC_RUNTIME} LDFLAGS+= -Wl,-rpath=${_GCC_RUNTIME} -L${_GCC_RUNTIME} +. endif . else # Use GCC in base. CC:= gcc CXX:= g++ Modified: head/lang/gcc7/Makefile ============================================================================== --- head/lang/gcc7/Makefile Sat Dec 29 15:30:42 2018 (r488672) +++ head/lang/gcc7/Makefile Sat Dec 29 15:38:30 2018 (r488673) @@ -70,6 +70,7 @@ CONFIGURE_ARGS+= --with-cpu=8540 --enable-e500_double LANGUAGES:= c,c++,objc,fortran TARGLIB= ${PREFIX}/lib/gcc${SUFFIX} +TARGLIB32= ${PREFIX}/lib32 # The version information is added later LIBEXEC= ${PREFIX}/libexec/gcc${SUFFIX} GNU_CONFIGURE= yes CONFIGURE_OUTSOURCE= yes @@ -138,7 +139,13 @@ post-stage: ${RM} -r ${STAGEDIR}${TARGLIB}/gcc/*/${GCC_VERSION}/include-fixed/ # Add target libraries and include files to packaging list. ${RM} ${WRKDIR}/PLIST.lib -.for d in ${TARGLIB:S/^${PREFIX}\///} ${LIBEXEC:S/^${PREFIX}\///} + +.if ${ARCH} == powerpc64 && ${PORT_OPTIONS:MMULTILIB} + ${MKDIR} ${STAGEDIR}${TARGLIB32}/gcc${SUFFIX} + ${MV} ${STAGEDIR}${PREFIX}/lib/lib32/* ${STAGEDIR}${TARGLIB32}/gcc${SUFFIX} +.endif + +.for d in ${TARGLIB:S/^${PREFIX}\///} ${TARGLIB32:S/^${PREFIX}\///} ${LIBEXEC:S/^${PREFIX}\///} cd ${STAGEDIR}${PREFIX} ; if [ -d $d ]; then \ ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\ fi