2025-07-01 21:36 CEST
  

View Issue Details [ Jump to Notes ] [ Issue History ] [ Print ]
IDProjectCategoryView StatusDate SubmittedLast Update
0002768Spring engineGeneralpublic2011-11-24 19:062012-02-25 14:25
ReporterSvenstaro 
Assigned TojK 
PrioritynormalSeverityblockReproducibilityalways
StatusresolvedResolutionfixed 
Product Version84.0 
Target Version85.0Fixed in Version 
Summary0002768: Compilation breaks with Boost 1.48
DescriptionBoost 1.48 overrides some symbols apparently. These patches will fix it (though they are not all tidy yet).
TagsNo tags attached.
Checked infolog.txt for Errors
Attached Files
  • patch file icon boost-148.patch (1,788 bytes) 2011-11-24 19:06 - 
    Only in spring_84.0-sven/: build
diff -ru spring_84.0/rts/lib/assimp/code/StandardShapes.cpp spring_84.0-sven/rts/lib/assimp/code/StandardShapes.cpp
--- spring_84.0/rts/lib/assimp/code/StandardShapes.cpp	2011-11-22 00:21:38.000000000 +0100
+++ spring_84.0-sven/rts/lib/assimp/code/StandardShapes.cpp	2011-11-24 18:36:38.489911988 +0100
@@ -45,8 +45,8 @@
  *  http://geometrictools.com/Documentation/PlatonicSolids.pdf.
  */
 
-#include "lib/streflop/streflop_cond.h"
 #include "AssimpPCH.h"
+#include "lib/streflop/streflop_cond.h"
 #include "StandardShapes.h"
 #include "System/FastMath.h"
 
diff -ru spring_84.0/rts/lib/streflop/FPUSettings.h spring_84.0-sven/rts/lib/streflop/FPUSettings.h
--- spring_84.0/rts/lib/streflop/FPUSettings.h	2011-11-22 00:21:38.000000000 +0100
+++ spring_84.0-sven/rts/lib/streflop/FPUSettings.h	2011-11-24 14:14:23.873825447 +0100
@@ -56,7 +56,7 @@
 // Give warning in case these flags would be defined already, this is indication
 // of potential confusion!
 
-#if defined(FE_INVALID) || defined(FE_DENORMAL) || defined(FE_DIVBYZERO) || defined(FE_OVERFLOW) || defined(FE_UNDERFLOW) || defined(FE_INEXACT) || defined(FE_DOWNWARD) || defined(FE_TONEAREST) || defined(FE_TOWARDZERO) || defined(FE_UPWARD)
+#if defined(FE_INVALID) || defined(FE_DENORMAL) || defined(FE_DIVBYZERO) || defined(FE_OVERFLOW) || defined(FE_UNDERFLOW) || defined(FE_INEXACT) || defined(FE_DOWNWARD) || defined(FE_TONEAREST) || defined(FE_TOWARDZERO) || defined(FE_UPWARD) || defined(FE_DFL_ENV)
 
 #warning STREFLOP: FE_XXX flags were already defined and will be redefined! Check you do not use the system libm.
 #undef FE_INVALID
@@ -71,6 +71,7 @@
 #undef FE_TONEAREST
 #undef FE_TOWARDZERO
 #undef FE_UPWARD
+#undef FE_DFL_ENV
 #endif // defined(FE_INVALID) || ...
    patch file icon boost-148.patch (1,788 bytes) 2011-11-24 19:06 +

-Relationships
related to 0002893resolvedjK Buildbot have a buildslave with latest boost version 
+Relationships

-Notes

~0007694

Svenstaro (reporter)

2011-11-24 23:15

 This patch is not complete, it breaks a little further down the compilation. It's a start, however.

~0007695

hoijui (reporter)

2011-11-24 23:52

Last edited: 2011-12-05 00:17

 i put this patch into a commit on:
https://github.com/hoijui/spring/tree/boost_148_fixes

~0007832

Svenstaro (reporter)

2011-12-06 08:15

 FYI, since I had to act fast I didn't mind an ugly patch. If you want to look at it, it is here: http://projects.archlinux.org/svntogit/community.git/commit/trunk?h=packages/spring&id=567547438c9677816288a17840019c8dfdc69084

~0007983

Svenstaro (reporter)

2011-12-22 17:44

 Still breaks in spring 85.0

~0008298

SirMaverick (reporter)

2012-02-18 00:46

Last edited: 2012-02-18 00:46

 > i put this patch into a commit on:

Still breaks compiling SpringApp.cpp. It compiles after moving "#include "System/Platform/CmdLineParams.h"" to the top.

~0008331

jK (developer)

2012-02-25 03:50

 https://github.com/spring/spring/commit/d5bb3ca97ed2c4631c40945f446ee8088a7714d7

~0008332

SirMaverick (reporter)

2012-02-25 05:10

 Compiles now.
+Notes

-Issue History
Date Modified Username Field Change
2011-11-24 19:06 Svenstaro New Issue
2011-11-24 19:06 Svenstaro File Added: boost-148.patch
2011-11-24 23:13 hoijui Status new => assigned
2011-11-24 23:13 hoijui Assigned To => hoijui
2011-11-24 23:15 Svenstaro Note Added: 0007694
2011-11-24 23:28 hoijui Assigned To hoijui =>
2011-11-24 23:52 hoijui Note Added: 0007695
2011-11-24 23:52 hoijui Status assigned => new
2011-12-05 00:17 abma Note Edited: 0007695
2011-12-06 08:15 Svenstaro Note Added: 0007832
2011-12-12 18:39 hoijui Target Version => 85.0
2011-12-12 18:39 hoijui Description Updated
2011-12-22 17:44 Svenstaro Note Added: 0007983
2012-01-02 17:17 tvo Relationship added related to 0002893
2012-02-18 00:46 SirMaverick Note Added: 0008298
2012-02-18 00:46 SirMaverick Note Edited: 0008298
2012-02-25 03:50 jK Note Added: 0008331
2012-02-25 03:50 jK Assigned To => jK
2012-02-25 03:50 jK Status new => feedback
2012-02-25 05:10 SirMaverick Note Added: 0008332
2012-02-25 14:25 jK Status feedback => resolved
2012-02-25 14:25 jK Resolution open => fixed
+Issue History