Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'jb51009_fix_build' into 'master'
[boost] Drop broken Boost.Build building. Contributes to JB#51009

See merge request mer-core/boost!8
  • Loading branch information
Matti Kosola committed Oct 17, 2020
2 parents 642935c + 016942c commit 0f22d93
Showing 1 changed file with 0 additions and 60 deletions.
60 changes: 0 additions & 60 deletions rpm/boost.spec
Expand Up @@ -18,7 +18,6 @@ Release: 1
License: Boost and MIT and Python

URL: http://www.boost.org
Group: System/Libraries
Source0: %{name}-%{version}.tar.bz2
Source1: ver.py
Source2: libboost_thread-mt.so
Expand Down Expand Up @@ -101,7 +100,6 @@ in future standards.)

%package atomic
Summary: Run-Time component of boost atomic library
Group: System Environment/Libraries

%description atomic

Expand All @@ -112,15 +110,13 @@ variables.

%package chrono
Summary: Run-Time component of boost chrono library
Group: System Environment/Libraries

%description chrono

Run-Time support for Boost.Chrono, a set of useful time utilities.

%package container
Summary: Run-Time component of boost container library
Group: System Environment/Libraries

%description container

Expand All @@ -131,7 +127,6 @@ standard draft features for compilers that comply with C++03.

%package date-time
Summary: Run-Time component of boost date-time library
Group: System Environment/Libraries

%description date-time

Expand All @@ -140,7 +135,6 @@ on generic programming concepts.

%package exception
Summary: Run-Time component of boost exception library
Group: System Environment/Libraries

%description exception

Expand All @@ -150,7 +144,6 @@ error reporting code.

%package filesystem
Summary: Run-Time component of boost filesystem library
Group: System Environment/Libraries

%description filesystem

Expand All @@ -160,7 +153,6 @@ directories.

%package graph
Summary: Run-Time component of boost graph library
Group: System Environment/Libraries

%description graph

Expand All @@ -170,7 +162,6 @@ Library (STL).

%package iostreams
Summary: Run-Time component of boost iostreams library
Group: System Environment/Libraries

%description iostreams

Expand All @@ -179,7 +170,6 @@ stream buffers and i/o filters.

%package locale
Summary: Run-Time component of boost locale library
Group: System Environment/Libraries
Requires: boost-chrono = %{version}-%{release}
Requires: boost-system = %{version}-%{release}
Requires: boost-thread = %{version}-%{release}
Expand All @@ -191,7 +181,6 @@ handling tools.

%package log
Summary: Run-Time component of boost logging library
Group: System Environment/Libraries

%description log

Expand All @@ -202,7 +191,6 @@ tools along with public interfaces for extending the library.

%package math
Summary: Math functions for boost TR1 library
Group: System Environment/Libraries
%if %{with quadmath}
Requires: libquadmath
%endif
Expand All @@ -214,7 +202,6 @@ portion of Boost.TR1.

%package program-options
Summary: Run-Time component of boost program_options library
Group: System Environment/Libraries

%description program-options

Expand All @@ -224,31 +211,27 @@ conventional methods such as command line and configuration file.

%package random
Summary: Run-Time component of boost random library
Group: System Environment/Libraries

%description random

Run-Time support for boost random library.

%package regex
Summary: Run-Time component of boost regular expression library
Group: System Environment/Libraries

%description regex

Run-Time support for boost regular expression library.

%package serialization
Summary: Run-Time component of boost serialization library
Group: System Environment/Libraries

%description serialization

Run-Time support for serialization for persistence and marshaling.

%package signals
Summary: Run-Time component of boost signals and slots library
Group: System Environment/Libraries

%description signals

Expand All @@ -263,7 +246,6 @@ Run-time component of the Boost stacktrace library.

%package system
Summary: Run-Time component of boost system support library
Group: System Environment/Libraries

%description system

Expand All @@ -273,7 +255,6 @@ library.

%package test
Summary: Run-Time component of boost test library
Group: System Environment/Libraries

