View | Details | Raw Unified | Return to bug 240279 | Differences between
and this patch

Collapse All | Expand All

(-)b/math/R/Makefile (-11 / +27 lines)
Lines 38-54 GNU_CONFIGURE= yes Link Here
38
INSTALL_TARGET=	install-strip
38
INSTALL_TARGET=	install-strip
39
PLIST_SUB=	LIBVER=${LIBVER}
39
PLIST_SUB=	LIBVER=${LIBVER}
40
40
41
OPTIONS_DEFINE=		FLANG ICU INFO LDOUBLE LETTER MEMPROF NLS OPENMP RPROF X11
41
OPTIONS_DEFINE=		ICU INFO LDOUBLE LETTER MEMPROF NLS RPROF X11
42
OPTIONS_EXCLUDE_aarch64=	FLANG OPENMP
42
OPTIONS_DEFINE_amd64=	FLANG OPENMP
43
OPTIONS_EXCLUDE_armv6=	FLANG OPENMP
43
OPTIONS_DEFINE_i386=	OPENMP
44
OPTIONS_EXCLUDE_armv7=	FLANG OPENMP
45
OPTIONS_EXCLUDE_i386=	FLANG
46
OPTIONS_GROUP=		NEEDX11
44
OPTIONS_GROUP=		NEEDX11
47
OPTIONS_GROUP_NEEDX11=	GHOSTSCRIPT JPEG CAIROPANGO PNG TCLTK TEXDOCS TIFF
45
OPTIONS_GROUP_NEEDX11=	GHOSTSCRIPT JPEG CAIROPANGO PNG TCLTK TEXDOCS TIFF
48
OPTIONS_SINGLE=		BLAS
46
OPTIONS_SINGLE=		BLAS
49
OPTIONS_SINGLE_BLAS=	ATLAS OPENBLAS NETLIB RBLAS
47
OPTIONS_SINGLE_BLAS=	ATLAS OPENBLAS NETLIB RBLAS
50
OPTIONS_DEFAULT=	CAIROPANGO GHOSTSCRIPT ICU INFO JPEG LDOUBLE OPENMP PNG \
48
OPTIONS_DEFAULT=	CAIROPANGO GHOSTSCRIPT ICU INFO JPEG LDOUBLE PNG RBLAS \
51
			RBLAS RPROF TCLTK TIFF X11
49
			RPROF TCLTK TIFF X11
50
OPTIONS_DEFAULT_amd64=	OPENMP
51
OPTIONS_DEFAULT_i386=	OPENMP
52
OPTIONS_SUB=		YES
52
OPTIONS_SUB=		YES
53
53
54
ATLAS_DESC=		ATLAS BLAS implementation
54
ATLAS_DESC=		ATLAS BLAS implementation
Lines 75-82 CAIROPANGO_IMPLIES= X11 Link Here
75
CAIROPANGO_CONFIGURE_WITH=	cairo
75
CAIROPANGO_CONFIGURE_WITH=	cairo
76
CAIROPANGO_USES=	gettext gnome jpeg pkgconfig
76
CAIROPANGO_USES=	gettext gnome jpeg pkgconfig
77
CAIROPANGO_USE=		GNOME=pango,cairo
77
CAIROPANGO_USE=		GNOME=pango,cairo
78
FLANG_LIB_DEPENDS=	libpgmath.so:math/libpgmath
78
FLANG_USES=		fortran:flang
79
FLANG_USES=		fortran:flang
79
FLANG_USES_OFF=		fortran
80
FLANG_PREVENTS=		ATLAS OPENBLAS NETLIB
80
FLANG_PREVENTS=		ATLAS OPENBLAS NETLIB
81
GHOSTSCRIPT_IMPLIES=	X11
81
GHOSTSCRIPT_IMPLIES=	X11
82
GHOSTSCRIPT_USES=	ghostscript
82
GHOSTSCRIPT_USES=	ghostscript
Lines 121-137 TIFF_IMPLIES= X11 Link Here
121
TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
121
TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
122
TIFF_CONFIGURE_WITH=	libtiff
122
TIFF_CONFIGURE_WITH=	libtiff
123
X11_CONFIGURE_WITH=	x
123
X11_CONFIGURE_WITH=	x
124
X11_USES=		xorg
124
X11_USE=		xorg=ice,sm,x11,xext,xmu,xscrnsaver,xt
125
X11_USE=		xorg=ice,sm,x11,xext,xmu,xscrnsaver,xt
125
126
126
LIBVER=		${PORTVERSION:R}
127
LIBVER=		${PORTVERSION:R}
127
128
128
.include <bsd.port.options.mk>
129
.include <bsd.port.options.mk>
129
130
130
# LLVM, which gets pulled in with FLANG, provides libomp.  So, only depend on
131
# libomp is provided by
131
# devel/openmp when GFORTRAN and OPENMP are on.
132
#  - LLVM, which gets pulled in with FLANG
132
.if ! ${PORT_OPTIONS:MFLANG} && ${PORT_OPTIONS:MOPENMP}
133
#  - gcc
134
#
135
# So, *must* only depend on devel/openmp when
136
#   - the OPENMP knob is on
137
#   - FLANG is off (guaranteed to be off for all archs except amd64)
138
#   - clang is the C compiler.
139
#
140
# But, we cannot modify LIB_DEPENDS after CHOSEN_COMPILER_TYPE is defined, so
141
# for now, limit the OPENMP knob for i386 and amd64 where clang is the default
142
# compiler.
143
#
144
# This will be moot after 12.1 when openmp will be in base.
145
.if ! ${PORT_OPTIONS:MFLANG}
146
USES+=	fortran
147
.if ${PORT_OPTIONS:MOPENMP}
133
LIB_DEPENDS+=	libomp.so:devel/openmp
148
LIB_DEPENDS+=	libomp.so:devel/openmp
134
.endif
149
.endif
150
.endif
135
151
136
post-patch:
152
post-patch:
137
	@${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|g" ${WRKSRC}/configure
153
	@${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|g" ${WRKSRC}/configure

Return to bug 240279