Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Elisamuel Resto (3dcdc3aa4ca0ec90a7b57edff1c0444f6bec3cd6)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Elisamuel Resto <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Elisamuel Resto (3dcdc3aa4ca0ec90a7b57edff1c0444f6bec3cd6)
  • Date: Thu, 24 Apr 2008 19:24:46 -0500

GIT changes to master grimoire by Elisamuel Resto <ryuji AT sourcemage.org>:

libs/boost/HISTORY | 4 +
libs/boost/PRE_BUILD | 7 ++
libs/boost/boost-1_35_0-serialization_gcc43_64bit.patch | 52
++++++++++++++++
3 files changed, 63 insertions(+)

New commits:
commit 3dcdc3aa4ca0ec90a7b57edff1c0444f6bec3cd6
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>

libs/boost: x86_64 + boost-1_35_0 + gcc-4.3 breaks compile, patch applied
on upstream scm

diff --git a/libs/boost/HISTORY b/libs/boost/HISTORY
index f163d15..2cadd88 100644
--- a/libs/boost/HISTORY
+++ b/libs/boost/HISTORY
@@ -1,3 +1,7 @@
+2008-04-24 Elisamuel Resto <ryuji AT sourcemage.org>
+ * PRE_BUILD, boost-1_35_0-serialization_gcc43_64bit.patch: added, the
combination
+ x86_64 + boost-1_35_0 + gcc-4.3 breaks compiling of boost. Applied
in upstream scm.
+
2008-03-29 Treeeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1_35_0
* PRE_BUILD, gcc43.patch: deleted, not needed
diff --git a/libs/boost/PRE_BUILD b/libs/boost/PRE_BUILD
new file mode 100755
index 0000000..f325610
--- /dev/null
+++ b/libs/boost/PRE_BUILD
@@ -0,0 +1,7 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+
+if [[ "$(installed_version gcc | sed 's:\.::g')" -ge "430" ]] && \
+ [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]; then
+ patch -p1 < ${SPELL_DIRECTORY}/boost-1_35_0-serialization_gcc43_64bit.patch
+fi
diff --git a/libs/boost/boost-1_35_0-serialization_gcc43_64bit.patch
b/libs/boost/boost-1_35_0-serialization_gcc43_64bit.patch
new file mode 100644
index 0000000..7f959d8
--- /dev/null
+++ b/libs/boost/boost-1_35_0-serialization_gcc43_64bit.patch
@@ -0,0 +1,52 @@
+--- trunk/boost/archive/polymorphic_iarchive.hpp (revision 43694)
++++ trunk/boost/archive/polymorphic_iarchive.hpp (revision 43958)
+@@ -18,4 +18,5 @@
+
+ #include <cstddef> // std::size_t
++#include <climits> // ULONG_MAX
+ #include <boost/config.hpp>
+
+@@ -39,7 +40,14 @@
+ // if there is no 64 bit int or if its the same as a long
+ // we shouldn't define separate functions for int64 data types.
+-#if defined(BOOST_NO_INT64_T) \
+- || (ULONG_MAX != 0xffffffff && ULONG_MAX == 18446744073709551615u) //
2**64 - 1
+-# define BOOST_NO_INTRINSIC_INT64_T
++#if defined(BOOST_NO_INT64_T)
++ #define BOOST_NO_INTRINSIC_INT64_T
++#else
++ #if defined(ULONG_MAX)
++ #if(ULONG_MAX != 0xffffffff && ULONG_MAX == 18446744073709551615u)
// 2**64 - 1
++ #define BOOST_NO_INTRINSIC_INT64_T
++ #endif
++ #else
++ #define BOOST_NO_INTRINSIC_INT64_T
++ #endif
+ #endif
+
+--- trunk/boost/archive/polymorphic_oarchive.hpp (revision 43694)
++++ trunk/boost/archive/polymorphic_oarchive.hpp (revision 43958)
+@@ -18,4 +18,5 @@
+
+ #include <cstddef> // size_t
++#include <climits> // ULONG_MAX
+ #include <string>
+
+@@ -38,7 +39,14 @@
+ // if there is no 64 bit int or if its the same as a long
+ // we shouldn't define separate functions for int64 data types.
+-#if defined(BOOST_NO_INT64_T) \
+- || (ULONG_MAX != 0xffffffff && ULONG_MAX == 18446744073709551615u) //
2**64 - 1
+-# define BOOST_NO_INTRINSIC_INT64_T
++#if defined(BOOST_NO_INT64_T)
++ #define BOOST_NO_INTRINSIC_INT64_T
++#else
++ #if defined(ULONG_MAX)
++ #if(ULONG_MAX != 0xffffffff && ULONG_MAX == 18446744073709551615u)
// 2**64 - 1
++ #define BOOST_NO_INTRINSIC_INT64_T
++ #endif
++ #else
++ #define BOOST_NO_INTRINSIC_INT64_T
++ #endif
+ #endif
+



  • [SM-Commit] GIT changes to master grimoire by Elisamuel Resto (3dcdc3aa4ca0ec90a7b57edff1c0444f6bec3cd6), Elisamuel Resto, 04/24/2008

Archive powered by MHonArc 2.6.24.

Top of Page