Blob Blame History Raw
asl-fedora-flags

From: Alec Leamas <leamas.alec@gmail.com>

Fix fedora compilation flags in jamroot.jam
---

 adobe_source_libraries/jamroot.jam |   26 ++++++++++----------------
 1 files changed, 10 insertions(+), 16 deletions(-)


diff --git a/jamroot.jam b/adobe_source_libraries/jamroot.jam
index 8c7b593..dfd88c8 100644
--- a/jamroot.jam
+++ b/jamroot.jam
@@ -46,6 +46,7 @@ adobe_requirements =
     <toolset>msvc:<define>_WIN32_WINNT=0x400
     <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"
     <toolset>darwin:<linkflags>"-Xlinker -Y -Xlinker 5"
+    <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"
     <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"
 #    <toolset>gcc-4.5.0:<define>_GLIBCXX_USE_C99_MATH_TR1 # apparent problems using this without using other tr1 libs
     <toolset>gcc-4.5.0:<define>__GXX_EXPERIMENTAL_CXX0X__
@@ -63,8 +64,6 @@ asl_requirements =
    $(tbb_requirements)
    <include>.
    <toolset>gcc:<define>NOMINMAX
-   <toolset>gcc:<architecture>x86
-   <toolset>gcc,<threading>multi:<instruction-set>i486
    <toolset>msvc:<cxxflags>"-DUNICODE -D_UNICODE"
    <toolset>msvc-8.0:<cxxflags>"/W3 /WX /Wp64 /Zc:wchar_t /Zc:forScope"
    <toolset>msvc-9.0:<cxxflags>"/W3 /WX /Zc:wchar_t /Zc:forScope"
@@ -74,10 +73,6 @@ asl_requirements =
    $(ASL_ADDITIONAL_MACROS)
    <define>BOOST_ALL_NO_LIB 
    <toolset>darwin:<linkflags>"-lSystemStubs"
-   <threading>multi:<library>/boost/thread//boost_thread
-   <library>/boost/filesystem
-   <library>/boost/system
-   <library>/boost/signals
   ;
 
  project
@@ -116,6 +111,7 @@ switch [ os.name ]
 
 
 import os ;
+import path ;
 local boost-path = [ os.environ BOOST_PATH ] ;
 if $(boost-path)
 {
@@ -124,8 +120,6 @@ if $(boost-path)
   boost-path = [ path.make ../boost_libraries ] ;
 }
 
-use-project /boost : $(boost-path)  ;
-
 
 lib asl
   : #sources