From bcc0fd389016e14188ddb3cb5e43bd0aadfe7178ec652d16a6acd9bea9b2e135 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 18 Jan 2008 17:43:35 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/boost?expand=0&rev=10 --- boost.changes | 5 ++++ boost.spec | 57 ++++++++++++++++++++---------------- sp-counted-base-gcc-ppc.diff | 38 ++++++++++++++++++++++++ 3 files changed, 74 insertions(+), 26 deletions(-) create mode 100644 sp-counted-base-gcc-ppc.diff diff --git a/boost.changes b/boost.changes index 4dac85d..fad0f52 100644 --- a/boost.changes +++ b/boost.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jan 16 10:19:30 CET 2008 - schwab@suse.de + +- Fix asm constraints. + ------------------------------------------------------------------- Wed Oct 24 17:49:46 CEST 2007 - rguenther@suse.de diff --git a/boost.spec b/boost.spec index 3731dd4..7a62f1f 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: 136 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: sp-counted-base-gcc-ppc.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,68 +185,71 @@ chmod -R u+rw,go+rX %{buildroot}%{_prefix} %files doc %defattr(-,root,root) %doc .backup/* + %changelog -* Wed Oct 24 2007 - rguenther@suse.de +* Wed Jan 16 2008 schwab@suse.de +- Fix asm constraints. +* 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 +* Sun Jul 15 2007 schwab@suse.de - Fix reference to atomicity.h. -* Sat Mar 24 2007 - aj@suse.de +* Sat Mar 24 2007 aj@suse.de - Add libbz2-devel to BuildRequires. -* Fri Sep 22 2006 - pth@suse.de +* Fri Sep 22 2006 pth@suse.de - Apply patch from community to build with Python 2.5 -* Fri Jul 14 2006 - sf@suse.de +* Fri Jul 14 2006 sf@suse.de - fixed wrong usage of visit_each() (Bug #192116 ) -* Thu Jul 13 2006 - sf@suse.de +* Thu Jul 13 2006 sf@suse.de - fixed link creation to libboost_thread.so, using %%_lib instead of lib -* Mon Jun 19 2006 - jw@suse.de +* Mon Jun 19 2006 jw@suse.de - added a libboost_thread.so as a symlink to libboost_thread-mt.so -* Tue Apr 04 2006 - pth@suse.de +* Tue Apr 04 2006 pth@suse.de - Add libboost_wave.a to file list -* Tue Apr 04 2006 - pth@suse.de +* Tue Apr 04 2006 pth@suse.de - Use explicit file names instead of wildcards to detect libraries that weren't built. -* Wed Feb 08 2006 - schwab@suse.de +* Wed Feb 08 2006 schwab@suse.de - Fix broken assembler constraints [#148429]. -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Tue Jan 17 2006 - schwab@suse.de +* Tue Jan 17 2006 schwab@suse.de - Don't strip binaries. -* Wed Dec 07 2005 - pth@suse.de +* Wed Dec 07 2005 pth@suse.de - Fix cases of type-punning in boost::python - Compile without -fno-strict-aliasing again. - Remove unnecessary type attributes in forward declarations. -* Tue Dec 06 2005 - pth@suse.de +* Tue Dec 06 2005 pth@suse.de - Update to 1.33.1. - Fix use of uninitialized variable. - Compile with -fno-strict-aliasing. - Update NEWS file -* Thu Aug 25 2005 - pth@suse.de +* Thu Aug 25 2005 pth@suse.de - Incorporate fixes that are bound to be in 1.33.1 - Build boost.regex with unicode support. -* Fri Aug 19 2005 - pth@suse.de +* Fri Aug 19 2005 pth@suse.de - Add a NEWS file. -* Thu Aug 18 2005 - pth@suse.de +* Thu Aug 18 2005 pth@suse.de - Update to 1.33.0 with 5 new libraries. See NEWS for specifics. - Fix use of uninitialized class member (matz@suse.de) - Compile with -O2 instead of -O3 - Make build process use %%optflags -* Thu Mar 10 2005 - pth@suse.de +* Thu Mar 10 2005 pth@suse.de - Update to 1.32.0 -* Fri May 07 2004 - pth@suse.de +* Fri May 07 2004 pth@suse.de - Add convenience symlinks (#38491) -* Sun Apr 25 2004 - coolo@suse.de +* Sun Apr 25 2004 coolo@suse.de - build with several jobs -* Fri Mar 05 2004 - pth@suse.de +* Fri Mar 05 2004 pth@suse.de - Update to 1.31.0. - Make building boost work on Linux platforms where gcc does not define _REENTRANT when passed -pthread. Patch was done by Robert Schiele. -* Sat Jan 10 2004 - adrian@suse.de +* Sat Jan 10 2004 adrian@suse.de - add %%run_ldconfig -* Wed Aug 20 2003 - pthomas@suse.de +* Wed Aug 20 2003 pthomas@suse.de - Update to 1.30.2, a bugfix release -* Wed Jul 23 2003 - pthomas@suse.de +* Wed Jul 23 2003 pthomas@suse.de - Initial package, based on the work by Robert Schiele. - Fix building with Python 2.3 diff --git a/sp-counted-base-gcc-ppc.diff b/sp-counted-base-gcc-ppc.diff new file mode 100644 index 0000000..4f2bf3f --- /dev/null +++ b/sp-counted-base-gcc-ppc.diff @@ -0,0 +1,38 @@ +--- + boost/detail/sp_counted_base_gcc_ppc.hpp | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +Index: boost_1_33_1/boost/detail/sp_counted_base_gcc_ppc.hpp +=================================================================== +--- boost_1_33_1.orig/boost/detail/sp_counted_base_gcc_ppc.hpp 2005-08-24 19:15:49.000000000 +0200 ++++ boost_1_33_1/boost/detail/sp_counted_base_gcc_ppc.hpp 2008-01-16 02:09:40.000000000 +0100 +@@ -46,7 +46,7 @@ inline void atomic_increment( int * pw ) + "stwcx. %1, 0, %2\n\t" + "bne- 0b": + +- "=m"( *pw ), "=&b"( tmp ): ++ "+m"( *pw ), "=&b"( tmp ): + "r"( pw ): + "cc" + ); +@@ -68,9 +68,9 @@ inline int atomic_decrement( int * pw ) + "bne- 0b\n\t" + "isync": + +- "=m"( *pw ), "=&b"( rv ): ++ "+m"( *pw ), "=&b"( rv ): + "r"( pw ): +- "memory", "cc" ++ "cc" + ); + + return rv; +@@ -94,7 +94,7 @@ inline int atomic_conditional_increment( + "stwcx. %1, 0, %2\n\t" + "bne- 0b": + +- "=m"( *pw ), "=&b"( rv ): ++ "+m"( *pw ), "=&b"( rv ): + "r"( pw ): + "cc" + );