Attachment 198940 Details for Bug 232822 – Set USE_CXXSTD only if clang is not used

[patch] Set USE_CXXSTD only if clang is not used

mkvtoolnix.diff.txt (text/plain), 1.02 KB, created by Thomas Zander on 2018-11-04 13:15:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Zander

Created: 2018-11-04 13:15:23 UTC

Size: 1.02 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 483851)
>+++ Makefile	(working copy)
>@@ -25,7 +25,7 @@
> 		libpugixml.so:textproc/pugixml \
> 		libmatroska.so:multimedia/libmatroska
> 
>-USES=		compiler:c++14-lang iconv localbase pkgconfig tar:xz
>+USES=		compiler:c++17-lang iconv localbase pkgconfig tar:xz
> GNU_CONFIGURE=	yes
> CONFIGURE_ENV+=	ac_cv_path_PO4A=no
> CONFIGURE_ARGS=	--with-boost=${LOCALBASE} \
>@@ -58,6 +58,12 @@
> MANTRANS_DESC=		Build and install manpage translations
> MANTRANS_BUILD_DEPENDS=	po4a:textproc/po4a
> 
>+.include <bsd.port.pre.mk>
>+
>+.if ${CHOSEN_COMPILER_TYPE} != clang
>+USE_CXXSTD=	c++17
>+.endif
>+
> post-patch:
> 	@${REINPLACE_CMD} -e '/LIBS="-lintl/s,-liconv,$$ICONV_LIBS,' \
> 		${WRKSRC}/configure
>@@ -69,4 +75,4 @@
> 	@${REINPLACE_CMD} -e 's|#define HAVE_LIBINTL_H|//#define HAVE_LIBINTL_H|g' ${WRKSRC}/config.h
> 	@${REINPLACE_CMD} -e 's|S["LIBINTL_LIBS"]=|#S["LIBINTL_LIBS"]=|g' ${WRKSRC}/config.status
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>

Actions: View | Diff

Attachments on bug 232822: 198780 | 198940