Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (8ead659f70bdcea8e1683e32c5a1e4366df98354)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (8ead659f70bdcea8e1683e32c5a1e4366df98354)
  • Date: Sun, 25 Apr 2010 15:10:27 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

libs/boost/BUILD | 6 +++++-
libs/boost/HISTORY | 6 ++++++
libs/boost/PRE_BUILD | 4 ++++
libs/boost/boost-use-cxxflags.patch | 17 +++++++++++++++++
4 files changed, 32 insertions(+), 1 deletion(-)

New commits:
commit 8ead659f70bdcea8e1683e32c5a1e4366df98354
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

boost: Remove a debug statement

commit edc578ac969701241f8f9e456956357592500948
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

boost: Add '-Wno-strict-aliasing' to CXXFLAGS (Bug #15694)
Apply boost-use-cxxflags.patch (Required to fix Bug #15694)
from
http://svn.mandriva.com/cgi-bin/viewvc.cgi/packages/cooker/boost/current/SOURCES/boost-use-cxxflags.patch?view=markup

diff --git a/libs/boost/BUILD b/libs/boost/BUILD
index a00eb8a..25b947c 100755
--- a/libs/boost/BUILD
+++ b/libs/boost/BUILD
@@ -1,3 +1,8 @@
+#
+# Fix compilation with GCC 4.4
+#
+CXXFLAGS="-Wno-strict-aliasing $CXXFLAGS" &&
+
local BLIST="" &&
local BL &&
if list_find "${BOOST_LIBS}" "all" ; then
@@ -15,7 +20,6 @@ if list_find "${BOOST_LIBS}" "graph" ||
local EXPAT_LIBPATH=/usr/include
fi &&
OPTS="$OPTS $BLIST" &&
-echo $OPTS
CXXFLAGS="$CXXFLAGS" \
EXPAT_INCLUDE=$EXPAT_INCLUDE \
EXPAT_LIBPATH=$EXPAT_LIBPATH \
diff --git a/libs/boost/HISTORY b/libs/boost/HISTORY
index 4c46f2a..d24016c 100644
--- a/libs/boost/HISTORY
+++ b/libs/boost/HISTORY
@@ -1,3 +1,9 @@
+2010-04-25 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply boost-use-cxxflags.patch (Required to fix Bug
#15694)
+ * BUILD: Add '-Wno-strict-aliasing' to CXXFLAGS (Bug #15694)
+ * boost-use-cxxflags.patch: Allow providing our own CXXFLAGS
+ From
http://svn.mandriva.com/cgi-bin/viewvc.cgi/packages/cooker/boost/current/SOURCES/boost-use-cxxflags.patch?view=markup
+
2010-02-08 Sukneet <skipinder AT gmail.com>
* DETAILS: updated spell to 1_42_0; bug #15595

diff --git a/libs/boost/PRE_BUILD b/libs/boost/PRE_BUILD
new file mode 100755
index 0000000..5950e2c
--- /dev/null
+++ b/libs/boost/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+message "${MESSAGE_COLOR}Allow providing our own
CXXFLAGS...${DEFAULT_COLOR}" &&
+patch $SOURCE_DIRECTORY/tools/build/v2/tools/gcc.jam \
+ $SCRIPT_DIRECTORY/boost-use-cxxflags.patch
diff --git a/libs/boost/boost-use-cxxflags.patch
b/libs/boost/boost-use-cxxflags.patch
new file mode 100644
index 0000000..5da4d25
--- /dev/null
+++ b/libs/boost/boost-use-cxxflags.patch
@@ -0,0 +1,17 @@
+#
+# From
http://svn.mandriva.com/cgi-bin/viewvc.cgi/packages/cooker/boost/current/SOURCES/boost-use-cxxflags.patch?view=markup
+#
+diff -p -up boost_1_39_0/tools/build/v2/tools/gcc.jam.cxxflags~
boost_1_39_0/tools/build/v2/tools/gcc.jam
+--- boost_1_39_0/tools/build/v2/tools/gcc.jam.cxxflags~ 2009-01-14
15:31:12.000000000 +0100
++++ boost_1_39_0/tools/build/v2/tools/gcc.jam 2009-07-17 18:12:20.000000000
+0200
+@@ -298,8 +298,9 @@ generators.override gcc.compile.c++.pch
+ toolset.flags gcc.compile PCH_FILE <pch>on : <pch-file> ;
+
+ # Declare flags and action for compilation.
++local CXXFLAGS = [ os.environ BOOST_BUILD_PATH ] ;
+ toolset.flags gcc.compile OPTIONS <optimization>off : -O0 ;
+-toolset.flags gcc.compile OPTIONS <optimization>speed : -O3 ;
++toolset.flags gcc.compile OPTIONS <optimization>speed : [ modules.peek :
CXXFLAGS ] ;
+ toolset.flags gcc.compile OPTIONS <optimization>space : -Os ;
+
+ toolset.flags gcc.compile OPTIONS <inlining>off : -fno-inline ;



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (8ead659f70bdcea8e1683e32c5a1e4366df98354), Eric Sandall, 04/25/2010

Archive powered by MHonArc 2.6.24.

Top of Page