Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 18 Nov 2015 09:09:16 +0000 (UTC)
From:      =?UTF-8?Q?Jean-S=c3=a9bastien_P=c3=a9dron?= <dumbbell@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r401850 - head/graphics/darktable
Message-ID:  <201511180909.tAI99Gwb047866@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dumbbell (src committer)
Date: Wed Nov 18 09:09:15 2015
New Revision: 401850
URL: https://svnweb.freebsd.org/changeset/ports/401850

Log:
  graphics/darktable: LLVM 3.7 does not provide OpenMP on i386
  
  This fixes the build on FreeBSD 10.x and 11-CURRENT on i386.
  
  While here, completely remove the OPENMP option. The implementation was
  incomplete anyway because disabling it would not turn off OpenMP in
  darktable if it was built with GCC.
  
  Reviewed by:	kwm
  Approved by:	kwm
  Differential Revision:	https://reviews.freebsd.org/D4130

Modified:
  head/graphics/darktable/Makefile

Modified: head/graphics/darktable/Makefile
==============================================================================
--- head/graphics/darktable/Makefile	Wed Nov 18 08:46:02 2015	(r401849)
+++ head/graphics/darktable/Makefile	Wed Nov 18 09:09:15 2015	(r401850)
@@ -29,8 +29,8 @@ INSTALLS_ICONS=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 
 OPTIONS_DEFINE=	COLORD DOCS FB_PICASA FLICKR GEO GNOMEKEYRING GPHOTO	\
-		GRAPHMAGICK LIBSECRET LUA NLS OPENEXR OPENJPEG OPENMP	\
-		RAWSPEED SLIDESHOW SQUISH WEBP
+		GRAPHMAGICK LIBSECRET LUA NLS OPENEXR OPENJPEG RAWSPEED	\
+		SLIDESHOW SQUISH WEBP
 
 GEO_DESC=	Support geotagging
 FB_PICASA_DESC=	Support export to Facebook and Picasa
@@ -40,7 +40,7 @@ RAWSPEED_DESC=	Compile with rawspeed bac
 SLIDESHOW_DESC=	Build OpenGL/SDL slideshow viewer
 
 OPTIONS_DEFAULT=COLORD FB_PICASA FLICKR GEO GPHOTO LUA NLS OPENEXR	\
-		OPENJPEG OPENMP RAWSPEED SLIDESHOW SQUISH WEBP
+		OPENJPEG RAWSPEED SLIDESHOW SQUISH WEBP
 OPTIONS_SUB=	yes
 
 CMAKE_ARGS+=	-DBINARY_PACKAGE_BUILD=1
@@ -98,7 +98,7 @@ WEBP_CMAKE_OFF=		-DUSE_WEBP:BOOL=OFF
 
 .include <bsd.port.pre.mk>
 
-.if ${PORT_OPTIONS:MOPENMP} && ${COMPILER_TYPE} == clang
+.if ${ARCH} == amd64 && ${COMPILER_TYPE} == clang
 # Enable OpenMP support with Clang 3.7.
 BUILD_DEPENDS+=	clang37:${PORTSDIR}/devel/llvm37
 RUN_DEPENDS+=	clang37:${PORTSDIR}/devel/llvm37



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511180909.tAI99Gwb047866>