Accepting request 942092 from devel:libraries:c_c++
OBS-URL: https://build.opensuse.org/request/show/942092 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/boost?expand=0&rev=153
This commit is contained in:
commit
7ac66efd08
80
0001-b2-fix-install.patch
Normal file
80
0001-b2-fix-install.patch
Normal file
@ -0,0 +1,80 @@
|
||||
https://github.com/bfgroup/b2/pull/113
|
||||
|
||||
From 62e7321669f66a90e2a90c8f31af34f59ebc5d7a Mon Sep 17 00:00:00 2001
|
||||
From: Dmitry Arkhipov <grisumbras@gmail.com>
|
||||
Date: Thu, 9 Dec 2021 08:11:57 +0300
|
||||
Subject: [PATCH] Don't skip install targets if there's <build>no in ureqs
|
||||
|
||||
---
|
||||
src/tools/stage.jam | 4 ++++
|
||||
test/install_build_no.py | 26 ++++++++++++++++++++++++++
|
||||
test/test_all.py | 1 +
|
||||
3 files changed, 31 insertions(+)
|
||||
create mode 100755 test/install_build_no.py
|
||||
|
||||
Index: boost_1_78_0/tools/build/src/tools/stage.jam
|
||||
===================================================================
|
||||
--- boost_1_78_0.orig/tools/build/src/tools/stage.jam 2021-12-09 16:30:45.956457531 +0300
|
||||
+++ boost_1_78_0/tools/build/src/tools/stage.jam 2021-12-09 16:30:45.952457519 +0300
|
||||
@@ -476,10 +476,14 @@ class install-target-class : basic-targe
|
||||
}
|
||||
DELETE_MODULE $(result) ;
|
||||
return [ sequence.unique $(result2) ] ;
|
||||
}
|
||||
|
||||
+ rule skip-from-usage-requirements ( )
|
||||
+ {
|
||||
+ }
|
||||
+
|
||||
# Returns true iff 'type' is subtype of some element of 'types-to-include'.
|
||||
#
|
||||
local rule include-type ( type : types-to-include * )
|
||||
{
|
||||
local found ;
|
||||
Index: boost_1_78_0/tools/build/test/install_build_no.py
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ boost_1_78_0/tools/build/test/install_build_no.py 2021-12-09 16:30:45.953457522 +0300
|
||||
@@ -0,0 +1,26 @@
|
||||
+#!/usr/bin/python
|
||||
+
|
||||
+# Copyright 2021 Dmitry Arkhipov (grisumbras@gmail.com)
|
||||
+# Distributed under the Boost Software License, Version 1.0.
|
||||
+# (See accompanying file LICENSE.txt or https://www.bfgroup.xyz/b2/LICENSE.txt)
|
||||
+
|
||||
+# Check that <build>no in usage-requirements of dependencies does not affect
|
||||
+# install rule, i.e. a skipped installed target does not affect insallation of
|
||||
+# other targets.
|
||||
+
|
||||
+import BoostBuild
|
||||
+
|
||||
+t = BoostBuild.Tester()
|
||||
+
|
||||
+t.write("a.cpp", "int main() {}\n")
|
||||
+
|
||||
+t.write("jamroot.jam", """
|
||||
+make x : : maker : <build>no ;
|
||||
+exe a : a.cpp ;
|
||||
+install install : x a ;
|
||||
+""")
|
||||
+
|
||||
+t.run_build_system()
|
||||
+t.expect_addition("install/a.exe")
|
||||
+
|
||||
+t.cleanup()
|
||||
Index: boost_1_78_0/tools/build/test/test_all.py
|
||||
===================================================================
|
||||
--- boost_1_78_0.orig/tools/build/test/test_all.py 2021-12-09 16:30:45.956457531 +0300
|
||||
+++ boost_1_78_0/tools/build/test/test_all.py 2021-12-09 16:30:45.953457522 +0300
|
||||
@@ -248,10 +248,11 @@ tests = ["abs_workdir",
|
||||
"implicit_dependency",
|
||||
"indirect_conditional",
|
||||
"inherit_toolset",
|
||||
"inherited_dependency",
|
||||
"inline",
|
||||
+ "install_build_no",
|
||||
"libjpeg",
|
||||
"liblzma",
|
||||
"libpng",
|
||||
"libtiff",
|
||||
"libzstd",
|
@ -1,26 +1,26 @@
|
||||
libboost_atomic1_77_0
|
||||
libboost_container1_77_0
|
||||
libboost_context1_77_0
|
||||
libboost_coroutine1_77_0
|
||||
libboost_date_time1_77_0
|
||||
libboost_fiber1_77_0
|
||||
libboost_filesystem1_77_0
|
||||
libboost_graph1_77_0
|
||||
libboost_graph_parallel1_77_0
|
||||
libboost_iostreams1_77_0
|
||||
libboost_locale1_77_0
|
||||
libboost_math1_77_0
|
||||
libboost_mpi1_77_0
|
||||
libboost_nowide1_77_0
|
||||
libboost_test1_77_0
|
||||
libboost_program_options1_77_0
|
||||
libboost_python-py3-1_77_0
|
||||
libboost_random1_77_0
|
||||
libboost_serialization1_77_0
|
||||
libboost_stacktrace1_77_0
|
||||
libboost_system1_77_0
|
||||
libboost_thread1_77_0
|
||||
libboost_type_erasure1_77_0
|
||||
libboost_wave1_77_0
|
||||
libboost_regex1_77_0
|
||||
libboost_json1_77_0
|
||||
libboost_atomic1_78_0
|
||||
libboost_container1_78_0
|
||||
libboost_context1_78_0
|
||||
libboost_coroutine1_78_0
|
||||
libboost_date_time1_78_0
|
||||
libboost_fiber1_78_0
|
||||
libboost_filesystem1_78_0
|
||||
libboost_graph1_78_0
|
||||
libboost_graph_parallel1_78_0
|
||||
libboost_iostreams1_78_0
|
||||
libboost_locale1_78_0
|
||||
libboost_math1_78_0
|
||||
libboost_mpi1_78_0
|
||||
libboost_nowide1_78_0
|
||||
libboost_test1_78_0
|
||||
libboost_program_options1_78_0
|
||||
libboost_python-py3-1_78_0
|
||||
libboost_random1_78_0
|
||||
libboost_serialization1_78_0
|
||||
libboost_stacktrace1_78_0
|
||||
libboost_system1_78_0
|
||||
libboost_thread1_78_0
|
||||
libboost_type_erasure1_78_0
|
||||
libboost_wave1_78_0
|
||||
libboost_regex1_78_0
|
||||
libboost_json1_78_0
|
||||
|
@ -1,45 +0,0 @@
|
||||
From 720536a08e4e33639869e1b7a99d9ec923409c0b Mon Sep 17 00:00:00 2001
|
||||
From: Matt Borland <matt@mattborland.com>
|
||||
Date: Mon, 23 Aug 2021 17:48:28 +0300
|
||||
Subject: [PATCH] Fix for issue 675 (#676)
|
||||
|
||||
---
|
||||
.../boost/math/tools/header_deprecated.hpp | 22 ++++++++++++++-----
|
||||
test/Jamfile.v2 | 1 +
|
||||
test/header_deprecated_test.cpp | 12 ++++++++++
|
||||
3 files changed, 29 insertions(+), 6 deletions(-)
|
||||
create mode 100644 test/header_deprecated_test.cpp
|
||||
|
||||
diff --git a/include/boost/math/tools/header_deprecated.hpp b/include/boost/math/tools/header_deprecated.hpp
|
||||
index 8f4a5db25..867fcaa21 100644
|
||||
--- a/include/boost/math/tools/header_deprecated.hpp
|
||||
+++ b/include/boost/math/tools/header_deprecated.hpp
|
||||
@@ -6,12 +6,22 @@
|
||||
#ifndef BOOST_MATH_TOOLS_HEADER_DEPRECATED
|
||||
#define BOOST_MATH_TOOLS_HEADER_DEPRECATED
|
||||
|
||||
-#ifdef _MSC_VER
|
||||
-// Expands to "This header is deprecated; use expr instead."
|
||||
-#define BOOST_MATH_HEADER_DEPRECATED(expr) __pragma("This header is deprecated; use " expr " instead.")
|
||||
-#else // GNU, Clang, Intel, IBM, etc.
|
||||
+#ifndef BOOST_MATH_STANDALONE
|
||||
+
|
||||
+# include <boost/config/header_deprecated.hpp>
|
||||
+# define BOOST_MATH_HEADER_DEPRECATED(expr) BOOST_HEADER_DEPRECATED(expr)
|
||||
+
|
||||
+#else
|
||||
+
|
||||
+# ifdef _MSC_VER
|
||||
// Expands to "This header is deprecated; use expr instead."
|
||||
-#define BOOST_MATH_HEADER_DEPRECATED(expr) _Pragma("This header is deprecated; use " expr " instead.")
|
||||
-#endif
|
||||
+# define BOOST_MATH_HEADER_DEPRECATED(expr) __pragma("This header is deprecated; use " expr " instead.")
|
||||
+# else // GNU, Clang, Intel, IBM, etc.
|
||||
+// Expands to "This header is deprecated use expr instead"
|
||||
+# define BOOST_MATH_HEADER_DEPRECATED_MESSAGE(expr) _Pragma(#expr)
|
||||
+# define BOOST_MATH_HEADER_DEPRECATED(expr) BOOST_MATH_HEADER_DEPRECATED_MESSAGE(message "This header is deprecated use " expr " instead")
|
||||
+# endif
|
||||
+
|
||||
+#endif // BOOST_MATH_STANDALONE
|
||||
|
||||
#endif // BOOST_MATH_TOOLS_HEADER_DEPRECATED
|
@ -1,3 +1,12 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 21 09:08:17 CET 2021 - aschnell@suse.com
|
||||
|
||||
- update to 1.78.0:
|
||||
* for details on all changes see,
|
||||
https://www.boost.org/users/history/version_1_78_0.html
|
||||
- boost-math.patch: removed
|
||||
- 0001-b2-fix-install.patch: added from upstream
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Oct 25 19:15:41 UTC 2021 - Matthias Mailänder <mailaender@opensuse.org>
|
||||
|
||||
|
29
boost.spec
29
boost.spec
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package %{base_name}
|
||||
# spec file
|
||||
#
|
||||
# Copyright (c) 2021 SUSE LLC
|
||||
#
|
||||
@ -19,9 +19,9 @@
|
||||
#
|
||||
%global flavor @BUILD_FLAVOR@%{nil}
|
||||
|
||||
%define ver 1.77.0
|
||||
%define _ver 1_77_0
|
||||
%define package_version 1_77_0
|
||||
%define ver 1.78.0
|
||||
%define _ver 1_78_0
|
||||
%define package_version 1_78_0
|
||||
%define file_version %_ver
|
||||
%define lib_appendix %_ver
|
||||
%define docs_version 1.56.0
|
||||
@ -235,15 +235,15 @@ ExcludeArch: s390x %{ix86} ppc64 ppc64le
|
||||
%endif
|
||||
|
||||
Name: %{base_name}
|
||||
Version: 1.77.0
|
||||
Version: 1.78.0
|
||||
Release: 0
|
||||
%define library_version 1_77_0
|
||||
%define library_version 1_78_0
|
||||
|
||||
Summary: Boost C++ Libraries
|
||||
License: BSL-1.0
|
||||
Group: Development/Libraries/C and C++
|
||||
URL: https://www.boost.org
|
||||
Source0: https://boostorg.jfrog.io/artifactory/main/release/%{version}/source/boost_%{_ver}.tar.bz2
|
||||
Source0: https://boostorg.jfrog.io/artifactory/main/release/%{version}/source/boost_%{_ver}.tar.bz2
|
||||
Source1: boost-rpmlintrc
|
||||
Source3: https://downloads.sourceforge.net/project/boost/boost-docs/1.56.0/boost_1_56_pdf.tar.bz2
|
||||
Source4: existing_extra_docs
|
||||
@ -266,14 +266,14 @@ Patch18: dynamic_linking.patch
|
||||
Patch20: python_library_name.patch
|
||||
Patch21: boost-remove-cmakedir.patch
|
||||
Patch22: boost-process.patch
|
||||
Patch23: boost-math.patch
|
||||
Patch23: 0001-b2-fix-install.patch
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: gmp-devel
|
||||
BuildRequires: libbz2-devel
|
||||
BuildRequires: libexpat-devel
|
||||
BuildRequires: libicu-devel
|
||||
BuildRequires: zlib-devel
|
||||
BuildRequires: xz-devel
|
||||
BuildRequires: zlib-devel
|
||||
%if %{with boost_fiber}
|
||||
BuildRequires: gcc-c++ > 5
|
||||
%else
|
||||
@ -640,9 +640,9 @@ This package contains the Boost.Filesystem library.
|
||||
%package -n libboost_filesystem%{library_version}-devel
|
||||
Summary: Development headers for Boost.Filesystem library
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libboost_atomic%{library_version}-devel = %{version}
|
||||
Requires: libboost_filesystem%{library_version} = %{version}
|
||||
Requires: libboost_headers%{library_version}-devel = %{version}
|
||||
Requires: libboost_atomic%{library_version}-devel = %{version}
|
||||
Requires: libstdc++-devel
|
||||
Conflicts: boost-devel < 1.63
|
||||
Conflicts: libboost_filesystem-devel-impl
|
||||
@ -694,8 +694,8 @@ Group: Development/Libraries/C and C++
|
||||
Requires: libboost_headers%{library_version}-devel = %{version}
|
||||
Requires: libboost_iostreams%{library_version} = %{version}
|
||||
Requires: pkgconfig(bzip2)
|
||||
Requires: pkgconfig(zlib)
|
||||
Requires: pkgconfig(liblzma)
|
||||
Requires: pkgconfig(zlib)
|
||||
Conflicts: boost-devel < 1.63
|
||||
Conflicts: libboost_iostreams-devel-impl
|
||||
Conflicts: libboost_iostreams1_66_0-devel
|
||||
@ -1212,8 +1212,8 @@ This package contains Boost::JSON runtime library.
|
||||
%package -n libboost_json%{library_version}-devel
|
||||
Summary: Development headers for Boost.JSON library
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libboost_json%{library_version} = %{version}
|
||||
Requires: libboost_container%{library_version}-devel = %{version}
|
||||
Requires: libboost_json%{library_version} = %{version}
|
||||
Conflicts: libboost_json-devel-impl
|
||||
Provides: libboost_json-devel-impl = %{version}
|
||||
|
||||
@ -1258,7 +1258,7 @@ find -type f ! \( -name \*.sh -o -name \*.py -o -name \*.pl \) -exec chmod -x {}
|
||||
%patch20 -p1
|
||||
%patch21 -p1
|
||||
%patch22 -p2
|
||||
%patch23 -p2
|
||||
%patch23 -p1
|
||||
|
||||
%build
|
||||
find . -type f -exec chmod u+w {} +
|
||||
@ -1530,7 +1530,6 @@ rm %{buildroot}%{package_libdir}/libboost_exception.so
|
||||
rm %{buildroot}%{package_libdir}/libboost_exception.so.%{version}
|
||||
|
||||
# not used or duplicated in boost-extra flavour
|
||||
rm -r %{buildroot}%{package_libdir}/cmake/boost_stacktrace_{backtrace,windbg}*
|
||||
rm -r %{buildroot}%{package_libdir}/cmake/boost_exception-*
|
||||
rm -r %{buildroot}%{package_libdir}/cmake/boost_graph_parallel-%{version}
|
||||
|
||||
@ -1780,9 +1779,7 @@ EOF
|
||||
|
||||
%files -n libboost_fiber%{library_version}-devel
|
||||
%dir %{package_libdir}/cmake/boost_fiber-%{version}
|
||||
%dir %{package_libdir}/cmake/boost_fiber_numa-%{version}
|
||||
%{package_libdir}/cmake/boost_fiber-%{version}/*
|
||||
%{package_libdir}/cmake/boost_fiber_numa-%{version}/*
|
||||
%{package_libdir}/libboost_fiber.so
|
||||
|
||||
%endif
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:fc9f85fc030e233142908241af7a846e60630aa7388de9a5fafb1f3a26840854
|
||||
size 110361537
|
3
boost_1_78_0.tar.bz2
Normal file
3
boost_1_78_0.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8681f175d4bdb26c52222665793eef08490d7758529330f98d3b29dd0735bccc
|
||||
size 110675550
|
Loading…
Reference in New Issue
Block a user