OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/boost?expand=0&rev=7

boost-use_O2.patch

@@ -5,7 +5,7 @@
  flags gcc LINKFLAGS <debug-symbols>on : -g ;
  flags gcc CFLAGS <optimization>off : -O0 ;
 -flags gcc CFLAGS <optimization>speed : -O3 ;
-+flags gcc CFLAGS <optimization>speed : -O2 ;
++flags gcc CFLAGS <optimization>speed : -O2 -fpermissive ;
  
  # Other optimizations we might want for GCC
  # -fforce-mem -fomit-frame-pointer

boost.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Oct 24 17:49:46 CEST 2007 - rguenther@suse.de
+
+- Use -fpermissive in addition to -O2 for building.
+- Add patch to enable building wave with GCC 4.3.
+
 -------------------------------------------------------------------
 Sun Jul 15 16:09:59 CEST 2007 - schwab@suse.de
 

boost.spec

@@ -14,13 +14,13 @@ Name:           boost
 BuildRequires:  boost-jam gcc-c++ libbz2-devel libicu-devel python-devel xorg-x11-devel
 %define file_version  1_33_1
 %define version_tag 1_33_1
-URL:            http://www.boost.org
+Url:            http://www.boost.org
 License:        BSD 3-Clause
 Group:          Development/Libraries/C and C++
 Summary:        Boost C++ Libraries
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Version:        1.33.1
-Release:        95
+Release:        116
 Source0:        %{name}_%{file_version}.tar.bz2
 Source1:        NEWS
 Patch:          boost-threading.patch
@@ -36,6 +36,7 @@ Patch10:        boost-ia64.patch
 Patch11:        boost-visit_each.diff
 Patch12:        boost-python_2_5-minimal.patch
 Patch13:        boost-atomicity.patch
+Patch14:        boost_1_33_1-gcc43.patch
 %define _prefix /usr
 %define python_root /usr
 %define python_lib_path %py_libdir/config
@@ -63,7 +64,7 @@ the boost-doc package.
 Summary:        Development package for Boost C++
 Group:          Development/Libraries/C and C++
 Requires:       %{name} = %{version}
-Autoreqprov:    on
+AutoReqProv:    on
 
 %description devel
 This package contains all that is needed to develop/compile
@@ -76,7 +77,7 @@ the package boost-doc.
 Summary:        Documentation for the Boost C++ Libraries
 Group:          Development/Libraries/C and C++
 Requires:       %{name}-devel = %{version}
-Autoreqprov:    on
+AutoReqProv:    on
 
 %description doc
 This package contains documentation about the boost dynamic libraries.
