boost: Update to 1.80.0

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/boost/boost.nm b/boost/boost.nm
index 0ce3089767a5e00463e3e328e043fba42e3e94de..07b94b9a553b29d06b0e79cf689e0fd7769edbcc 100644 (file)
--- a/boost/boost.nm
+++ b/boost/boost.nm
@@ -5,13 +5,13 @@
 
 name       = boost
 ver_major  = 1
-ver_minor  = 70
+ver_minor  = 80
 ver_plevel = 0
 version    = %{ver_major}.%{ver_minor}.%{ver_plevel}
 release    = 1
 
 groups     = System/Libraries
-url        = http://www.boost.org/
+url        = https://www.boost.org/
 license    = Boost
 summary    = The Boost C++ Libraries.
 
@@ -25,32 +25,25 @@ end
 
 thisapp    = %{name}_%{ver_major}_%{ver_minor}_%{ver_plevel}
 
-source_dl  = http://sourceforge.net/projects/boost/files/%{name}/%{version}/
+source_dl  = https://sourceforge.net/projects/boost/files/%{name}/%{version}/
 
 build
        requires
                bzip2-devel
                gcc-c++
                icu-devel
-               python-devel
                python3-devel
+               xz-devel
                zlib-devel
+               zstd-devel
        end
 
-       CFLAGS   += -fno-strict-aliasing
-       CXXFLAGS += -fno-strict-aliasing
-
        # Obtain python3 abiflags.
        python3_abiflags = %(python3-config --abiflags)
 
        CFLAGS   += -I/usr/include/python%{python3_version}%{python3_abiflags}
        CXXFLAGS += -I/usr/include/python%{python3_version}%{python3_abiflags}
 
-       # Don't build in parallel on any architecture.
-       # The C++ compiles consumes too much memory, so
-       # we cannot run multiple instances at once.
-       PARALLELISMFLAGS = -j2
-
        configure_options = \
                --layout=system \
                --build-dir=serial \
@@ -66,9 +59,6 @@ build
                python=%{python3_version} \
                pch=off
 
-       # Get python3 abi flags.
-       python3_abiflags = %(%{python3}-config --abiflags)
-
        prepare_cmds
                # Create build dir.
                mkdir -pv %{DIR_APP}/serial
@@ -95,8 +85,6 @@ build
 end
 
 packages
-       # boost is just a umbrella package, that pulls all other boost
-       # components, except the python3 sub-package.
        package %{name}
                requires
                        boost-chrono = %{thisver}
@@ -108,11 +96,10 @@ packages
                        boost-locale = %{thisver}
                        boost-math = %{thisver}
                        boost-program-options = %{thisver}
-                       boost-python = %{thisver}
+                       boost-python3 = %{thisver}
                        boost-random = %{thisver}
                        boost-regex = %{thisver}
                        boost-serialization = %{thisver}
-                       boost-signals = %{thisver}
                        boost-system = %{thisver}
                        boost-test = %{thisver}
                        boost-thread = %{thisver}
@@ -231,22 +218,6 @@ packages
                end
        end
 
-       package %{name}-python
-               summary = Run-Time component of boost python library.
-               description
-                       The Boost Python Library is a framework for interfacing Python and
-                       C++. It allows you to quickly and seamlessly expose C++ classes
-                       functions and objects to Python, and vice versa, using no special
-                       tools -- just your C++ compiler.  This package contains run-time
-                       support for Boost Python Library.
-               end
-
-               files
-                       %{libdir}/libboost_python.so.*
-                       %{libdir}/libboost_python-mt.so.*
-               end
-       end
-
        package %{name}-python3
                summary = Run-Time component of boost python library for Python 3.
                description
@@ -296,17 +267,6 @@ packages
                end
        end
 
-       package %{name}-signals
-               summary = Run-Time component of boost signals and slots library.
-               description
-                       Run-Time support for managed signals & slots callback implementation.
-               end
-
-               files
-                       %{libdir}/libboost_signals*.so.*
-               end
-       end
-
        package %{name}-system
                summary = Run-Time component of boost system support library.
                description

diff --git a/boost/patches/boost-1.73.0-cmakedir.patch b/boost/patches/boost-1.73.0-cmakedir.patch
new file mode 100644 (file)
index 0000000..e47728f
--- /dev/null
+++ b/boost/patches/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