Page MenuHomeFreeBSD

D25712.id74833.diff
No OneTemporary

D25712.id74833.diff

Index: databases/grass7/Makefile
===================================================================
--- databases/grass7/Makefile
+++ databases/grass7/Makefile
@@ -39,7 +39,7 @@
RUN_DEPENDS= ${PY_NUMPY} \
${PYTHON_SITELIBDIR}/six.py:devel/py-six@${PY_FLAVOR}
-USES= blaslapack compiler:c11 gl gmake gnome iconv \
+USES= blaslapack compiler:features gl gmake gnome iconv \
jpeg perl5 pkgconfig python:3.6+ readline shebangfix xorg
SHEBANG_GLOB= *.py
SHEBANG_LANG= nviz
@@ -65,6 +65,8 @@
--enable-largefile \
--with-wxwidgets=${WX_CONFIG} \
--with-proj-share=${LOCALBASE}/share/proj \
+ --with-proj-includes=${LOCALBASE}/include \
+ --with-proj-libs=${LOCALBASE}/lib \
--with-geos=${LOCALBASE}/bin/geos-config \
--with-gdal=${LOCALBASE}/bin/gdal-config \
--with-pthread=yes \
@@ -135,8 +137,17 @@
PLIST_SUB+= WOSBRK="@comment "
.else
PLIST_SUB+= WOSBRK=""
+.endif
+.if ${ARCH} == "i386" && ${OSVERSION} < 1200000
+# clang 7.x and 8.x do not build properly on 11i386
+LLVM_VER= ${LLVM_DEFAULT}
+CPP= clang-cpp${LLVM_VER}
+CC= clang${LLVM_VER}
+CXX= clang++${LLVM_VER}
+BUILD_DEPENDS+= clang${LLVM_VER}:devel/llvm${LLVM_VER}
.endif
+
.if !defined (GRASS_INST_DIR)
GRASS_INST_DIR= ${PORTNAME}${VER}
.endif
@@ -144,10 +155,6 @@
MANDIRS= ${PREFIX}/grass${VER}/docs/man/man1
post-patch:
-# ${REINPLACE_CMD} -e \
-# 's|-lblas|${BLASLIB}|g ; \
-# s|-llapack|${LAPACKLIB}|g ; \
-# s|g2c|f2c|g' ${WRKSRC}/configure
${REINPLACE_CMD} -e \
's|make -C|$$(MAKE) -C| ; \
/^BINDIR/s|=.*|= $${DESTDIR}$${UNIX_BIN}| ; \

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 2, 2:25 PM (1 h, 8 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29160688
Default Alt Text
D25712.id74833.diff (1 KB)

Event Timeline