Alec Leamas 1575355
asl-fedora-flags
Alec Leamas 1575355
Alec Leamas 1575355
From: Alec Leamas <leamas.alec@gmail.com>
Alec Leamas 1575355
Alec Leamas 1575355
Fix fedora compilation flags in jamroot.jam
Alec Leamas 1575355
---
Alec Leamas 1575355
Alec Leamas 1575355
 adobe_source_libraries/jamroot.jam |   26 ++++++++++----------------
Alec Leamas 1575355
 1 files changed, 10 insertions(+), 16 deletions(-)
Alec Leamas 1575355
Alec Leamas 1575355
Alec Leamas 1575355
diff --git a/jamroot.jam b/adobe_source_libraries/jamroot.jam
Alec Leamas 1575355
index 8c7b593..dfd88c8 100644
Alec Leamas 1575355
--- a/jamroot.jam
Alec Leamas 1575355
+++ b/jamroot.jam
Alec Leamas 1575355
@@ -46,6 +46,7 @@ adobe_requirements =
Alec Leamas 1575355
     <toolset>msvc:<define>_WIN32_WINNT=0x400
Alec Leamas 1575355
     <toolset>darwin:<cxxflags>"-Werror -Wall -Wno-trigraphs -Wreturn-type -Wnon-virtual-dtor -Woverloaded-virtual -Wformat -Wmissing-braces -Wparentheses -Wswitch -Wunused-function -Wunused-label -Wunused-parameter -Wunused-variable -Wunused-value -Wunknown-pragmas -Wsign-compare"
Alec Leamas 1575355
     <toolset>darwin:<linkflags>"-Xlinker -Y -Xlinker 5"
Alec Leamas 1575355
+    <toolset>gcc,<variant>release:<cxxflags>"-fPIC  @optflags@ -fpermissive -Wno-long-long -Wno-strict-aliasing -Wno-trigraphs -Wnon-virtual-dtor -Woverloaded-virtual -Wunused-parameter -Wno-unused-variable  -Wunknown-pragmas -Wsign-compare -Wno-parentheses"
Alec Leamas 1575355
     <toolset>gcc,<variant>debug:<cxxflags>"-Werror -Wall -Wno-trigraphs -Wreturn-type -Wnon-virtual-dtor -Woverloaded-virtual -Wformat -Wmissing-braces -Wparentheses -Wswitch -Wunused-function -Wunused-label -Wunused-parameter -Wunused-variable -Wunused-value -Wunknown-pragmas -Wsign-compare -Wno-parentheses"
Alec Leamas 1575355
 #    <toolset>gcc-4.5.0:<define>_GLIBCXX_USE_C99_MATH_TR1 # apparent problems using this without using other tr1 libs
Alec Leamas 1575355
     <toolset>gcc-4.5.0:<define>__GXX_EXPERIMENTAL_CXX0X__
Alec Leamas 1575355
@@ -63,8 +64,6 @@ asl_requirements =
Alec Leamas 1575355
    $(tbb_requirements)
Alec Leamas 1575355
    <include>.
Alec Leamas 1575355
    <toolset>gcc:<define>NOMINMAX
Alec Leamas 1575355
-   <toolset>gcc:<architecture>x86
Alec Leamas 1575355
-   <toolset>gcc,<threading>multi:<instruction-set>i486
Alec Leamas 1575355
    <toolset>msvc:<cxxflags>"-DUNICODE -D_UNICODE"
Alec Leamas 1575355
    <toolset>msvc-8.0:<cxxflags>"/W3 /WX /Wp64 /Zc:wchar_t /Zc:forScope"
Alec Leamas 1575355
    <toolset>msvc-9.0:<cxxflags>"/W3 /WX /Zc:wchar_t /Zc:forScope"
Alec Leamas 1575355
@@ -74,10 +73,6 @@ asl_requirements =
Alec Leamas 1575355
    $(ASL_ADDITIONAL_MACROS)
Alec Leamas 1575355
    <define>BOOST_ALL_NO_LIB 
Alec Leamas 1575355
    <toolset>darwin:<linkflags>"-lSystemStubs"
Alec Leamas 1575355
-   <threading>multi:<library>/boost/thread//boost_thread
Alec Leamas 1575355
-   <library>/boost/filesystem
Alec Leamas 1575355
-   <library>/boost/system
Alec Leamas 1575355
-   <library>/boost/signals
Alec Leamas 1575355
   ;
Alec Leamas 1575355
 
Alec Leamas 1575355
  project
Alec Leamas 1575355
@@ -116,6 +111,7 @@ switch [ os.name ]
Alec Leamas 1575355
 
Alec Leamas 1575355
 
Alec Leamas 1575355
 import os ;
Alec Leamas 1575355
+import path ;
Alec Leamas 1575355
 local boost-path = [ os.environ BOOST_PATH ] ;
Alec Leamas 1575355
 if $(boost-path)
Alec Leamas 1575355
 {
Alec Leamas 1575355
@@ -124,8 +120,6 @@ if $(boost-path)
Alec Leamas 1575355
   boost-path = [ path.make ../boost_libraries ] ;
Alec Leamas 1575355
 }
Alec Leamas 1575355
 
Alec Leamas 1575355
-use-project /boost : $(boost-path)  ;
Alec Leamas 1575355
-
Alec Leamas 1575355
 
Alec Leamas 1575355
 lib asl
Alec Leamas 1575355
   : #sources