svn commit: r512530 - head/audio/grip

[Piotr Kubaj]

Since we force new GCC anyway on GCC platforms with USES=compiler:c++11-lang, why do a separate check for base GCC in
 +.if ${CHOSEN_COMPILER_TYPE} == gcc && ${COMPILER_VERSION} <= 42?

On 19-09-21 18:18:33, Mark Linimon wrote:
>Author: linimon
>Date: Sat Sep 21 18:18:33 2019
>New Revision: 512530
>URL: https://svnweb.freebsd.org/changeset/ports/512530
>
>Log:
>  Fix build on GCC-based systems:
>
>    /usr/local/lib/libgraphite2.so.3: undefined reference to `__cxa_throw_bad_array_new_length at CXXABI_1.3.8'
>
>  Approved by:	portmgr (tier-2 blanket)
>
>Modified:
>  head/audio/grip/Makefile
>
>Modified: head/audio/grip/Makefile
>==============================================================================
>--- head/audio/grip/Makefile	Sat Sep 21 18:14:05 2019	(r512529)
>+++ head/audio/grip/Makefile	Sat Sep 21 18:18:33 2019	(r512530)
>@@ -18,7 +18,8 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
> 		libid3.so:audio/id3lib \
> 		libpopt.so:devel/popt
>
>-USES=		gmake libtool localbase pathfix pkgconfig
>+USES=		compiler:c++11-lang gmake gnome libtool localbase \
>+		pathfix pkgconfig xorg
> USE_XORG=	ice sm x11 xext
> USE_GNOME=	cairo gdkpixbuf2 gnomeprefix libgnomeui vte
>
>@@ -50,6 +51,8 @@ DEFAULT_CDROM_DEVICE=${WITH_CDROM_DEVICE}
> DEFAULT_CDROM_DEVICE=/dev/cd0
> .endif
>
>+.include <bsd.port.pre.mk>
>+
> pre-everything::
> .if !defined(WITH_CDROM_DEVICE)
> 	@${ECHO_MSG} "===> The default CDROM device is ${DEFAULT_CDROM_DEVICE}"
>@@ -60,5 +63,8 @@ pre-everything::
> post-patch:
> 	@${REINPLACE_CMD} -e 's|/dev/cdrom|${DEFAULT_CDROM_DEVICE}|' \
> 		${WRKSRC}/src/grip.c
>+.if ${CHOSEN_COMPILER_TYPE} == gcc && ${COMPILER_VERSION} <= 42
>+	${REINPLACE_CMD} -e '/pragma/d' ${WRKSRC}/src/cdpar.c
>+.endif
>
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 898 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-all/attachments/20190921/12251b20/attachment.sig>