Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 19 Nov 2017 09:13:43 +0000 (UTC)
From:      Ashish SHUKLA <ashish@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r454482 - head/editors/emacs
Message-ID:  <201711190913.vAJ9Dh28061814@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ashish
Date: Sun Nov 19 09:13:43 2017
New Revision: 454482
URL: https://svnweb.freebsd.org/changeset/ports/454482

Log:
  - Fix broken behaviour when port is compiled with IMAGEMAGICK option
    and ImageMagick is built with OPENMP option
  
  PR:		223518
  Submitted by:	Kalten <kalten@gmx.at>

Modified:
  head/editors/emacs/Makefile

Modified: head/editors/emacs/Makefile
==============================================================================
--- head/editors/emacs/Makefile	Sun Nov 19 09:10:35 2017	(r454481)
+++ head/editors/emacs/Makefile	Sun Nov 19 09:13:43 2017	(r454482)
@@ -185,6 +185,17 @@ XWIDGETS_CONFIGURE_WITH=xwidgets
 XWIDGETS_LIB_DEPENDS=	libwebkitgtk-3.0.so:www/webkit-gtk3
 XWIDGETS_IMPLIES=	GTK3
 
+.include <bsd.port.options.mk>
+
+# has graphics/ImageMagick been compiled with OPENMP?
+.if ${PORT_OPTIONS:MMAGICK} && ${:!${GREP} -sc " \-fopenmp " ${LOCALBASE}/libdata/pkgconfig/ImageMagick.pc || true!} == "1"
+_MAGICK_WITH_OPENMP=	true
+.endif
+
+.ifdef _MAGICK_WITH_OPENMP
+USES+=	compiler:openmp
+.endif
+
 # With a desktop entry stage-qa will give a warning about requiring
 # desktop-file-utils and portlint -C will give a warning about INSTALL_ICONS,
 # but don't pull in those dependencies when X11 is off.



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