Date: Wed, 28 Oct 2020 21:24:33 +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: r553567 - branches/2020Q4/graphics/photoflow Message-ID: <202010282124.09SLOXfK049724@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pkubaj Date: Wed Oct 28 21:24:33 2020 New Revision: 553567 URL: https://svnweb.freebsd.org/changeset/ports/553567 Log: MFH: r553566 graphics/photoflow: fix build on GCC architectures Clang doesn't work on GCC architectures. Approved by: portmgr (fix build blanket) Modified: branches/2020Q4/graphics/photoflow/Makefile Directory Properties: branches/2020Q4/ (props changed) Modified: branches/2020Q4/graphics/photoflow/Makefile ============================================================================== --- branches/2020Q4/graphics/photoflow/Makefile Wed Oct 28 21:23:19 2020 (r553566) +++ branches/2020Q4/graphics/photoflow/Makefile Wed Oct 28 21:24:33 2020 (r553567) @@ -25,7 +25,7 @@ LIB_DEPENDS= libexiv2.so:graphics/exiv2 \ libpugixml.so:textproc/pugixml \ libvips.so:graphics/vips -USES= cmake desktop-file-utils gettext gnome jpeg pkgconfig # compiler:c++11-lang +USES= cmake compiler desktop-file-utils gettext gnome jpeg pkgconfig USE_GITHUB= yes GH_ACCOUNT= aferrero2707 GH_PROJECT= PhotoFlow @@ -52,11 +52,17 @@ OCIO_LIB_DEPENDS= libOpenColorIO.so:graphics/opencolor OCIO_VARS= GH_TUPLE+=sobotka:filmic-blender:1.1.1:fb/../.build/data/filmic-blender \ GH_TUPLE+=imageworks:OpenColorIO-Configs:0bb079c08be410030669cbf5f19ff869b88af953:c/../.build/data/ocio-configs +.include <bsd.port.pre.mk> + +.if ${CHOSEN_COMPILER_TYPE} == gcc +USE_GCC= yes +.else # clang-10 fails to compile photoflow because it bundles an old version of GMIC that clang-10 doesn't like: https://github.com/aferrero2707/PhotoFlow/issues/220 LLVM_VERSION= 90 -BUILD_DEPENDS= clang${LLVM_VERSION}:devel/llvm${LLVM_VERSION} +BUILD_DEPENDS+= clang${LLVM_VERSION}:devel/llvm${LLVM_VERSION} CC= clang${LLVM_VERSION} CXX= clang++${LLVM_VERSION} CPP= clang-cpp${LLVM_VERSION} +.endif -.include <bsd.port.mk> +.include <bsd.port.post.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202010282124.09SLOXfK049724>