From owner-svn-ports-all@freebsd.org Wed Nov 18 09:09:17 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 671FFA2FFD4; Wed, 18 Nov 2015 09:09:17 +0000 (UTC) (envelope-from dumbbell@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 191C411C5; Wed, 18 Nov 2015 09:09:17 +0000 (UTC) (envelope-from dumbbell@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAI99G3S047867; Wed, 18 Nov 2015 09:09:16 GMT (envelope-from dumbbell@FreeBSD.org) Received: (from dumbbell@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAI99Gwb047866; Wed, 18 Nov 2015 09:09:16 GMT (envelope-from dumbbell@FreeBSD.org) Message-Id: <201511180909.tAI99Gwb047866@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dumbbell set sender to dumbbell@FreeBSD.org using -f From: =?UTF-8?Q?Jean-S=c3=a9bastien_P=c3=a9dron?= Date: Wed, 18 Nov 2015 09:09:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r401850 - head/graphics/darktable X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Nov 2015 09:09:17 -0000 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 -.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