Bug 184577

Summary: x11-toolkits/gigi : fix build with gcc47
Product: Ports & Packages Reporter: Christoph Moench-Tegeder <cmt>
Component: Individual Port(s)Assignee: Oliver Lehmann <oliver>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   

Description Christoph Moench-Tegeder freebsd_committer freebsd_triage 2013-12-07 17:10:01 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: The GCC feature detection in gigi only kew about gcc 4.6, I
extended it to 4.7.

# extend gcc feature detection by incrementing the version number
$ svn status
A       files/patch-GG-adobe-cmath.hpp



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

Index: files/patch-GG-adobe-cmath.hpp
===================================================================
--- files/patch-GG-adobe-cmath.hpp	(revision 0)
+++ files/patch-GG-adobe-cmath.hpp	(working copy)
@@ -0,0 +1,11 @@
+--- GG/adobe/cmath.hpp.orig	2013-11-16 14:39:11.000000000 +0100
++++ GG/adobe/cmath.hpp	2013-11-16 14:39:40.000000000 +0100
+@@ -37,7 +37,7 @@
+ 
+ #define ADOBE_HAS_CPP_CMATH 
+ 
+-#elif ((__GNUC__ == 4) && (__GNUC_MINOR__ <= 6))
++#elif ((__GNUC__ == 4) && (__GNUC_MINOR__ <= 7))
+ /*
+     The currently supported version of GNUC has C99 extensions in math.h. But no TR1 extensions.
+ */
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-12-07 17:10:43 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->oliver

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 gerald 2013-12-08 08:11:07 UTC 
Instead of changing from "__GNUC_MINOR__ <= 6" to 7, can this part
of the check just be removed?  

It is just annoying and going to cause a problem with the next 
update, from GCC 4.7 to 4.8 then.  At that point in time we'll
do a full -exp run anyway and catch _should_ there be any problems.

And, apologies, that other PR to refer to should have been 182136.
My mistake for providing the wrong number to Christoph.  So, when
committing this, can you please refer to both 182136 and 184577?

Alternately, as Christoph said, I'll be happy to commit on your
behalf if approved.

Thanks,
Gerald
Comment 3 dfilter service freebsd_committer freebsd_triage 2013-12-08 18:50:58 UTC 
Author: oliver
Date: Sun Dec  8 18:50:51 2013
New Revision: 335919
URL: http://svnweb.freebsd.org/changeset/ports/335919

Log:
  remove GCC version check to support GCC versions 4.7 and up
  
  PR:		184577, 183342
  Submitted by:	Christoph Moench-Tegeder <cmt@burggraben.net>

Added:
  head/x11-toolkits/gigi/files/patch-GG-adobe-cmath.hpp   (contents, props changed)

Added: head/x11-toolkits/gigi/files/patch-GG-adobe-cmath.hpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-toolkits/gigi/files/patch-GG-adobe-cmath.hpp	Sun Dec  8 18:50:51 2013	(r335919)
@@ -0,0 +1,24 @@
+--- GG/adobe/cmath.hpp.orig	2011-08-29 15:14:45.000000000 +0200
++++ GG/adobe/cmath.hpp	2013-12-08 12:40:51.000000000 +0100
+@@ -31,21 +31,7 @@
+ #define ADOBE_HAS_C99_STD_MATH_H
+ 
+ #elif defined(__GNUC__)
+-
+-// Guessing at gcc 3 support
+-#if  (__GNUC__ == 3) && (__GNUC_MINOR__ > 2)
+-
+-#define ADOBE_HAS_CPP_CMATH 
+-
+-#elif ((__GNUC__ == 4) && (__GNUC_MINOR__ <= 6))
+-/*
+-    The currently supported version of GNUC has C99 extensions in math.h. But no TR1 extensions.
+-*/
+ #define ADOBE_HAS_C99_MATH_H
+- 
+-#else
+-#error "Unknown GCC compiler configuration for cmath (last known version is 4.0.1)."
+-#endif
+ 
+ #elif defined(_MSC_VER)
+ 
_______________________________________________
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 4 Oliver Lehmann freebsd_committer freebsd_triage 2013-12-08 18:51:21 UTC 
State Changed
From-To: open->closed

Committed, Thanks!