diff --git a/boost.changes b/boost.changes index 4dac85d..35cc631 100644 --- a/boost.changes +++ b/boost.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jan 15 18:50:25 CET 2008 - coolo@suse.de + +- disable ppc assembler (#228176) + ------------------------------------------------------------------- Wed Oct 24 17:49:46 CEST 2007 - rguenther@suse.de diff --git a/boost.spec b/boost.spec index 3731dd4..6ee2797 100644 --- a/boost.spec +++ b/boost.spec @@ -1,7 +1,7 @@ # # spec file for package boost (Version 1.33.1) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -20,7 +20,7 @@ Group: Development/Libraries/C and C++ Summary: Boost C++ Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-build Version: 1.33.1 -Release: 116 +Release: 134 Source0: %{name}_%{file_version}.tar.bz2 Source1: NEWS Patch: boost-threading.patch @@ -37,6 +37,7 @@ Patch11: boost-visit_each.diff Patch12: boost-python_2_5-minimal.patch Patch13: boost-atomicity.patch Patch14: boost_1_33_1-gcc43.patch +Patch15: boost_1_33_1-disable-ppc-assembler.diff %define _prefix /usr %define python_root /usr %define python_lib_path %py_libdir/config @@ -103,6 +104,7 @@ find -type f ! \( -name \*.sh -o -name \*.py -o -name \*.pl -o -name configure \ %patch12 %patch13 %patch14 +%patch15 -p1 cp %{S:1} . %build @@ -183,7 +185,10 @@ chmod -R u+rw,go+rX %{buildroot}%{_prefix} %files doc %defattr(-,root,root) %doc .backup/* + %changelog +* Tue Jan 15 2008 - coolo@suse.de +- disable ppc assembler (#228176) * 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. diff --git a/boost_1_33_1-disable-ppc-assembler.diff b/boost_1_33_1-disable-ppc-assembler.diff new file mode 100644 index 0000000..e5f9991 --- /dev/null +++ b/boost_1_33_1-disable-ppc-assembler.diff @@ -0,0 +1,18 @@ +diff -ru boost_1_33_1.orig/boost/detail/sp_counted_base.hpp boost_1_33_1/boost/detail/sp_counted_base.hpp +--- boost_1_33_1.orig/boost/detail/sp_counted_base.hpp 2005-05-24 14:11:35.000000000 +0200 ++++ boost_1_33_1/boost/detail/sp_counted_base.hpp 2008-01-15 18:36:10.411054000 +0100 +@@ -39,14 +39,6 @@ + + # include + +-#elif defined( __MWERKS__ ) && defined( __POWERPC__ ) +- +-# include +- +-#elif defined( __GNUC__ ) && ( defined( __powerpc__ ) || defined( __ppc__ ) ) +- +-# include +- + #elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) + + # include