@@ -101,6 +102,7 @@ find -type f ! \( -name \*.sh -o -name \*.py -o -name \*.pl -o -name configure \
 %patch11
 %patch12
 %patch13
+%patch14
 cp %{S:1} .
 
 %build
@@ -181,8 +183,10 @@ chmod -R u+rw,go+rX %{buildroot}%{_prefix}
 %files doc
 %defattr(-,root,root)
 %doc .backup/*
-
 %changelog
+* Wed Oct 24 2007 - rguenther@suse.de
+- Use -fpermissive in addition to -O2 for building.
+- Add patch to enable building wave with GCC 4.3.
 * Sun Jul 15 2007 - schwab@suse.de
 - Fix reference to atomicity.h.
 * Sat Mar 24 2007 - aj@suse.de

boost_1_33_1-gcc43.patch

@@ -0,0 +1,113 @@
+--- tools/wave/cpp.cpp.orig	2005-05-16 11:36:01.000000000 +0200
++++ tools/wave/cpp.cpp	2006-05-11 16:14:31.000000000 +0200
+@@ -108,7 +108,7 @@
+ 
+ ///////////////////////////////////////////////////////////////////////////////
+ // forward declarations only
+-namespace cmd_line_utils 
++namespace cmd_line_util
+ {
+     class include_paths;
+ }
+@@ -116,7 +116,7 @@
+ namespace boost { namespace program_options 
+ {
+     void validate(boost::any &v, std::vector<std::string> const &s,
+-        cmd_line_utils::include_paths *, int);
++        cmd_line_util::include_paths *, long);
+ }} // boost::program_options
+ 
+ ///////////////////////////////////////////////////////////////////////////////
+@@ -234,7 +234,7 @@
+ namespace boost { namespace program_options {
+ 
+     void validate(boost::any &v, std::vector<std::string> const &s,
+-        cmd_line_util::include_paths *, int) 
++        cmd_line_util::include_paths *, long) 
+     {
+         cmd_line_util::include_paths::validate(v, s);
+     }
+--- libs/wave/src/cpplexer/re2clex/aq.cpp.orig	2006-05-11 20:21:26.000000000 +0200
++++ libs/wave/src/cpplexer/re2clex/aq.cpp	2006-05-11 20:21:33.000000000 +0200
+@@ -51,7 +51,7 @@
+     if (q->tail <= q->head) /* tail has wrapped around */
+     {
+         /* move the tail from the beginning to the end */
+-        memcpy(q->queue + q->max_size, q->queue,
++        memmove(q->queue + q->max_size, q->queue,
+                 (q->tail + 1) * sizeof(aq_stdelement));
+         q->tail += q->max_size;
+     }
+--- ./libs/regex/src/regex_raw_buffer.cpp.orig	2006-05-11 20:27:09.000000000 +0200
++++ ./libs/regex/src/regex_raw_buffer.cpp	2006-05-11 20:27:17.000000000 +0200
+@@ -45,7 +45,7 @@
+    // allocate and copy data:
+    register pointer ptr = static_cast<pointer>(::operator new(newsize));
+    BOOST_REGEX_NOEH_ASSERT(ptr)
+-   std::memcpy(ptr, start, datasize);
++   std::memmove(ptr, start, datasize);
+ 
+    // get rid of old buffer:
+    ::operator delete(start);
+--- ./boost/wave/util/flex_string.hpp.orig	2006-05-11 20:39:21.000000000 +0200
++++ ./boost/wave/util/flex_string.hpp	2006-05-11 20:39:35.000000000 +0200
+@@ -123,7 +123,7 @@
+     {
+         const std::size_t s = e - b;
+         using namespace std;
+-        memcpy(d, b, s * sizeof(*b));
++        memmove(d, b, s * sizeof(*b));
+         return d + s;
+     }
+ 
+--- libs/wave/src/cpplexer/re2clex/cpp_re.cpp.orig	2006-05-12 17:41:15.000000000 +0200
++++ libs/wave/src/cpplexer/re2clex/cpp_re.cpp	2006-05-12 17:42:05.000000000 +0200
+@@ -187,7 +187,7 @@
+         {
+             if (NULL == s->lim)
+                 s->lim = s->top;
+-            memcpy(s->bot, s->tok, s->lim - s->tok);
++            memmove(s->bot, s->tok, s->lim - s->tok);
+             s->tok = s->bot;
+             s->ptr -= cnt;
+             cursor -= cnt;
+@@ -211,7 +211,7 @@
+                 return cursor;
+             }
+ 
+-            memcpy(buf, s->tok, s->lim - s->tok);
++            memmove(buf, s->tok, s->lim - s->tok);
+             s->tok = buf;
+             s->ptr = &buf[s->ptr - s->bot];
+             cursor = &buf[cursor - s->bot];
+@@ -231,7 +231,7 @@
+             cnt = s->last - s->act;
+             if (cnt > BSIZE)
+                 cnt = BSIZE;
+-            memcpy(s->lim, s->act, cnt);
++            memmove(s->lim, s->act, cnt);
+             s->act += cnt;
+             if (cnt != BSIZE) 
+             {
+--- libs/wave/src/cpplexer/re2clex/cpp_re.cpp.orig	2006-05-15 13:29:00.000000000 +0200
++++ libs/wave/src/cpplexer/re2clex/cpp_re.cpp	2006-05-15 13:31:59.000000000 +0200
+@@ -51,7 +50,7 @@
+ #define YYCURSOR  cursor
+ #define YYLIMIT   limit
+ #define YYMARKER  marker
+-#define YYFILL(n) {cursor = uchar_wrapper(fill(s, cursor), cursor.column);}
++#define YYFILL(n) {cursor = uchar_wrapper(fill(s, cursor), cursor.column); limit = uchar_wrapper (s->lim); }
+ 
+ //#define RET(i)    {s->cur = cursor; return (i);}
+ #define RET(i)                                                                \
+
+--- boost/wave/util/flex_string.hpp.orig	2007-05-12 11:54:54.000000000 +0200
++++ boost/wave/util/flex_string.hpp	2007-05-12 11:55:09.000000000 +0200
+@@ -83,6 +83,7 @@
+ #include <limits>
+ #include <stdexcept>
+ #include <cstddef>
++#include <cstring>
+ 
+ ///////////////////////////////////////////////////////////////////////////////
+ namespace boost {