Accepting request 148167 from openSUSE:Factory

I reverted the change in factory as it broke several boost using packages.

OBS-URL: https://build.opensuse.org/request/show/148167
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/boost?expand=0&rev=91
This commit is contained in:
Ismail Dönmez 2013-01-12 12:31:08 +00:00 committed by Git OBS Bridge
parent 9ccfd2a82d
commit 958b28bb98
3 changed files with 51 additions and 1 deletions

View File

@ -0,0 +1,43 @@
Index: boost/asio/detail/config.hpp
===================================================================
--- boost/asio/detail/config.hpp.orig
+++ boost/asio/detail/config.hpp
@@ -28,18 +28,16 @@
#if defined(BOOST_ASIO_HEADER_ONLY)
# define BOOST_ASIO_DECL inline
#else // defined(BOOST_ASIO_HEADER_ONLY)
-# if defined(BOOST_HAS_DECLSPEC)
// We need to import/export our code only if the user has specifically asked
// for it by defining BOOST_ASIO_DYN_LINK.
-# if defined(BOOST_ASIO_DYN_LINK)
+# if defined(BOOST_ASIO_DYN_LINK)
// Export if this is our own source, otherwise import.
-# if defined(BOOST_ASIO_SOURCE)
-# define BOOST_ASIO_DECL __declspec(dllexport)
-# else // defined(BOOST_ASIO_SOURCE)
-# define BOOST_ASIO_DECL __declspec(dllimport)
-# endif // defined(BOOST_ASIO_SOURCE)
-# endif // defined(BOOST_ASIO_DYN_LINK)
-# endif // defined(BOOST_HAS_DECLSPEC)
+# if defined(BOOST_ASIO_SOURCE)
+# define BOOST_ASIO_DECL BOOST_SYMBOL_EXPORT
+# else // defined(BOOST_ASIO_SOURCE)
+# define BOOST_ASIO_DECL BOOST_SYMBOL_IMPORT
+# endif // defined(BOOST_ASIO_SOURCE)
+# endif // defined(BOOST_ASIO_DYN_LINK)
#endif // defined(BOOST_ASIO_HEADER_ONLY)
// If BOOST_ASIO_DECL isn't defined yet define it now.
Index: boost/asio/io_service.hpp
===================================================================
--- boost/asio/io_service.hpp.orig
+++ boost/asio/io_service.hpp
@@ -672,7 +672,7 @@ public:
};
/// Base class for all io_service services.
-class io_service::service
+class BOOST_ASIO_DECL io_service::service
: private noncopyable
{
public:

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Jan 2 19:00:38 UTC 2013 - fisiu@opensuse.org
- Add boost-asio-export-symbols.patch: boost#6688
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Sep 6 13:12:38 UTC 2012 - cfarrell@suse.com Thu Sep 6 13:12:38 UTC 2012 - cfarrell@suse.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package boost # spec file for package boost
# #
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -103,6 +103,7 @@ Patch1: boost-thread.patch
Patch2: boost-no_type_punning.patch Patch2: boost-no_type_punning.patch
Patch8: boost-no_segfault_in_Regex_filter.patch Patch8: boost-no_segfault_in_Regex_filter.patch
Patch20: boost-strict_aliasing.patch Patch20: boost-strict_aliasing.patch
Patch30: boost-asio-export-symbols.patch
Patch50: boost-use_std_xml_catalog.patch Patch50: boost-use_std_xml_catalog.patch
Patch51: boost-fix_documentation.patch Patch51: boost-fix_documentation.patch
Patch52: boost-chrono_add_function_return.patch Patch52: boost-chrono_add_function_return.patch
@ -381,6 +382,7 @@ find -type f ! \( -name \*.sh -o -name \*.py -o -name \*.pl \) -exec chmod -x {}
#%%patch9 #%%patch9
#%%patch19 #%%patch19
%patch20 %patch20
%patch30
%patch50 %patch50
%patch51 %patch51
%patch52 %patch52