Date: Sun, 19 Jul 2020 17:39:37 +0000 (UTC) From: Piotr Kubaj <pkubaj@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r542590 - branches/2020Q3/graphics/dspdfviewer Message-ID: <202007191739.06JHdb18043672@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pkubaj Date: Sun Jul 19 17:39:36 2020 New Revision: 542590 URL: https://svnweb.freebsd.org/changeset/ports/542590 Log: MFH: r542589 graphics/dspdfviewer: fix build on GCC architectures To build with Qt5, use C++11 compiler. Hide Clang-only flags behind .if and add one for GCC. Approved by: portmgr (fix build blanket) Modified: branches/2020Q3/graphics/dspdfviewer/Makefile Directory Properties: branches/2020Q3/ (props changed) Modified: branches/2020Q3/graphics/dspdfviewer/Makefile ============================================================================== --- branches/2020Q3/graphics/dspdfviewer/Makefile Sun Jul 19 17:38:43 2020 (r542589) +++ branches/2020Q3/graphics/dspdfviewer/Makefile Sun Jul 19 17:39:36 2020 (r542590) @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libboost_program_options.so:devel/boost-libs \ libpoppler-qt5.so:graphics/poppler-qt5 -USES= cmake:insource pkgconfig qt:5 +USES= cmake:insource compiler:c++11-lang pkgconfig qt:5 USE_QT= core gui linguisttools widgets xml buildtools_build qmake_build USE_LDCONFIG= yes @@ -35,22 +35,28 @@ PLIST_FILES= bin/dspdfviewer \ .include <bsd.port.pre.mk> +.if ${CHOSEN_COMPILER_TYPE} == clang # Build fails with LLVM 4.0. Reported upstream as #191: # https://github.com/dannyedel/dspdfviewer/issues/191 CFLAGS+= -Wno-error=undefined-func-template +.endif -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200039 +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200039 && ${CHOSEN_COMPILER_TYPE} == clang CFLAGS+= -Wno-error=zero-as-null-pointer-constant .endif # Fixes build failure for Clang 8.0.0 -.if ${OPSYS} == FreeBSD && (${OSVERSION} >= 1300014 || (${OSVERSION} >= 1103000 && ${OSVERSION} < 1200000) || ${OSVERSION} >= 1201000) +.if ${OPSYS} == FreeBSD && (${OSVERSION} >= 1300014 || (${OSVERSION} >= 1103000 && ${OSVERSION} < 1200000) || ${OSVERSION} >= 1201000) && ${CHOSEN_COMPILER_TYPE} == clang CFLAGS+= -Wno-error=extra-semi-stmt .endif # Prepare for Qt5-5.15 CFLAGS+= -Wno-deprecated +.if ${CHOSEN_COMPILER_TYPE} == clang CFLAGS+= -Wno-error=redundant-parens +.else +CFLAGS+= -Wno-error=deprecated-declarations +.endif .include <bsd.port.post.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007191739.06JHdb18043672>