Date: Tue, 6 May 2014 06:42:53 GMT From: Rainer Hurling <rhurlin@gwdg.de> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/189389: [maintainer][patch] math/saga: fix build after r353029 Message-ID: <201405060642.s466grIL072296@cgiserv.freebsd.org> Resent-Message-ID: <201405060650.s466o0ii099343@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 189389 >Category: ports >Synopsis: [maintainer][patch] math/saga: fix build after r353029 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue May 06 06:50:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Rainer Hurling >Release: 11.0-CURRENT amd64 (clang) >Organization: >Environment: FreeBSD xxx.xxx.xxx 11.0-CURRENT FreeBSD 11.0-CURRENT #0 r265310: Sun May 4 08:39:23 CEST 2014 xxx@xxx.xxx.xxx:/usr/obj/usr/src/sys/XXX amd64 >Description: After 'fixing unixODBC vs libiodbc conflicts' by bapt@ [1], math/saga does not build anymore. It tries to find include/sql.h from databases/libiodbc, which does not exist any more. As a quick fix I changed the dependency from databases/libiodbc to databases/unixODBC. This builds and works fine, but on some boxes it now could be necessary to change the configuration file for odbc connections. As I am here, also change to 'USES=compiler:gcc-c++11-lib' to simplify the makefile. [1] http://svnweb.freebsd.org/ports?view=revision&revision=353029 >How-To-Repeat: Try to build math/saga. >Fix: Patch attached with submission follows: --- saga.orig/Makefile 2014-05-05 21:47:54.000000000 +0200 +++ saga/Makefile 2014-05-06 07:44:10.000000000 +0200 @@ -3,7 +3,7 @@ PORTNAME= saga PORTVERSION= 2.1.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math MASTER_SITES= SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]*$//}/SAGA%20${PORTVERSION} DISTNAME= ${PORTNAME}_${PORTVERSION} @@ -18,7 +18,7 @@ libgdal.so:${PORTSDIR}/graphics/gdal \ libjasper.so:${PORTSDIR}/graphics/jasper \ libtiff.so:${PORTSDIR}/graphics/tiff \ - libiodbc.so:${PORTSDIR}/databases/libiodbc \ + libodbc.so:${PORTSDIR}/databases/unixODBC \ liblas.so:${PORTSDIR}/devel/liblas \ libopencv_ml.so:${PORTSDIR}/graphics/opencv RUN_DEPENDS:= ${BUILD_DEPENDS} @@ -33,7 +33,7 @@ USE_PYTHON= 2 USE_LDCONFIG= yes USE_WX= 3.0 -USES= compiler:features iconv:wchar_t dos2unix libtool +USES= compiler:gcc-c++11-lib iconv:wchar_t dos2unix WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} WX_UNICODE= yes @@ -64,15 +64,6 @@ .include <bsd.port.pre.mk> -# CLANG is not able to handle neither Fortran nor OpenMP -USE_GCC= yes -.if ${COMPILER_FEATURES:Mlibc++} -BUILD_DEPENDS+= ${LOCALBASE}/lib/c++/libstdc++.so:${PORTSDIR}/devel/libc++ -CFLAGS+= -isystem ${LOCALBASE}/include/c++/v1 -CXXFLAGS+= -nostdinc++ -isystem ${LOCALBASE}/include/c++/v1 -LDFLAGS+= -L${LOCALBASE}/lib/c++ -.endif - post-patch: @${REINPLACE_CMD} -e's|wx-config |${WX_CONFIG} |g' \ ${WRKSRC}/configure \ >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405060642.s466grIL072296>