mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-24 00:45:52 +00:00
Code Issues Releases Activity

Unbreak build on platforms using libstdc++ after r383466

Browse Source 
Force C++11 mode and fix incompatibility with NULL being
defined as nullptr on FreeBSD.

PR:		199600
Reported by:	pkg-fallout, DPorts
Approved by:	Rainer Hurling <rhurlin@gwdg.de> (maintainer)
This commit is contained in:
Jan Beich 2015-04-22 17:14:59 +00:00
parent 078d57982b
commit 58c735369b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=384500
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
math/saga/Makefile
View File

@ -31,6 +31,7 @@ CFLAGS+= -I${LOCALBASE}/include
GNU_CONFIGURE= yes
LDFLAGS+= -L${LOCALBASE}/lib -lopencv_contrib
USE_LDCONFIG= yes
USE_CXXSTD= c++11
USE_WX= 3.0+
USES= autoreconf compiler:gcc-c++11-lib iconv:wchar_t dos2unix libtool python:2
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}

21
math/saga/files/patch-src__modules__io__io_shapes_las__las_export.cpp Normal file
View File

@ -0,0 +1,21 @@
--- src/modules/io/io_shapes_las/las_export.cpp.orig 2014-01-09 10:24:11 UTC
+++ src/modules/io/io_shapes_las/las_export.cpp
@@ -333,12 +333,12 @@ bool CLAS_Export::On_Execute(void)
y = pPoints->Get_Y(i);
z = pPoints->Get_Z(i);
- x < xmin ? xmin = x : NULL;
- x > xmax ? xmax = x : NULL;
- y < ymin ? ymin = y : NULL;
- y > ymax ? ymax = y : NULL;
- z < zmin ? zmin = z : NULL;
- z > zmax ? zmax = z : NULL;
+ x < xmin ? xmin = x : 0.0;
+ x > xmax ? xmax = x : 0.0;
+ y < ymin ? ymin = y : 0.0;
+ y > ymax ? ymax = y : 0.0;
+ z < zmin ? zmin = z : 0.0;
+ z > zmax ? zmax = z : 0.0;
point.SetCoordinates(x, y, z);