From owner-svn-ports-all@freebsd.org Sat Aug 29 07:45:42 2020 Return-Path: Delivered-To: svn-ports-all@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 2B1393D09EC; Sat, 29 Aug 2020 07:45:42 +0000 (UTC) (envelope-from lbartoletti@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4BdpRV0Hx7z4524; Sat, 29 Aug 2020 07:45:42 +0000 (UTC) (envelope-from lbartoletti@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 E1C7C227A4; Sat, 29 Aug 2020 07:45:41 +0000 (UTC) (envelope-from lbartoletti@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07T7jfUC030684; Sat, 29 Aug 2020 07:45:41 GMT (envelope-from lbartoletti@FreeBSD.org) Received: (from lbartoletti@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07T7jfQn030683; Sat, 29 Aug 2020 07:45:41 GMT (envelope-from lbartoletti@FreeBSD.org) Message-Id: <202008290745.07T7jfQn030683@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lbartoletti set sender to lbartoletti@FreeBSD.org using -f From: =?UTF-8?Q?Lo=c3=afc_Bartoletti?= Date: Sat, 29 Aug 2020 07:45:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r546879 - head/databases/grass7 X-SVN-Group: ports-head X-SVN-Commit-Author: lbartoletti X-SVN-Commit-Paths: head/databases/grass7 X-SVN-Commit-Revision: 546879 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Aug 2020 07:45:42 -0000 Author: lbartoletti Date: Sat Aug 29 07:45:41 2020 New Revision: 546879 URL: https://svnweb.freebsd.org/changeset/ports/546879 Log: databases/grass7: fix build on 11i386 When I added the option for compiling with openmp, like other ports, I don't use compiler:openmp but directly the default compiler because it works just as well. However, on FreeBSD 11, grass only builds well with LLVM90. While I'm here I added with-proj-[includes|libs] to be more thorough Approved by: tcberner MFH: 2020Q3 Differential Revision: https://reviews.freebsd.org/D25712 Modified: head/databases/grass7/Makefile Modified: head/databases/grass7/Makefile ============================================================================== --- head/databases/grass7/Makefile Sat Aug 29 07:43:05 2020 (r546878) +++ head/databases/grass7/Makefile Sat Aug 29 07:45:41 2020 (r546879) @@ -39,7 +39,7 @@ LIB_DEPENDS= libgdal.so:graphics/gdal \ 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 @@ CONFIGURE_ARGS= --with-includes=${LOCALBASE}/include \ --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,16 @@ ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd 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 +CPP= clang-cpp${LLVM_DEFAULT} +CC= clang${LLVM_DEFAULT} +CXX= clang++${LLVM_DEFAULT} +BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} .endif + .if !defined (GRASS_INST_DIR) GRASS_INST_DIR= ${PORTNAME}${VER} .endif @@ -144,10 +154,6 @@ GRASS_INST_DIR= ${PORTNAME}${VER} 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}| ; \