ports/182417: [PATCH] devel/simgear: fix build with clang

Dmitry Marakasov amdmi3 at amdmi3.ru
Thu Sep 26 17:30:01 UTC 2013


>Number:         182417
>Category:       ports
>Synopsis:       [PATCH] devel/simgear: fix build with clang
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Sep 26 17:30:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Dmitry Marakasov
>Release:        FreeBSD 9.1-RELEASE-p4 amd64
>Organization:
>Environment:
System: FreeBSD hades.panopticon 9.1-RELEASE-p4 FreeBSD 9.1-RELEASE-p4 #0 r251956: Tue Jun 18 21:41:37 MSK
>Description:
- Support staging
- Fix build with clang
- Remove unneeded USE_GCC

Port maintainer (martymac at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99_8 (mode: change, diff: SVN)
>How-To-Repeat:
>Fix:

--- simgear-2.10.0.patch begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 328395)
+++ Makefile	(working copy)
@@ -20,7 +20,6 @@
 		osg:${PORTSDIR}/graphics/osg
 
 USE_BZIP2=	yes
-USE_GCC=	any
 USE_XORG=	ice sm x11 xext xi xt xmu
 USE_OPENAL=	al alut
 USE_GL=		gl glu glut
@@ -27,5 +26,4 @@
 USES=		cmake
 CMAKE_ARGS+=	-DJPEG_FACTORY:BOOL=ON
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
Index: files/patch-simgear-misc-gzcontainerfile.cxx
===================================================================
--- files/patch-simgear-misc-gzcontainerfile.cxx	(revision 0)
+++ files/patch-simgear-misc-gzcontainerfile.cxx	(working copy)
@@ -0,0 +1,10 @@
+--- simgear/misc/gzcontainerfile.cxx.orig	2013-01-28 21:02:28.000000000 +0400
++++ simgear/misc/gzcontainerfile.cxx	2013-09-24 21:12:52.827520277 +0400
+@@ -49,6 +49,7 @@
+ #include <simgear/misc/stdint.hxx>
+ 
+ #include <string.h>
++#include <stdlib.h>
+ 
+ using namespace std;
+ using namespace simgear;

Property changes on: files/patch-simgear-misc-gzcontainerfile.cxx
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: files/patch-simgear-scene-sky-cloud.cxx
===================================================================
--- files/patch-simgear-scene-sky-cloud.cxx	(revision 0)
+++ files/patch-simgear-scene-sky-cloud.cxx	(working copy)
@@ -0,0 +1,11 @@
+--- simgear/scene/sky/cloud.cxx.orig	2013-01-28 21:02:28.000000000 +0400
++++ simgear/scene/sky/cloud.cxx	2013-09-24 22:18:51.438519302 +0400
+@@ -736,7 +736,7 @@
+             // this happens, lets just use the last known good course.
+             // This is a hack, and it would probably be better to make
+             // calc_gc_course_dist() more robust.
+-            if ( isnan(course) ) {
++            if ( std::isnan(course) ) {
+                 course = last_course;
+             } else {
+                 last_course = course;

Property changes on: files/patch-simgear-scene-sky-cloud.cxx
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: files/patch-simgear-sound-sample__group.cxx
===================================================================
--- files/patch-simgear-sound-sample__group.cxx	(revision 0)
+++ files/patch-simgear-sound-sample__group.cxx	(working copy)
@@ -0,0 +1,11 @@
+--- simgear/sound/sample_group.cxx.orig	2013-02-18 18:58:14.000000000 +0400
++++ simgear/sound/sample_group.cxx	2013-09-24 22:31:16.203519057 +0400
+@@ -36,7 +36,7 @@
+ using std::string;
+ 
+ bool isNaN(float *v) {
+-   return (isnan(v[0]) || isnan(v[1]) || isnan(v[2]));
++   return (std::isnan(v[0]) || std::isnan(v[1]) || std::isnan(v[2]));
+ }
+ 
+ SGSampleGroup::SGSampleGroup () :

Property changes on: files/patch-simgear-sound-sample__group.cxx
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
--- simgear-2.10.0.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:


More information about the freebsd-ports-bugs mailing list