%description test

Expand All @@ -282,7 +263,6 @@ program execution monitoring.

%package thread
Summary: Run-Time component of boost thread library
Group: System Environment/Libraries

%description thread

Expand All @@ -293,7 +273,6 @@ data specific to individual threads.

%package timer
Summary: Run-Time component of boost timer library
Group: System Environment/Libraries
Requires: boost-chrono = %{version}-%{release}
Requires: boost-system = %{version}-%{release}

Expand All @@ -305,7 +284,6 @@ with as little as one #include and one additional line of code.

%package type_erasure
Summary: Run-Time component of boost type erasure library
Group: System Environment/Libraries
Requires: boost-chrono = %{version}-%{release}
Requires: boost-system = %{version}-%{release}

Expand All @@ -316,7 +294,6 @@ that is more flexible than that provided by the core language.

%package wave
Summary: Run-Time component of boost C99/C++ pre-processing library
Group: System Environment/Libraries

%description wave

Expand All @@ -326,7 +303,6 @@ pre-processor functionality.

%package devel
Summary: The Boost C++ headers and shared development libraries
Group: Development/Libraries
Requires: pkgconfig(icu-uc)
Requires: boost-atomic = %{version}-%{release}
Requires: boost-chrono = %{version}-%{release}
Expand Down Expand Up @@ -360,30 +336,14 @@ Headers and shared object symbolic links for the Boost C++ libraries.

%package static
Summary: The Boost C++ static development libraries
Group: Development/Libraries
Requires: boost-devel = %{version}-%{release}
Provides: boost-devel-static = %{version}-%{release}

%description static
Static Boost C++ libraries.

%package build
Summary: Cross platform build system for C++ projects
Group: Development/Tools
Requires: boost-jam
BuildArch: noarch

%description build
Boost.Build is an easy way to build C++ projects, everywhere. You name
your pieces of executable and libraries and list their sources. Boost.Build
takes care about compiling your sources with the right options,
creating static and shared libraries, making pieces of executable, and other
chores -- whether you're using GCC, MSVC, or a dozen more supported
C++ compilers -- on Windows, OSX, Linux and commercial UNIX systems.

%package jam
Summary: A low-level build tool
Group: Development/Tools

%description jam
Boost.Jam (BJam) is the low-level build engine tool for Boost.Build.
Expand Down Expand Up @@ -425,9 +385,6 @@ echo ============================= build Boost.Build ==================
(cd tools/build
./bootstrap.sh --with-toolset=gcc)

%check
:


%install
rm -rf $RPM_BUILD_ROOT
Expand All @@ -447,27 +404,10 @@ echo ============================= install serial ==================
rm -f $RPM_BUILD_ROOT%{_libdir}/libboost_thread-mt.so
install -p -m 644 $(basename %{SOURCE2}) $RPM_BUILD_ROOT%{_libdir}/

echo ============================= install Boost.Build ==================
(cd tools/build/v2
./b2 --prefix=$RPM_BUILD_ROOT%{_prefix} install
# Fix some permissions
chmod -x $RPM_BUILD_ROOT%{_datadir}/boost-build/build/alias.py
chmod +x $RPM_BUILD_ROOT%{_datadir}/boost-build/tools/doxproc.py
# We don't want to distribute this
rm -f $RPM_BUILD_ROOT%{_bindir}/b2
# Not a real file
rm -f $RPM_BUILD_ROOT%{_datadir}/boost-build/build/project.ann.py
# Empty file
rm -f $RPM_BUILD_ROOT%{_datadir}/boost-build/tools/doxygen/windows-paths-check.hpp
)

%fdupes %{buildroot}/
%fdupes %{buildroot}/%{_libdir}/
%fdupes %{buildroot}/%{_datadir}/

%clean
rm -rf $RPM_BUILD_ROOT


# MPI subpackages don't need the ldconfig magic. They are hidden by
# default, in MPI back-end-specific directory, and only show to the
Expand Down

0 comments on commit 0f22d93

Please sign in to comment.