diff options
| author | Fernando Apesteguía <fernape@FreeBSD.org> | 2021-09-12 17:18:06 +0200 |
|---|---|---|
| committer | Fernando Apesteguía <fernape@FreeBSD.org> | 2021-10-03 19:47:27 +0200 |
| commit | 07fb2d5e9d001934f1670d01aec1f536f14ebde2 (patch) | |
| tree | f2f87572cb6aa68955a9057625ca5ed1acbb394a /graphics | |
| parent | security/seahorse: Update to 41.0 (diff) | |
*/*: Remove compiler:openmp from Mk/Uses/compiler.mk
The option implied a dependency on gcc but clang got openmp support long ago.
Remove compiler:openmp from Mk/Uses/compiler.mk
For ports using USE=compiler:openmp, just remove it and make them build with
clang.
Fix conditionals when necessary
Bump PORTREVISION where appropriate
If problem arises, they can be addressed by using USE_GCC=yes
An update to the Porter's Handbook will follow.
Approved by: portmgr (bapt)
Differential Revision: https://reviews.freebsd.org/D31971
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/ImageMagick6/Makefile | 7 | ||||
| -rw-r--r-- | graphics/ImageMagick7/Makefile | 8 | ||||
| -rw-r--r-- | graphics/aaphoto/Makefile | 6 |
3 files changed, 9 insertions, 12 deletions
diff --git a/graphics/ImageMagick6/Makefile b/graphics/ImageMagick6/Makefile index f013c0906b14..fca01f41e974 100644 --- a/graphics/ImageMagick6/Makefile +++ b/graphics/ImageMagick6/Makefile @@ -1,6 +1,6 @@ PORTNAME= ImageMagick DISTVERSION= 6.9.12-12 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= graphics perl5 MASTER_SITES= https://www.imagemagick.org/download/ \ @@ -232,11 +232,10 @@ _IMAGEMAGICK_THREADS=no . if ${_IMAGEMAGICK_THREADS} == "no" IGNORE=OpenMP requires threads${_IMAGEMAGICK_THREADS_IGNORE_MSG} . else -CONFIGURE_ARGS+= --enable-openmp -USES+= compiler:openmp +CONFIGURE_ARGS+= --enable-openmp . endif .else -CONFIGURE_ARGS+= --disable-openmp +CONFIGURE_ARGS+= --disable-openmp .endif .if defined(WITH_WINDOWS_FONT_DIR) diff --git a/graphics/ImageMagick7/Makefile b/graphics/ImageMagick7/Makefile index 630fa460b5d6..8df8dca03fd3 100644 --- a/graphics/ImageMagick7/Makefile +++ b/graphics/ImageMagick7/Makefile @@ -1,6 +1,6 @@ PORTNAME= ImageMagick DISTVERSION= 7.0.11-12 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics perl5 MASTER_SITES= https://www.imagemagick.org/download/ \ https://www.imagemagick.org/download/releases/ \ @@ -230,13 +230,11 @@ _IMAGEMAGICK_THREADS=no . if ${_IMAGEMAGICK_THREADS} == "no" IGNORE=OpenMP requires threads${_IMAGEMAGICK_THREADS_IGNORE_MSG} . else -CONFIGURE_ARGS+= --enable-openmp -USES+= compiler:openmp +CONFIGURE_ARGS+= --enable-openmp . endif .else -CONFIGURE_ARGS+= --disable-openmp +CONFIGURE_ARGS+= --disable-openmp .endif - .if defined(WITH_WINDOWS_FONT_DIR) CONFIGURE_ARGS+= --with-windows-font-dir=${WITH_WINDOWS_FONT_DIR} .endif diff --git a/graphics/aaphoto/Makefile b/graphics/aaphoto/Makefile index 18f8dfcb8d3d..f6d67a94764c 100644 --- a/graphics/aaphoto/Makefile +++ b/graphics/aaphoto/Makefile @@ -3,7 +3,7 @@ PORTNAME= aaphoto PORTVERSION= 0.43.1 DISTVERSIONPREFIX= v -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= graphics MAINTAINER= mail@log69.com @@ -18,7 +18,7 @@ USE_GITHUB= yes GH_ACCOUNT= log69 GNU_CONFIGURE= yes -USES= compiler:openmp jpeg +USES= jpeg CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -27,7 +27,7 @@ PLIST_FILES= bin/aaphoto .include <bsd.port.pre.mk> -.if (${ARCH} == amd64 || ${ARCH} == i386) && ${CHOSEN_COMPILER_TYPE} == gcc +.if (${ARCH} == amd64 || ${ARCH} == i386) CFLAGS+= -fopenmp -D__OPENMP__ .endif |