Bug 184568 - math/octave-forge-fl-core : fix build with gcc47
Summary: math/octave-forge-fl-core : fix build with gcc47
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Stephen Montgomery-Smith
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-12-07 17:00 UTC by Christoph Moench-Tegeder
Modified: 2013-12-07 23:10 UTC (History)
0 users

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Christoph Moench-Tegeder freebsd_committer freebsd_triage 2013-12-07 17:00:00 UTC
Hi,

in an effort towards upgrading lang/gcc to gcc 4.7, I'm helping gerald@
in making ports gcc47-safe.
Please consider the following patch to your port. If you approve of the
patch, gerald@ has offered his help in commiting it.
If you're commiting yourself or have someone else commit this (or
another patch to the same effect), can you please add an additional
reference to ports/183342 in the commit message?
In my test environment, the port built successfully with lang/gcc47.

Fix: GCC 4.7 does not include unistd.h on it's own anymore. I added DOS2UNIX
for easier patching.


# use DOS2UNIX for easier patching and add unistd.h
$ svn status
M       Makefile
A       files
A       files/patch-fl_compose.cc



Regards,
Christoph--InLJ3bWm99kGYL5hG82oxMRxwgASomfK7Ktbe6BdQMAQzERx
Content-Type: text/plain; name="file.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="file.diff"

Index: Makefile
===================================================================
--- Makefile	(revision 334033)
+++ Makefile	(working copy)
@@ -14,6 +14,7 @@
 OCTSRC=		${OCTAVE_PKGNAME}
 
 WRKSRC=		${WRKDIR}/${OCTSRC}/src
+USE_DOS2UNIX=	yes
 
 NO_STAGE=	yes
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
Index: files/patch-fl_compose.cc
===================================================================
--- files/patch-fl_compose.cc	(revision 0)
+++ files/patch-fl_compose.cc	(working copy)
@@ -0,0 +1,10 @@
+--- fl_compose.cc.orig	2013-11-16 22:48:40.000000000 +0100
++++ fl_compose.cc	2013-11-16 22:48:58.000000000 +0100
+@@ -20,6 +20,7 @@
+ 
+ #include <octave/oct.h>
+ #include <octave/parse.h>
++#include <unistd.h>
+ #include <pthread.h>    
+ 
+ #define HELP \
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-12-07 17:00:08 UTC
Responsible Changed
From-To: freebsd-ports-bugs->stephen

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 dfilter service freebsd_committer freebsd_triage 2013-12-07 19:23:14 UTC
Author: stephen
Date: Sat Dec  7 19:23:05 2013
New Revision: 335843
URL: http://svnweb.freebsd.org/changeset/ports/335843

Log:
  - Add patch to make compatible with gcc47.
  
  PR:		ports/184568
  Submitted by:	Christoph Moench-Tegeder <cmt@burggraben.net>
  Reference:	ports/183342

Added:
  head/math/octave-forge-fl-core/files/
  head/math/octave-forge-fl-core/files/patch-fl_compose.cc   (contents, props changed)
Modified:
  head/math/octave-forge-fl-core/Makefile

Modified: head/math/octave-forge-fl-core/Makefile
==============================================================================
--- head/math/octave-forge-fl-core/Makefile	Sat Dec  7 19:01:36 2013	(r335842)
+++ head/math/octave-forge-fl-core/Makefile	Sat Dec  7 19:23:05 2013	(r335843)
@@ -14,6 +14,7 @@ COMMENT=	Octave-forge package ${OCTAVE_P
 OCTSRC=		${OCTAVE_PKGNAME}
 
 WRKSRC=		${WRKDIR}/${OCTSRC}/src
+USE_DOS2UNIX=	yes
 
 NO_STAGE=	yes
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"

Added: head/math/octave-forge-fl-core/files/patch-fl_compose.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/octave-forge-fl-core/files/patch-fl_compose.cc	Sat Dec  7 19:23:05 2013	(r335843)
@@ -0,0 +1,10 @@
+--- fl_compose.cc.orig	2013-11-16 22:48:40.000000000 +0100
++++ fl_compose.cc	2013-11-16 22:48:58.000000000 +0100
+@@ -20,6 +20,7 @@
+ 
+ #include <octave/oct.h>
+ #include <octave/parse.h>
++#include <unistd.h>
+ #include <pthread.h>    
+ 
+ #define HELP \
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 3 Stephen Montgomery-Smith freebsd_committer freebsd_triage 2013-12-07 19:23:45 UTC
State Changed
From-To: open->closed

Committed.  Thank you very much for doing this.
Comment 4 gerald 2013-12-07 23:00:08 UTC
Apologies, the PR to reference should have been 182136.

Gerald