The DreamerThe Beastie Blog

Revisiting graphics/shotwell after webkit-gtk3

Saturday, March 28 2015

In finally getting around to examining the response to the PR I had submitted in previous post, last weekend I had eventually settled on a simplier patch for this problem. One that avoids the messiness of using OSVERSION, without OPSYS for places where FreeBSD ports are used by other distros without means to abstract these details away, and resolves what the correct solution for the OPENMP option is.

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
--- Makefile.orig	2015-02-21 09:11:52.000000000 -0600
+++ Makefile	2015-03-22 10:21:38.110064518 -0500
@@ -35,17 +35,14 @@
 CONFIGURE_ARGS=	--prefix=${PREFIX} --disable-icon-update
 CONFIGURE_ENV+=	--define=NO_CAMERA
 INSTALLS_ICONS=	yes
+PORTSCOUT=	limitw:1,even
 
 OPTIONS_DEFINE=	OPENMP
 OPTIONS_DEFAULT=
 OPENMP_DESC=	libraw uses OpenMP (implies GCC 4.6+)
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MOPENMP}
-USE_GCC=	yes
-LDFLAGS+=	-lc++
-.endif
+OPENMP_USES=		compiler:gcc-c++11-lib
+OPENMP_USES_OFF=	compiler:c++11-lib
 
 SHEBANG_FILES=	${WRKSRC}/${CONFIGURE_SCRIPT} ${WRKSRC}/chkver

Has resulted in this patch getting incorporated into a different PR, that upgrades to newer release, without back reference to my PR (196707) and another PR (196236)

PR: 198986