mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 01:39:16 -04:00
*/*: 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
This commit is contained in:
Fernando Apesteguía
parent
e8b8483aa7
commit
07fb2d5e9d
14 changed files with 32 additions and 48 deletions
|
|
@ -2,7 +2,7 @@
|
|||
#
|
||||
# Feature: compiler
|
||||
# Usage: USES=compiler or USES=compiler:ARGS
|
||||
# Valid ARGS: env (default, implicit) c++0x c++11-lib c++11-lang c11 openmp nestedfct features
|
||||
# Valid ARGS: env (default, implicit) c++0x c++11-lib c++11-lang c11 nestedfct features
|
||||
#
|
||||
# c++0x: The port needs a compiler understanding C++0X
|
||||
# c++11-lang: The port needs a compiler understanding C++11
|
||||
|
|
@ -11,7 +11,6 @@
|
|||
# gcc-c++11-lib:The port needs g++ compiler with a C++11 library
|
||||
# c++11-lib: The port needs a compiler understanding C++11 and with a C++11 ready standard library
|
||||
# c11: The port needs a compiler understanding C11
|
||||
# openmp: The port needs a compiler understanding openmp
|
||||
# nestedfct: The port needs a compiler understanding nested functions
|
||||
# features: The port will determine the features supported by the default compiler
|
||||
#
|
||||
|
|
@ -34,7 +33,7 @@ _INCLUDE_USES_COMPILER_MK= yes
|
|||
compiler_ARGS= env
|
||||
.endif
|
||||
|
||||
VALID_ARGS= c++11-lib c++11-lang c++14-lang c++17-lang c11 features openmp env nestedfct c++0x gcc-c++11-lib
|
||||
VALID_ARGS= c++11-lib c++11-lang c++14-lang c++17-lang c11 features env nestedfct c++0x gcc-c++11-lib
|
||||
|
||||
_CC_hash:= ${CC:hash}
|
||||
_CXX_hash:= ${CXX:hash}
|
||||
|
|
@ -57,8 +56,6 @@ _COMPILER_ARGS+= features c11
|
|||
_COMPILER_ARGS+= features
|
||||
.elif ${compiler_ARGS} == env
|
||||
_COMPILER_ARGS+= env
|
||||
.elif ${compiler_ARGS} == openmp
|
||||
_COMPILER_ARGS+= env openmp
|
||||
.elif ${compiler_ARGS} == nestedfct
|
||||
_COMPILER_ARGS+= env nestedfct
|
||||
.else
|
||||
|
|
@ -110,13 +107,6 @@ ALT_COMPILER_TYPE= gcc
|
|||
|
||||
CHOSEN_COMPILER_TYPE= ${COMPILER_TYPE}
|
||||
|
||||
.if ${_COMPILER_ARGS:Mopenmp}
|
||||
.if ${COMPILER_TYPE} == clang
|
||||
USE_GCC= yes
|
||||
CHOSEN_COMPILER_TYPE= gcc
|
||||
.endif
|
||||
.endif
|
||||
|
||||
.if ${_COMPILER_ARGS:Mnestedfct}
|
||||
.if ${COMPILER_TYPE} == clang
|
||||
USE_GCC= any
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
PORTNAME= pxz
|
||||
PORTVERSION= 0.20141018
|
||||
PORTREVISION= 8
|
||||
PORTREVISION= 9
|
||||
CATEGORIES= archivers
|
||||
MASTER_SITES= LOCAL/delphij
|
||||
DISTNAME= pxz-git-${PORTVERSION:S/0.//}
|
||||
|
|
@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
|
|||
|
||||
WRKSRC= ${WRKDIR}/${PORTNAME}
|
||||
|
||||
USES= cpe compiler:openmp tar:xz
|
||||
USES= cpe tar:xz
|
||||
PLIST_FILES= bin/pxz share/man/man1/pxz.1.gz
|
||||
|
||||
CPE_VENDOR= pxz_project
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
PORTNAME= rpm
|
||||
PORTVERSION= 4.16.1.3
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= archivers
|
||||
MASTER_SITES= http://ftp.rpm.org/releases/rpm-4.16.x/
|
||||
PKGNAMESUFFIX= 4
|
||||
|
|
@ -20,7 +21,7 @@ LIB_DEPENDS= libpopt.so:devel/popt \
|
|||
RUN_DEPENDS= bash:shells/bash \
|
||||
gxargs:misc/findutils
|
||||
|
||||
USES= alias bdb sqlite compiler:openmp cpe gmake iconv libarchive libtool \
|
||||
USES= alias bdb sqlite cpe gmake iconv libarchive libtool \
|
||||
lua:52+ pathfix pkgconfig shebangfix tar:bzip2
|
||||
USE_LDCONFIG= yes
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
PORTNAME= pooler
|
||||
DISTVERSIONPREFIX= v
|
||||
DISTVERSION= 1.78
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= biology
|
||||
|
||||
MAINTAINER= ssb22@cam.ac.uk
|
||||
|
|
@ -9,9 +10,6 @@ COMMENT= Optimise DNA sequencing primer-set combinations
|
|||
LICENSE= APACHE20
|
||||
LICENSE_FILE= ${WRKDIR}/${GH_PROJECT}-${PORTVERSION}/LICENSE
|
||||
|
||||
# Not needed on x86, aarch64, or ppc64-13.x
|
||||
# Might need gcc on 32-bit ARM/PPC
|
||||
USES= compiler:openmp
|
||||
USE_GITHUB= yes
|
||||
|
||||
GH_ACCOUNT= ssb22
|
||||
|
|
@ -24,3 +22,4 @@ INSTALL_TARGET= install-strip
|
|||
PLIST_FILES= bin/pooler man/man1/pooler.1.gz share/applications/pooler.desktop
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
PORTNAME= seqan-apps
|
||||
DISTVERSIONPREFIX= seqan-v
|
||||
DISTVERSION= 2.4.0
|
||||
PORTREVISION= 9
|
||||
PORTREVISION= 10
|
||||
CATEGORIES= biology
|
||||
|
||||
MAINTAINER= h2+fbsdports@fsfe.org
|
||||
|
|
@ -14,7 +14,7 @@ LICENSE_COMB= multi
|
|||
|
||||
BUILD_DEPENDS= boost-libs>0:devel/boost-libs
|
||||
|
||||
USES= cmake compiler:openmp # once #199603 is resolved, add c++14-lang
|
||||
USES= cmake
|
||||
USE_GITHUB= yes
|
||||
GH_ACCOUNT= seqan
|
||||
GH_PROJECT= seqan
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
PORTNAME= ccx
|
||||
PORTVERSION= 2.17
|
||||
PORTREVISION= 1
|
||||
PORTREVISION= 2
|
||||
CATEGORIES= cad
|
||||
MASTER_SITES= http://www.dhondt.de/
|
||||
PKGNAMEPREFIX= CalculiX-
|
||||
|
|
@ -18,7 +18,7 @@ LICENSE= GPLv2
|
|||
LIB_DEPENDS= libarpack.so:math/arpack-ng \
|
||||
libspooles.so:math/spooles
|
||||
|
||||
USES= blaslapack compiler:openmp fortran gmake perl5 tar:bzip2
|
||||
USES= blaslapack fortran gmake perl5 tar:bzip2
|
||||
USE_PERL5= build
|
||||
|
||||
DIST_SOURCES= ccx_${PORTVERSION}.src${EXTRACT_SUFX}
|
||||
|
|
|
|||
|
|
@ -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/ \
|
||||
|
|
@ -233,7 +233,6 @@ _IMAGEMAGICK_THREADS=no
|
|||
IGNORE=OpenMP requires threads${_IMAGEMAGICK_THREADS_IGNORE_MSG}
|
||||
. else
|
||||
CONFIGURE_ARGS+= --enable-openmp
|
||||
USES+= compiler:openmp
|
||||
. endif
|
||||
.else
|
||||
CONFIGURE_ARGS+= --disable-openmp
|
||||
|
|
|
|||
|
|
@ -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/ \
|
||||
|
|
@ -231,12 +231,10 @@ _IMAGEMAGICK_THREADS=no
|
|||
IGNORE=OpenMP requires threads${_IMAGEMAGICK_THREADS_IGNORE_MSG}
|
||||
. else
|
||||
CONFIGURE_ARGS+= --enable-openmp
|
||||
USES+= compiler:openmp
|
||||
. endif
|
||||
.else
|
||||
CONFIGURE_ARGS+= --disable-openmp
|
||||
.endif
|
||||
|
||||
.if defined(WITH_WINDOWS_FONT_DIR)
|
||||
CONFIGURE_ARGS+= --with-windows-font-dir=${WITH_WINDOWS_FONT_DIR}
|
||||
.endif
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
PORTNAME= hmat-oss
|
||||
DISTVERSION= 1.7.1
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= math
|
||||
|
||||
MAINTAINER= yuri@FreeBSD.org
|
||||
|
|
@ -10,7 +11,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.md
|
|||
|
||||
LIB_DEPENDS= libopenblas.so:math/openblas
|
||||
|
||||
USES= cmake compiler:openmp
|
||||
USES= cmake
|
||||
USE_LDCONFIG= yes
|
||||
|
||||
USE_GITHUB= yes
|
||||
|
|
@ -22,12 +23,6 @@ CMAKE_OFF= HMAT_GIT_VERSION
|
|||
|
||||
LDFLAGS+= -lexecinfo
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
.if ${CHOSEN_COMPILER_TYPE} == gcc
|
||||
USE_GCC= yes
|
||||
.endif
|
||||
|
||||
do-test:
|
||||
@cd ${BUILD_WRKSRC} && \
|
||||
${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_EXAMPLES:BOOL=ON ${CMAKE_SOURCE_PATH} && \
|
||||
|
|
@ -35,4 +30,4 @@ do-test:
|
|||
${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
|
||||
${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
|
||||
|
||||
.include <bsd.port.post.mk>
|
||||
.include <bsd.port.mk>
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
PORTNAME= librsb
|
||||
PORTVERSION= 1.2.0.10
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= math
|
||||
MASTER_SITES= SF/librsb
|
||||
DISTNAME= ${PORTNAME}-${PORTVERSION:S/r/-rc/}
|
||||
|
|
@ -15,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
|
|||
BUILD_DEPENDS= gsed:textproc/gsed \
|
||||
bash:shells/bash
|
||||
|
||||
USES= fortran compiler:openmp gmake shebangfix libtool
|
||||
USES= fortran gmake shebangfix libtool
|
||||
INSTALL_TARGET= install-strip
|
||||
TEST_TARGET= qtests
|
||||
GNU_CONFIGURE= yes
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
PORTNAME= theano
|
||||
DISTVERSION= 1.0.5
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= math python
|
||||
MASTER_SITES= CHEESESHOP
|
||||
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
|
||||
|
|
@ -17,7 +18,7 @@ RUN_DEPENDS= ${PYNUMPY} \
|
|||
${PYTHON_PKGNAMEPREFIX}scipy>=0.8.0:science/py-scipy@${PY_FLAVOR} \
|
||||
${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR}
|
||||
|
||||
USES= compiler:openmp python:3.6+
|
||||
USES= python:3.6+
|
||||
USE_PYTHON= concurrent distutils autoplist
|
||||
|
||||
NO_ARCH= yes
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
PORTNAME= tmv
|
||||
DISTVERSIONPREFIX= v
|
||||
DISTVERSION= 0.75
|
||||
PORTREVISION= 7
|
||||
PORTREVISION= 8
|
||||
CATEGORIES= math
|
||||
|
||||
MAINTAINER= yuri@FreeBSD.org
|
||||
|
|
@ -10,7 +10,7 @@ COMMENT= Fast, intuitive linear algebra library for C++
|
|||
LICENSE= BSD2CLAUSE
|
||||
LICENSE_FILE= ${WRKSRC}/TMV_LICENSE
|
||||
|
||||
USES= compiler:openmp gmake blaslapack:netlib localbase
|
||||
USES= gmake blaslapack:netlib localbase
|
||||
USE_GITHUB= yes
|
||||
GH_ACCOUNT= rmjarvis
|
||||
USE_LDCONFIG= yes
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
PORTNAME= viennacl
|
||||
PORTVERSION= 1.7.1
|
||||
PORTREVISION= 5
|
||||
PORTREVISION= 6
|
||||
CATEGORIES= math
|
||||
MASTER_SITES= SF/${PORTNAME}/1.7.x/
|
||||
DISTNAME= ViennaCL-${PORTVERSION}
|
||||
|
|
@ -17,6 +17,6 @@ BUILD_DEPENDS= ${LOCALBASE}/include/CL/opencl.h:devel/opencl
|
|||
LIB_DEPENDS= libOpenCL.so:devel/ocl-icd
|
||||
RUN_DEPENDS= ${LOCALBASE}/include/CL/opencl.h:devel/opencl
|
||||
|
||||
USES= cmake compiler:openmp localbase
|
||||
USES= cmake localbase
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue