Attachment 199641 Details for Bug 231804 – gcc no rpath patch from Andreas T

[patch] gcc no rpath patch from Andreas T

gcc-no-rpath-gcc7-ppc-fix.diff (text/plain), 1.61 KB, created by Steve Wills on 2018-11-28 15:57:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Wills

Created: 2018-11-28 15:57:26 UTC

Size: 1.61 KB

patch

obsolete

>Index: Mk/bsd.gcc.mk
>===================================================================
>--- Mk/bsd.gcc.mk	(revision 485863)
>+++ Mk/bsd.gcc.mk	(working copy)
>@@ -150,9 +150,14 @@
> 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.
>+.   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++
>Index: lang/gcc7/Makefile
>===================================================================
>--- lang/gcc7/Makefile	(revision 485863)
>+++ lang/gcc7/Makefile	(working copy)
>@@ -70,6 +70,7 @@
> 
> LANGUAGES:=	c,c++,objc,fortran
> TARGLIB=	${PREFIX}/lib/gcc${SUFFIX}
>+TARG32LIB=	${PREFIX}/lib32
> LIBEXEC=	${PREFIX}/libexec/gcc${SUFFIX}
> GNU_CONFIGURE=	yes
> CONFIGURE_OUTSOURCE=	yes
>@@ -138,7 +139,13 @@
> 	${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} -p ${STAGEDIR}${PREFIX}/lib32/gcc${SUFFIX}
>+	${MV} ${STAGEDIR}${PREFIX}/lib/lib32/* ${STAGEDIR}${PREFIX}/lib32/gcc${SUFFIX}
>+.endif
>+
>+.for d in ${TARGLIB:S/^${PREFIX}\///} ${TARG32LIB:S/^${PREFIX}\///} ${LIBEXEC:S/^${PREFIX}\///}
> 	cd ${STAGEDIR}${PREFIX} ; if [ -d $d ]; then \
> 	    ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
> 	fi

Actions: View | Diff

Attachments on bug 231804: 197601 | 197602 | 199519 | 199641