From owner-svn-ports-all@freebsd.org  Sun Nov 19 09:13:45 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
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 17DFEDF039D;
 Sun, 19 Nov 2017 09:13:45 +0000 (UTC)
 (envelope-from ashish@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 D63B07150B;
 Sun, 19 Nov 2017 09:13:44 +0000 (UTC)
 (envelope-from ashish@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAJ9DhLO061815;
 Sun, 19 Nov 2017 09:13:43 GMT (envelope-from ashish@FreeBSD.org)
Received: (from ashish@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAJ9Dh28061814;
 Sun, 19 Nov 2017 09:13:43 GMT (envelope-from ashish@FreeBSD.org)
Message-Id: <201711190913.vAJ9Dh28061814@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ashish set sender to
 ashish@FreeBSD.org using -f
From: Ashish SHUKLA <ashish@FreeBSD.org>
Date: Sun, 19 Nov 2017 09:13:43 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r454482 - head/editors/emacs
X-SVN-Group: ports-head
X-SVN-Commit-Author: ashish
X-SVN-Commit-Paths: head/editors/emacs
X-SVN-Commit-Revision: 454482
X-SVN-Commit-Repository: ports
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.25
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 19 Nov 2017 09:13:45 -0000

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.