From owner-svn-ports-head@freebsd.org Thu Sep 19 19:55:45 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 42DFF12D08B; Thu, 19 Sep 2019 19:55:45 +0000 (UTC) (envelope-from jrm@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46Z6z512zwz4Cvf; Thu, 19 Sep 2019 19:55:45 +0000 (UTC) (envelope-from jrm@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 043EB1A74A; Thu, 19 Sep 2019 19:55:45 +0000 (UTC) (envelope-from jrm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x8JJti47002979; Thu, 19 Sep 2019 19:55:44 GMT (envelope-from jrm@FreeBSD.org) Received: (from jrm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x8JJti4R002978; Thu, 19 Sep 2019 19:55:44 GMT (envelope-from jrm@FreeBSD.org) Message-Id: <201909191955.x8JJti4R002978@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jrm set sender to jrm@FreeBSD.org using -f From: Joseph Mingrone Date: Thu, 19 Sep 2019 19:55:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r512371 - head/math/R X-SVN-Group: ports-head X-SVN-Commit-Author: jrm X-SVN-Commit-Paths: head/math/R X-SVN-Commit-Revision: 512371 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Sep 2019 19:55:45 -0000 Author: jrm Date: Thu Sep 19 19:55:44 2019 New Revision: 512371 URL: https://svnweb.freebsd.org/changeset/ports/512371 Log: math/R: Fix dependency condition for devel/openmp libomp is provided by - LLVM, which gets pulled in with FLANG - gcc So, we *must* only depend on devel/openmp when - the OPENMP knob is on - FLANG is off (guaranteed to be off for all archs except amd64) - clang is the C compiler. But, we cannot modify LIB_DEPENDS after CHOSEN_COMPILER_TYPE is defined, so for now, limit the OPENMP knob for i386 and amd64 where clang is the default compiler. This will be moot after 12.1 when openmp will be in base. PR: 240279 Reported by: pkubaj Reviewed by: pkubaj Modified: head/math/R/Makefile (contents, props changed) Modified: head/math/R/Makefile ============================================================================== --- head/math/R/Makefile Thu Sep 19 19:43:47 2019 (r512370) +++ head/math/R/Makefile Thu Sep 19 19:55:44 2019 (r512371) @@ -38,17 +38,17 @@ GNU_CONFIGURE= yes INSTALL_TARGET= install-strip PLIST_SUB= LIBVER=${LIBVER} -OPTIONS_DEFINE= FLANG ICU INFO LDOUBLE LETTER MEMPROF NLS OPENMP RPROF X11 -OPTIONS_EXCLUDE_aarch64= FLANG OPENMP -OPTIONS_EXCLUDE_armv6= FLANG OPENMP -OPTIONS_EXCLUDE_armv7= FLANG OPENMP -OPTIONS_EXCLUDE_i386= FLANG +OPTIONS_DEFINE= ICU INFO LDOUBLE LETTER MEMPROF NLS RPROF X11 +OPTIONS_DEFINE_amd64= FLANG OPENMP +OPTIONS_DEFINE_i386= OPENMP OPTIONS_GROUP= NEEDX11 OPTIONS_GROUP_NEEDX11= GHOSTSCRIPT JPEG CAIROPANGO PNG TCLTK TEXDOCS TIFF OPTIONS_SINGLE= BLAS OPTIONS_SINGLE_BLAS= ATLAS OPENBLAS NETLIB RBLAS -OPTIONS_DEFAULT= CAIROPANGO GHOSTSCRIPT ICU INFO JPEG LDOUBLE OPENMP PNG \ - RBLAS RPROF TCLTK TIFF X11 +OPTIONS_DEFAULT= CAIROPANGO GHOSTSCRIPT ICU INFO JPEG LDOUBLE PNG RBLAS \ + RPROF TCLTK TIFF X11 +OPTIONS_DEFAULT_amd64= OPENMP +OPTIONS_DEFAULT_i386= OPENMP OPTIONS_SUB= YES ATLAS_DESC= ATLAS BLAS implementation @@ -75,8 +75,8 @@ CAIROPANGO_IMPLIES= X11 CAIROPANGO_CONFIGURE_WITH= cairo CAIROPANGO_USES= gettext gnome jpeg pkgconfig CAIROPANGO_USE= GNOME=pango,cairo +FLANG_LIB_DEPENDS= libpgmath.so:math/libpgmath FLANG_USES= fortran:flang -FLANG_USES_OFF= fortran FLANG_PREVENTS= ATLAS OPENBLAS NETLIB GHOSTSCRIPT_IMPLIES= X11 GHOSTSCRIPT_USES= ghostscript @@ -121,16 +121,32 @@ TIFF_IMPLIES= X11 TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff TIFF_CONFIGURE_WITH= libtiff X11_CONFIGURE_WITH= x +X11_USES= xorg X11_USE= xorg=ice,sm,x11,xext,xmu,xscrnsaver,xt LIBVER= ${PORTVERSION:R} .include -# LLVM, which gets pulled in with FLANG, provides libomp. So, only depend on -# devel/openmp when GFORTRAN and OPENMP are on. -.if ! ${PORT_OPTIONS:MFLANG} && ${PORT_OPTIONS:MOPENMP} +# libomp is provided by +# - LLVM, which gets pulled in with FLANG +# - gcc +# +# So, *must* only depend on devel/openmp when +# - the OPENMP knob is on +# - FLANG is off (guaranteed to be off for all archs except amd64) +# - clang is the C compiler. +# +# But, we cannot modify LIB_DEPENDS after CHOSEN_COMPILER_TYPE is defined, so +# for now, limit the OPENMP knob for i386 and amd64 where clang is the default +# compiler. +# +# This will be moot after 12.1 when openmp will be in base. +.if ! ${PORT_OPTIONS:MFLANG} +USES+= fortran +.if ${PORT_OPTIONS:MOPENMP} LIB_DEPENDS+= libomp.so:devel/openmp +.endif .endif post-patch: