Date: Sun, 3 Oct 2021 20:03:01 +0200 From: Piotr Kubaj <pkubaj@anongoth.pl> To: Fernando =?utf-8?Q?Apestegu=C3=ADa?= <fernape@freebsd.org> Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: 07fb2d5e9d00 - main - */*: Remove compiler:openmp from Mk/Uses/compiler.mk Message-ID: <YVnwVTtGSchnl4qN@KGPE-D16> In-Reply-To: <202110031752.193HqoYO020693@gitrepo.freebsd.org> References: <202110031752.193HqoYO020693@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--CGZxlC+rHkLR8gOh Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable This is not correct. clang still doesn't have openmp support on some archit= ectures. Instead of removing this option, it should use clang where openmp is availa= ble and gcc where it's not availaible. =46rom src.conf(5) on 13.0-RELEASE: WITHOUT_OPENMP Set to not build LLVM's OpenMP runtime. This is a default setting on arm/armv6, arm/armv7, mips/mips, mips/mips64, powerpc/powerpc, riscv/riscv64 and riscv/riscv64s= f. I switched riscv64* to WITH_OPENMP after 13.0-RELEASE, but other architectu= res are still affected. Until ALL the supported architectures on all the supported stable branches = are switched, this option needs to stay. And last I tried, I found out that at least on powerpc, there's still no op= enmp support (don't confuse it with powerpc64 and powerpc64le on which open= mp works with clang). On 21-10-03 17:52:50, Fernando Apestegu=C3=ADa wrote: > The branch main has been updated by fernape: >=20 > URL: https://cgit.FreeBSD.org/ports/commit/?id=3D07fb2d5e9d001934f1670d01= aec1f536f14ebde2 >=20 > commit 07fb2d5e9d001934f1670d01aec1f536f14ebde2 > Author: Fernando Apestegu=C3=ADa <fernape@FreeBSD.org> > AuthorDate: 2021-09-12 15:18:06 +0000 > Commit: Fernando Apestegu=C3=ADa <fernape@FreeBSD.org> > CommitDate: 2021-10-03 17:47:27 +0000 >=20 > */*: Remove compiler:openmp from Mk/Uses/compiler.mk > =20 > The option implied a dependency on gcc but clang got openmp support l= ong ago. > =20 > Remove compiler:openmp from Mk/Uses/compiler.mk > =20 > For ports using USE=3Dcompiler:openmp, just remove it and make them b= uild with > clang. > Fix conditionals when necessary > Bump PORTREVISION where appropriate > =20 > If problem arises, they can be addressed by using USE_GCC=3Dyes > =20 > An update to the Porter's Handbook will follow. > =20 > Approved by: portmgr (bapt) > Differential Revision: https://reviews.freebsd.org/D31971 > --- > Mk/Uses/compiler.mk | 14 ++------------ > archivers/pxz/Makefile | 4 ++-- > archivers/rpm4/Makefile | 3 ++- > biology/pooler/Makefile | 5 ++--- > biology/seqan-apps/Makefile | 4 ++-- > cad/calculix-ccx/Makefile | 4 ++-- > graphics/ImageMagick6/Makefile | 7 +++---- > graphics/ImageMagick7/Makefile | 8 +++----- > graphics/aaphoto/Makefile | 6 +++--- > math/hmat-oss/Makefile | 11 +++-------- > math/librsb/Makefile | 3 ++- > math/py-theano/Makefile | 3 ++- > math/tmv/Makefile | 4 ++-- > math/viennacl/Makefile | 4 ++-- > 14 files changed, 32 insertions(+), 48 deletions(-) >=20 > diff --git a/Mk/Uses/compiler.mk b/Mk/Uses/compiler.mk > index 18c8dec90cf5..6e03765f2a50 100644 > --- a/Mk/Uses/compiler.mk > +++ b/Mk/Uses/compiler.mk > @@ -2,7 +2,7 @@ > # > # Feature: compiler > # Usage: USES=3Dcompiler or USES=3Dcompiler:ARGS > -# Valid ARGS: env (default, implicit) c++0x c++11-lib c++11-lang c11 ope= nmp nestedfct features > +# Valid ARGS: env (default, implicit) c++0x c++11-lib c++11-lang c11 nes= tedfct 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 defaul= t compiler > # > @@ -34,7 +33,7 @@ _INCLUDE_USES_COMPILER_MK=3D yes > compiler_ARGS=3D env > .endif > =20 > -VALID_ARGS=3D c++11-lib c++11-lang c++14-lang c++17-lang c11 features op= enmp env nestedfct c++0x gcc-c++11-lib > +VALID_ARGS=3D c++11-lib c++11-lang c++14-lang c++17-lang c11 features en= v nestedfct c++0x gcc-c++11-lib > =20 > _CC_hash:=3D ${CC:hash} > _CXX_hash:=3D ${CXX:hash} > @@ -57,8 +56,6 @@ _COMPILER_ARGS+=3D features c11 > _COMPILER_ARGS+=3D features > .elif ${compiler_ARGS} =3D=3D env > _COMPILER_ARGS+=3D env > -.elif ${compiler_ARGS} =3D=3D openmp > -_COMPILER_ARGS+=3D env openmp > .elif ${compiler_ARGS} =3D=3D nestedfct > _COMPILER_ARGS+=3D env nestedfct > .else > @@ -110,13 +107,6 @@ ALT_COMPILER_TYPE=3D gcc > =20 > CHOSEN_COMPILER_TYPE=3D ${COMPILER_TYPE} > =20 > -.if ${_COMPILER_ARGS:Mopenmp} > -.if ${COMPILER_TYPE} =3D=3D clang > -USE_GCC=3D yes > -CHOSEN_COMPILER_TYPE=3D gcc > -.endif > -.endif > - > .if ${_COMPILER_ARGS:Mnestedfct} > .if ${COMPILER_TYPE} =3D=3D clang > USE_GCC=3D any > diff --git a/archivers/pxz/Makefile b/archivers/pxz/Makefile > index 9f31be6ddfb6..0e6a5793ca2a 100644 > --- a/archivers/pxz/Makefile > +++ b/archivers/pxz/Makefile > @@ -2,7 +2,7 @@ > =20 > PORTNAME=3D pxz > PORTVERSION=3D 0.20141018 > -PORTREVISION=3D 8 > +PORTREVISION=3D 9 > CATEGORIES=3D archivers > MASTER_SITES=3D LOCAL/delphij > DISTNAME=3D pxz-git-${PORTVERSION:S/0.//} > @@ -15,7 +15,7 @@ LICENSE_FILE=3D ${WRKSRC}/COPYING > =20 > WRKSRC=3D ${WRKDIR}/${PORTNAME} > =20 > -USES=3D cpe compiler:openmp tar:xz > +USES=3D cpe tar:xz > PLIST_FILES=3D bin/pxz share/man/man1/pxz.1.gz > =20 > CPE_VENDOR=3D pxz_project > diff --git a/archivers/rpm4/Makefile b/archivers/rpm4/Makefile > index b34e6aadd90c..605deb742b68 100644 > --- a/archivers/rpm4/Makefile > +++ b/archivers/rpm4/Makefile > @@ -2,6 +2,7 @@ > =20 > PORTNAME=3D rpm > PORTVERSION=3D 4.16.1.3 > +PORTREVISION=3D 1 > CATEGORIES=3D archivers > MASTER_SITES=3D http://ftp.rpm.org/releases/rpm-4.16.x/ > PKGNAMESUFFIX=3D 4 > @@ -20,7 +21,7 @@ LIB_DEPENDS=3D libpopt.so:devel/popt \ > RUN_DEPENDS=3D bash:shells/bash \ > gxargs:misc/findutils > =20 > -USES=3D alias bdb sqlite compiler:openmp cpe gmake iconv libarchive lib= tool \ > +USES=3D alias bdb sqlite cpe gmake iconv libarchive libtool \ > lua:52+ pathfix pkgconfig shebangfix tar:bzip2 > USE_LDCONFIG=3D yes > =20 > diff --git a/biology/pooler/Makefile b/biology/pooler/Makefile > index f674ed8d0e6f..8236638d0c4a 100644 > --- a/biology/pooler/Makefile > +++ b/biology/pooler/Makefile > @@ -1,6 +1,7 @@ > PORTNAME=3D pooler > DISTVERSIONPREFIX=3D v > DISTVERSION=3D 1.78 > +PORTREVISION=3D 1 > CATEGORIES=3D biology > =20 > MAINTAINER=3D ssb22@cam.ac.uk > @@ -9,9 +10,6 @@ COMMENT=3D Optimise DNA sequencing primer-set combinatio= ns > LICENSE=3D APACHE20 > LICENSE_FILE=3D ${WRKDIR}/${GH_PROJECT}-${PORTVERSION}/LICENSE > =20 > -# Not needed on x86, aarch64, or ppc64-13.x > -# Might need gcc on 32-bit ARM/PPC > -USES=3D compiler:openmp > USE_GITHUB=3D yes > =20 > GH_ACCOUNT=3D ssb22 > @@ -24,3 +22,4 @@ INSTALL_TARGET=3D install-strip > PLIST_FILES=3D bin/pooler man/man1/pooler.1.gz share/applications/pooler= =2Edesktop > =20 > .include <bsd.port.mk> > + > diff --git a/biology/seqan-apps/Makefile b/biology/seqan-apps/Makefile > index 01879b514c32..57a78e8657df 100644 > --- a/biology/seqan-apps/Makefile > +++ b/biology/seqan-apps/Makefile > @@ -3,7 +3,7 @@ > PORTNAME=3D seqan-apps > DISTVERSIONPREFIX=3D seqan-v > DISTVERSION=3D 2.4.0 > -PORTREVISION=3D 9 > +PORTREVISION=3D 10 > CATEGORIES=3D biology > =20 > MAINTAINER=3D h2+fbsdports@fsfe.org > @@ -14,7 +14,7 @@ LICENSE_COMB=3D multi > =20 > BUILD_DEPENDS=3D boost-libs>0:devel/boost-libs > =20 > -USES=3D cmake compiler:openmp # once #199603 is resolved, add c++14-lang > +USES=3D cmake > USE_GITHUB=3D yes > GH_ACCOUNT=3D seqan > GH_PROJECT=3D seqan > diff --git a/cad/calculix-ccx/Makefile b/cad/calculix-ccx/Makefile > index c5733de025f5..3807d9a7ea8d 100644 > --- a/cad/calculix-ccx/Makefile > +++ b/cad/calculix-ccx/Makefile > @@ -2,7 +2,7 @@ > =20 > PORTNAME=3D ccx > PORTVERSION=3D 2.17 > -PORTREVISION=3D 1 > +PORTREVISION=3D 2 > CATEGORIES=3D cad > MASTER_SITES=3D http://www.dhondt.de/ > PKGNAMEPREFIX=3D CalculiX- > @@ -18,7 +18,7 @@ LICENSE=3D GPLv2 > LIB_DEPENDS=3D libarpack.so:math/arpack-ng \ > libspooles.so:math/spooles > =20 > -USES=3D blaslapack compiler:openmp fortran gmake perl5 tar:bzip2 > +USES=3D blaslapack fortran gmake perl5 tar:bzip2 > USE_PERL5=3D build > =20 > DIST_SOURCES=3D ccx_${PORTVERSION}.src${EXTRACT_SUFX} > diff --git a/graphics/ImageMagick6/Makefile b/graphics/ImageMagick6/Makef= ile > index f013c0906b14..fca01f41e974 100644 > --- a/graphics/ImageMagick6/Makefile > +++ b/graphics/ImageMagick6/Makefile > @@ -1,6 +1,6 @@ > PORTNAME=3D ImageMagick > DISTVERSION=3D 6.9.12-12 > -PORTREVISION=3D 2 > +PORTREVISION=3D 3 > PORTEPOCH=3D 1 > CATEGORIES=3D graphics perl5 > MASTER_SITES=3D https://www.imagemagick.org/download/ \ > @@ -232,11 +232,10 @@ _IMAGEMAGICK_THREADS=3Dno > . if ${_IMAGEMAGICK_THREADS} =3D=3D "no" > IGNORE=3DOpenMP requires threads${_IMAGEMAGICK_THREADS_IGNORE_MSG} > . else > -CONFIGURE_ARGS+=3D --enable-openmp > -USES+=3D compiler:openmp > +CONFIGURE_ARGS+=3D --enable-openmp > . endif > .else > -CONFIGURE_ARGS+=3D --disable-openmp > +CONFIGURE_ARGS+=3D --disable-openmp > .endif > =20 > .if defined(WITH_WINDOWS_FONT_DIR) > diff --git a/graphics/ImageMagick7/Makefile b/graphics/ImageMagick7/Makef= ile > index 630fa460b5d6..8df8dca03fd3 100644 > --- a/graphics/ImageMagick7/Makefile > +++ b/graphics/ImageMagick7/Makefile > @@ -1,6 +1,6 @@ > PORTNAME=3D ImageMagick > DISTVERSION=3D 7.0.11-12 > -PORTREVISION=3D 2 > +PORTREVISION=3D 3 > CATEGORIES=3D graphics perl5 > MASTER_SITES=3D https://www.imagemagick.org/download/ \ > https://www.imagemagick.org/download/releases/ \ > @@ -230,13 +230,11 @@ _IMAGEMAGICK_THREADS=3Dno > . if ${_IMAGEMAGICK_THREADS} =3D=3D "no" > IGNORE=3DOpenMP requires threads${_IMAGEMAGICK_THREADS_IGNORE_MSG} > . else > -CONFIGURE_ARGS+=3D --enable-openmp > -USES+=3D compiler:openmp > +CONFIGURE_ARGS+=3D --enable-openmp > . endif > .else > -CONFIGURE_ARGS+=3D --disable-openmp > +CONFIGURE_ARGS+=3D --disable-openmp > .endif > - > .if defined(WITH_WINDOWS_FONT_DIR) > CONFIGURE_ARGS+=3D --with-windows-font-dir=3D${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=3D aaphoto > PORTVERSION=3D 0.43.1 > DISTVERSIONPREFIX=3D v > -PORTREVISION=3D 11 > +PORTREVISION=3D 12 > CATEGORIES=3D graphics > =20 > MAINTAINER=3D mail@log69.com > @@ -18,7 +18,7 @@ USE_GITHUB=3D yes > GH_ACCOUNT=3D log69 > =20 > GNU_CONFIGURE=3D yes > -USES=3D compiler:openmp jpeg > +USES=3D jpeg > =20 > CPPFLAGS+=3D -I${LOCALBASE}/include > LDFLAGS+=3D -L${LOCALBASE}/lib > @@ -27,7 +27,7 @@ PLIST_FILES=3D bin/aaphoto > =20 > .include <bsd.port.pre.mk> > =20 > -.if (${ARCH} =3D=3D amd64 || ${ARCH} =3D=3D i386) && ${CHOSEN_COMPILER_T= YPE} =3D=3D gcc > +.if (${ARCH} =3D=3D amd64 || ${ARCH} =3D=3D i386) > CFLAGS+=3D -fopenmp -D__OPENMP__ > .endif > =20 > diff --git a/math/hmat-oss/Makefile b/math/hmat-oss/Makefile > index e54cb7d5ed35..cd215947f434 100644 > --- a/math/hmat-oss/Makefile > +++ b/math/hmat-oss/Makefile > @@ -1,5 +1,6 @@ > PORTNAME=3D hmat-oss > DISTVERSION=3D 1.7.1 > +PORTREVISION=3D 1 > CATEGORIES=3D math > =20 > MAINTAINER=3D yuri@FreeBSD.org > @@ -10,7 +11,7 @@ LICENSE_FILE=3D ${WRKSRC}/LICENSE.md > =20 > LIB_DEPENDS=3D libopenblas.so:math/openblas > =20 > -USES=3D cmake compiler:openmp > +USES=3D cmake > USE_LDCONFIG=3D yes > =20 > USE_GITHUB=3D yes > @@ -22,12 +23,6 @@ CMAKE_OFF=3D HMAT_GIT_VERSION > =20 > LDFLAGS+=3D -lexecinfo > =20 > -.include <bsd.port.pre.mk> > - > -.if ${CHOSEN_COMPILER_TYPE} =3D=3D gcc > -USE_GCC=3D yes > -.endif > - > do-test: > @cd ${BUILD_WRKSRC} && \ > ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_EXAMPLES= :BOOL=3DON ${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 > =20 > -.include <bsd.port.post.mk> > +.include <bsd.port.mk> > diff --git a/math/librsb/Makefile b/math/librsb/Makefile > index 187ead3b681a..a98c55792372 100644 > --- a/math/librsb/Makefile > +++ b/math/librsb/Makefile > @@ -2,6 +2,7 @@ > =20 > PORTNAME=3D librsb > PORTVERSION=3D 1.2.0.10 > +PORTREVISION=3D 1 > CATEGORIES=3D math > MASTER_SITES=3D SF/librsb > DISTNAME=3D ${PORTNAME}-${PORTVERSION:S/r/-rc/} > @@ -15,7 +16,7 @@ LICENSE_FILE=3D ${WRKSRC}/COPYING > BUILD_DEPENDS=3D gsed:textproc/gsed \ > bash:shells/bash > =20 > -USES=3D fortran compiler:openmp gmake shebangfix libtool > +USES=3D fortran gmake shebangfix libtool > INSTALL_TARGET=3D install-strip > TEST_TARGET=3D qtests > GNU_CONFIGURE=3D yes > diff --git a/math/py-theano/Makefile b/math/py-theano/Makefile > index 99c7e6c4c77f..85a928551040 100644 > --- a/math/py-theano/Makefile > +++ b/math/py-theano/Makefile > @@ -2,6 +2,7 @@ > =20 > PORTNAME=3D theano > DISTVERSION=3D 1.0.5 > +PORTREVISION=3D 1 > CATEGORIES=3D math python > MASTER_SITES=3D CHEESESHOP > PKGNAMEPREFIX=3D ${PYTHON_PKGNAMEPREFIX} > @@ -17,7 +18,7 @@ RUN_DEPENDS=3D ${PYNUMPY} \ > ${PYTHON_PKGNAMEPREFIX}scipy>=3D0.8.0:science/py-scipy@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}six>=3D1.9.0:devel/py-six@${PY_FLAVOR} > =20 > -USES=3D compiler:openmp python:3.6+ > +USES=3D python:3.6+ > USE_PYTHON=3D concurrent distutils autoplist > =20 > NO_ARCH=3D yes > diff --git a/math/tmv/Makefile b/math/tmv/Makefile > index 1783cfc1dd68..9ec06912099c 100644 > --- a/math/tmv/Makefile > +++ b/math/tmv/Makefile > @@ -1,7 +1,7 @@ > PORTNAME=3D tmv > DISTVERSIONPREFIX=3D v > DISTVERSION=3D 0.75 > -PORTREVISION=3D 7 > +PORTREVISION=3D 8 > CATEGORIES=3D math > =20 > MAINTAINER=3D yuri@FreeBSD.org > @@ -10,7 +10,7 @@ COMMENT=3D Fast, intuitive linear algebra library for C= ++ > LICENSE=3D BSD2CLAUSE > LICENSE_FILE=3D ${WRKSRC}/TMV_LICENSE > =20 > -USES=3D compiler:openmp gmake blaslapack:netlib localbase > +USES=3D gmake blaslapack:netlib localbase > USE_GITHUB=3D yes > GH_ACCOUNT=3D rmjarvis > USE_LDCONFIG=3D yes > diff --git a/math/viennacl/Makefile b/math/viennacl/Makefile > index 4eaabd71266d..d10341decf3d 100644 > --- a/math/viennacl/Makefile > +++ b/math/viennacl/Makefile > @@ -2,7 +2,7 @@ > =20 > PORTNAME=3D viennacl > PORTVERSION=3D 1.7.1 > -PORTREVISION=3D 5 > +PORTREVISION=3D 6 > CATEGORIES=3D math > MASTER_SITES=3D SF/${PORTNAME}/1.7.x/ > DISTNAME=3D ViennaCL-${PORTVERSION} > @@ -17,6 +17,6 @@ BUILD_DEPENDS=3D ${LOCALBASE}/include/CL/opencl.h:devel= /opencl > LIB_DEPENDS=3D libOpenCL.so:devel/ocl-icd > RUN_DEPENDS=3D ${LOCALBASE}/include/CL/opencl.h:devel/opencl > =20 > -USES=3D cmake compiler:openmp localbase > +USES=3D cmake localbase > =20 > .include <bsd.port.mk> --CGZxlC+rHkLR8gOh Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEycyIeNkkgohzsoorelmbhSCDnJ0FAmFZ8FUACgkQelmbhSCD nJ3mnhAAxn6vleisRb5qWrKSd19J2gtF/ykw9Csec2HLcD45fN5HOgwzZPLonzl+ 19LEyI8oI8ZXjNs+AWsAvwzJkMyV84Hn9ki0S0a8nwBrJdnCWoyRoq6ubFRF4ioM nnbGg5gDFgyScdqOaSh0DbpJwofccaw6z6tV1jh+gPicS9UBZHVdzUU9Q7yVR2wE mTWpA8PLDIsrok27STxUwpkIvw8RVQXfySI8039wxrIg6gzU3jnohlD4JnLXBVKH SHVfIq7/BBc9650fKVBGtUOVWg2Q9Xl8CGWXgpMwnu9h1ftArJOGSvfoRaN97II5 wD1nOWkCuLjnZKL25DHSwLaWX6jx7YWo6g7AEwsFhLjyk9yVlCCyOTs3PxlXletU ZpThUSJJYxrFQ7TtGsjTncOFbdvSSCRx6ZbXA7aXy+SBp91xRCKFUpqh8WZnNAE1 cLk9pffXTvO/iYy0MmsVoZeooK59oujbOGrvugRXwfmRV7/Vo4G1yrjp26rmHrWi d5OObxa++uab6MEhJ1FTRugO+uyKaMMm96nrxg/PYyLXVvEIS2aLocjFcBJ3cL0g hHeN2Hstf1hPu1YzsDKAsSV9u+AdcN0e+H/OPjAdHj1egy+BvarKsoFUZkyK1Kt1 qoFicLADEdElf0OqZByQURKzmU/CtxR+j8PxwDmWLcGIXPA04wo= =AsIx -----END PGP SIGNATURE----- --CGZxlC+rHkLR8gOh--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?YVnwVTtGSchnl4qN>