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

Collapse All | Expand All

(-)Makefile (-4 / +4 lines)
Lines 26-32 Link Here
26
# - Create a meta-port for the recommended packages
26
# - Create a meta-port for the recommended packages
27
27
28
USES=		compiler:c++11-lang gmake iconv libtool localbase pathfix \
28
USES=		compiler:c++11-lang gmake iconv libtool localbase pathfix \
29
		perl5 readline:port
29
		perl5 readline:port xorg
30
USE_LDCONFIG=	${PREFIX}/lib/R/lib
30
USE_LDCONFIG=	${PREFIX}/lib/R/lib
31
USE_PERL5=	build
31
USE_PERL5=	build
32
32
Lines 125-135 Link Here
125
125
126
LIBVER=		${PORTVERSION:R}
126
LIBVER=		${PORTVERSION:R}
127
127
128
.include <bsd.port.options.mk>
128
.include <bsd.port.pre.mk>
129
129
130
# LLVM, which gets pulled in with FLANG, provides libomp.  So, only depend on
130
# LLVM, which gets pulled in with FLANG, provides libomp.  So, only depend on
131
# devel/openmp when GFORTRAN and OPENMP are on.
131
# devel/openmp when GFORTRAN and OPENMP are on.
132
.if ! ${PORT_OPTIONS:MFLANG} && ${PORT_OPTIONS:MOPENMP}
132
.if ! ${PORT_OPTIONS:MFLANG} && ${PORT_OPTIONS:MOPENMP} && ${CHOSEN_COMPILER_TYPE} == clang
133
LIB_DEPENDS+=	libomp.so:devel/openmp
133
LIB_DEPENDS+=	libomp.so:devel/openmp
134
.endif
134
.endif
135
135
Lines 148-151 Link Here
148
	@${REINPLACE_CMD} -e "s| -lR| -lR ${BLASLIB}|" \
148
	@${REINPLACE_CMD} -e "s| -lR| -lR ${BLASLIB}|" \
149
		${STAGEDIR}${PREFIX}/libdata/pkgconfig/libR.pc
149
		${STAGEDIR}${PREFIX}/libdata/pkgconfig/libR.pc
150
150
151
.include <bsd.port.mk>
151
.include <bsd.port.post.mk>

Return to bug 240279