stlport

[Stephen Montgomery-Smith]

Stephen Montgomery-Smith wrote:
> Thierry Thomas wrote:
>> Le Lun 19 nov 07 à  7:28:48 +0100, Thierry Thomas <thierry at FreeBSD.org>
>>  écrivait :
>>> Le Lun 19 nov 07 à  3:56:50 +0100, Stephen Montgomery-Smith 
>>> <stephen at math.missouri.edu>
>>>  écrivait :
>>>  
>>>> Is anyone working on this?  If not, would you guys be kind enough to 
>>>> make my patch more proper?
>>> I'm working on a patch to upgrade it to the latest STLport-5.1.4 (from
>>> <http://www.stlport.org/> ).
>>
>> If you want to test it, my patch is available at
>> <http://people.freebsd.org/~thierry/ports/stlport.diff>.
>>
>> It does not seem bad on i386, but there is a problem on amd64: it builds
>> and installs fine, but the regression tests eat all the memory! (If no
>> solution is found, I shall mark it broken on != i386).
>>
>> Regards,
> 
> It didn't build at all on my system.  I am sure it is a problem with 
> stlport/config/stl_gcc.h.
> 
> What version of FreeBSD are you using?  Did you build it with gcc or icc?

Adding this attached file to stlport/files made it work for my system.

-------------- next part --------------
--- stlport/stl/config/_gcc.h.orig	2007-11-20 18:33:19.000000000 -0600
+++ stlport/stl/config/_gcc.h	2007-11-20 18:34:45.000000000 -0600
@@ -352,9 +352,9 @@
 /*
 * Before version 3.4.0 the 0 patch level was not part of the include path:
 */
-#      elif defined (__GNUC_PATCHLEVEL__) && ((__GNUC_PATCHLEVEL__ > 0) || \
+#      elif (defined (__GNUC_PATCHLEVEL__) && ((__GNUC_PATCHLEVEL__ > 0) || \
                                               (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || \
-                                              (__GNUC__ > 3))
+                                              (__GNUC__ > 3))) && !defined( __FreeBSD__ )
 #        define _STLP_NATIVE_INCLUDE_PATH ../__GNUC__.__GNUC_MINOR__.__GNUC_PATCHLEVEL__
 #      else
 #        define _STLP_NATIVE_INCLUDE_PATH ../__GNUC__.__GNUC_MINOR__