Skip to Content.
Sympa Menu

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

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 (c347618765d2ea04c05e7828a821677b999c8e74)
  • Date: Mon, 14 Apr 2008 00:32:14 -0500

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

libs/stlport/HISTORY | 5 +++++
libs/stlport/PRE_BUILD | 3 +++
libs/stlport/gcc43.patch | 46
++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 54 insertions(+)

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

stlport: Patch from Javier <jevv.cr AT gmail.com> to fix compilation with
gcc 4.3.0 (Bug #14448)

diff --git a/libs/stlport/HISTORY b/libs/stlport/HISTORY
index 98e945b..c29b0a2 100644
--- a/libs/stlport/HISTORY
+++ b/libs/stlport/HISTORY
@@ -1,3 +1,8 @@
+2008-04-13 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply gcc43.patch
+ * gcc43.patch: Patch from Javier <jevv.cr AT gmail.com> to fix
+ compilation with gcc 4.3.0 (BUg #14448)
+
2008-03-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD: added make_single since the build process doesn't work
if the number of jobs is >1
diff --git a/libs/stlport/PRE_BUILD b/libs/stlport/PRE_BUILD
new file mode 100755
index 0000000..34cce88
--- /dev/null
+++ b/libs/stlport/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SCRIPT_DIRECTORY/gcc43.patch
diff --git a/libs/stlport/gcc43.patch b/libs/stlport/gcc43.patch
new file mode 100644
index 0000000..b36df60
--- /dev/null
+++ b/libs/stlport/gcc43.patch
@@ -0,0 +1,46 @@
+Patch from Javier <jevv.cr AT gmail.com> to fix
http://bugs.sourcemage.org/show_bug.cgi?id=14448 (compilation with GCC 4.3.0)
+--
+diff -Naur STLport-5.1.5-orig/build/Makefiles/gmake/gcc.mak
STLport-5.1.5/build/Makefiles/gmake/gcc.mak
+--- STLport-5.1.5-orig/build/Makefiles/gmake/gcc.mak 2008-04-11
21:41:32.000000000 -0600
++++ STLport-5.1.5/build/Makefiles/gmake/gcc.mak 2008-04-11
22:00:48.000000000 -0600
+@@ -29,6 +29,11 @@
+ CXX_VERSION := $(shell ${CXX} --version | grep GCC | awk '{ print $$3; }')
+
+ ifeq ($(CXX_VERSION),)
++# Current g++-4.3
++CXX_VERSION := $(shell ${CXX} --version | grep '^g++' | awk '{ print $$4;
}')
++endif
++
++ifeq ($(CXX_VERSION),)
+ # 2.95 report only version
+ CXX_VERSION := $(shell ${CXX} --version)
+ endif
+diff -Naur STLport-5.1.5-orig/stlport/limits.h STLport-5.1.5/stlport/limits.h
+--- STLport-5.1.5-orig/stlport/limits.h 2008-04-11 21:41:32.000000000
-0600
++++ STLport-5.1.5/stlport/limits.h 2008-04-11 21:39:51.000000000 -0600
+@@ -24,7 +24,11 @@
+ struct _exception;
+ #endif
+
+-#include _STLP_NATIVE_C_HEADER(limits.h)
++#if defined (_STLP_HAS_INCLUDE_NEXT)
++# include_next <limits.h>
++#else
++# include _STLP_NATIVE_C_HEADER(limits.h)
++#endif
+
+ #if (_STLP_OUTERMOST_HEADER_ID == 0x201)
+ # if ! defined (_STLP_DONT_POP_HEADER_ID)
+diff -Naur STLport-5.1.5-orig/stlport/stl/config/_gcc.h
STLport-5.1.5/stlport/stl/config/_gcc.h
+--- STLport-5.1.5-orig/stlport/stl/config/_gcc.h 2008-04-11
21:41:32.000000000 -0600
++++ STLport-5.1.5/stlport/stl/config/_gcc.h 2008-04-11 22:04:17.000000000
-0600
+@@ -4,6 +4,8 @@
+
+ #define _STLP_COMPILER "gcc"
+
++#define _STLP_HAS_INCLUDE_NEXT 1
++
+ /* Systems having GLIBC installed have different traits */
+ #if defined (__linux__)
+ # ifndef _STLP_USE_GLIBC
+



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (c347618765d2ea04c05e7828a821677b999c8e74), Eric Sandall, 04/14/2008

Archive powered by MHonArc 2.6.24.

Top of Page