summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCoprDistGit <infra@openeuler.org>2024-11-30 08:39:46 +0000
committerCoprDistGit <infra@openeuler.org>2024-11-30 08:39:46 +0000
commitb0839d568d2704d171d682c0cdf156038e4975f4 (patch)
treefb527aed1fc09d1f037f26ff420e9740604e028e
parentd6362ed363c4a52edc9136df2334f994c42082cb (diff)
automatic import of boostopeneuler24.03_LTS
-rw-r--r--boost-1.73.0-cmakedir.patch28
-rw-r--r--boost.spec5
2 files changed, 33 insertions, 0 deletions
diff --git a/boost-1.73.0-cmakedir.patch b/boost-1.73.0-cmakedir.patch
new file mode 100644
index 0000000..e47728f
--- /dev/null
+++ b/boost-1.73.0-cmakedir.patch
@@ -0,0 +1,28 @@
+--- boost_1_73_0/tools/boost_install/boost-install.jam~ 2020-04-24 20:21:50.330267122 +0100
++++ boost_1_73_0/tools/boost_install/boost-install.jam 2020-04-24 20:22:16.818360540 +0100
+@@ -652,25 +652,6 @@
+ "get_filename_component(_BOOST_CMAKEDIR \"${CMAKE_CURRENT_LIST_DIR}/../\" REALPATH)"
+ : true ;
+
+- if [ path.is-rooted $(cmakedir) ]
+- {
+- local cmakedir-native = [ path-native-fwd $(cmakedir) ] ;
+-
+- print.text
+-
+- ""
+- "# If the computed and the original directories are symlink-equivalent, use original"
+- "if(EXISTS \"$(cmakedir-native)\")"
+- " get_filename_component(_BOOST_CMAKEDIR_ORIGINAL \"$(cmakedir-native)\" REALPATH)"
+- " if(_BOOST_CMAKEDIR STREQUAL _BOOST_CMAKEDIR_ORIGINAL)"
+- " set(_BOOST_CMAKEDIR \"$(cmakedir-native)\")"
+- " endif()"
+- " unset(_BOOST_CMAKEDIR_ORIGINAL)"
+- "endif()"
+- ""
+- : true ;
+- }
+-
+ get-dir "_BOOST_INCLUDEDIR" : $(includedir) ;
+
+ if $(library-type) = INTERFACE
diff --git a/boost.spec b/boost.spec
index a54bc38..89655d2 100644
--- a/boost.spec
+++ b/boost.spec
@@ -18,6 +18,8 @@ Patch3: boost-1.81-random-Update-multiprecision_int_test.cpp-to-not-accidental.p
Patch4: boost-1.81-random-test-Add-missing-includes.patch
# https://github.com/boostorg/phoenix/pull/116
Patch5: boost-1.81-phoenix-Update-avoid-placeholders-uarg1.10-ODR-violates.patch
+# https://lists.boost.org/Archives/boost/2020/04/248812.php
+Patch6: boost-1.73.0-cmakedir.patch
Requires: %{name}-atomic%{?_isa} = %{version}-%{release}
Requires: %{name}-chrono%{?_isa} = %{version}-%{release}
@@ -301,6 +303,9 @@ as that on the Boost web page (http://www.boost.org/doc/libs/%{version_enc}).
--libdir=$RPM_BUILD_ROOT%{_libdir} \
install
+# Remove buildroot definition from cmake files
+sed -i -e 's,%{buildroot},,g' $(find %{buildroot}%{_libdir}/cmake -name "*.cmake")
+
mkdir boost-doc boost-example
cp -r index.html boost.png rst.css boost.css doc more boost-doc
find libs -name doc -exec cp {} boost-doc --parents -r \;