Date: Sunday, December 6, 2020 @ 22:19:01 Author: foutrelis Revision: 771267
Fix build with boost 1.73 Added: soapyosmo/trunk/boost-1.73.patch Modified: soapyosmo/trunk/PKGBUILD ------------------+ PKGBUILD | 7 +++-- boost-1.73.patch | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 2 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-12-06 22:17:19 UTC (rev 771266) +++ PKGBUILD 2020-12-06 22:19:01 UTC (rev 771267) @@ -16,11 +16,14 @@ 'libosmosdr: OsmoSDR support' 'rtl-sdr: RTL-SDR support') # 'bladerf: BladeRF support' -source=("$pkgname-$pkgver.tar.gz::$url/archive/$_gitver.tar.gz") -sha512sums=('a1aa5f3c84f5e9cf8cc0329445836162586c3fd301f126310e2a3131c170f1d213fcb214162a28c448a49f57fcf177b7a00d10967ba88a8434a6ac26fa2264e8') +source=("$pkgname-$pkgver.tar.gz::$url/archive/$_gitver.tar.gz" + boost-1.73.patch) +sha512sums=('a1aa5f3c84f5e9cf8cc0329445836162586c3fd301f126310e2a3131c170f1d213fcb214162a28c448a49f57fcf177b7a00d10967ba88a8434a6ac26fa2264e8' + '98c9152445c919618dbc31e0056129e0734b60cbf2ee86903c6b7206883e8b6ba64dbe64e96fdebdb3f18abbb3b68aefa19ba3b177664d4fa61995be4c05ef64') prepare() { cd $_pkgname-$_gitver + patch -Np1 -i ../boost-1.73.patch sed -i 's|#ADD_DEFINITIONS(-Wconversion)|SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")|' CMakeLists.txt sed -i 's|SET(BOOST_REQUIRED_COMPONENTS|SET(BOOST_REQUIRED_COMPONENTS chrono|' CMakeLists.txt gr-osmosdr/CMakeLists.txt } Added: boost-1.73.patch =================================================================== --- boost-1.73.patch (rev 0) +++ boost-1.73.patch 2020-12-06 22:19:01 UTC (rev 771267) @@ -0,0 +1,72 @@ +diff -upr SoapyOsmo-soapy-osmo-0.2.5.orig/gr-osmosdr/lib/airspy/airspy_source_c.cc SoapyOsmo-soapy-osmo-0.2.5/gr-osmosdr/lib/airspy/airspy_source_c.cc +--- SoapyOsmo-soapy-osmo-0.2.5.orig/gr-osmosdr/lib/airspy/airspy_source_c.cc 2017-04-30 01:03:31.000000000 +0300 ++++ SoapyOsmo-soapy-osmo-0.2.5/gr-osmosdr/lib/airspy/airspy_source_c.cc 2020-12-07 00:10:20.896211424 +0200 +@@ -33,7 +33,6 @@ + + #include <boost/assign.hpp> + #include <boost/format.hpp> +-#include <boost/detail/endian.hpp> + #include <boost/algorithm/string.hpp> + #include <boost/thread/thread.hpp> + +diff -upr SoapyOsmo-soapy-osmo-0.2.5.orig/gr-osmosdr/lib/hackrf/hackrf_sink_c.cc SoapyOsmo-soapy-osmo-0.2.5/gr-osmosdr/lib/hackrf/hackrf_sink_c.cc +--- SoapyOsmo-soapy-osmo-0.2.5.orig/gr-osmosdr/lib/hackrf/hackrf_sink_c.cc 2017-04-30 01:03:31.000000000 +0300 ++++ SoapyOsmo-soapy-osmo-0.2.5/gr-osmosdr/lib/hackrf/hackrf_sink_c.cc 2020-12-07 00:16:19.417763264 +0200 +@@ -39,7 +39,6 @@ + + #include <boost/assign.hpp> + #include <boost/format.hpp> +-#include <boost/detail/endian.hpp> + #include <boost/algorithm/string.hpp> + #include <boost/thread/thread.hpp> + +diff -upr SoapyOsmo-soapy-osmo-0.2.5.orig/gr-osmosdr/lib/hackrf/hackrf_source_c.cc SoapyOsmo-soapy-osmo-0.2.5/gr-osmosdr/lib/hackrf/hackrf_source_c.cc +--- SoapyOsmo-soapy-osmo-0.2.5.orig/gr-osmosdr/lib/hackrf/hackrf_source_c.cc 2017-04-30 01:03:31.000000000 +0300 ++++ SoapyOsmo-soapy-osmo-0.2.5/gr-osmosdr/lib/hackrf/hackrf_source_c.cc 2020-12-07 00:11:15.317449319 +0200 +@@ -32,7 +32,7 @@ + + #include <boost/assign.hpp> + #include <boost/format.hpp> +-#include <boost/detail/endian.hpp> ++#include <boost/predef/other/endian.h> + #include <boost/algorithm/string.hpp> + #include <boost/thread/thread.hpp> + +@@ -125,10 +125,10 @@ hackrf_source_c::hackrf_source_c (const + + // create a lookup table for gr_complex values + for (unsigned int i = 0; i <= 0xffff; i++) { +-#ifdef BOOST_LITTLE_ENDIAN ++#ifdef BOOST_ENDIAN_LITTLE_BYTE + _lut.push_back( gr_complex( (float(int8_t(i & 0xff))) * (1.0f/128.0f), + (float(int8_t(i >> 8))) * (1.0f/128.0f) ) ); +-#else // BOOST_BIG_ENDIAN ++#else // BOOST_ENDIAN_BIG_BYTE + _lut.push_back( gr_complex( (float(int8_t(i >> 8))) * (1.0f/128.0f), + (float(int8_t(i & 0xff))) * (1.0f/128.0f) ) ); + #endif +diff -upr SoapyOsmo-soapy-osmo-0.2.5.orig/gr-osmosdr/lib/rtl/rtl_source_c.cc SoapyOsmo-soapy-osmo-0.2.5/gr-osmosdr/lib/rtl/rtl_source_c.cc +--- SoapyOsmo-soapy-osmo-0.2.5.orig/gr-osmosdr/lib/rtl/rtl_source_c.cc 2017-04-30 01:03:31.000000000 +0300 ++++ SoapyOsmo-soapy-osmo-0.2.5/gr-osmosdr/lib/rtl/rtl_source_c.cc 2020-12-07 00:14:15.811581477 +0200 +@@ -32,7 +32,7 @@ + + #include <boost/assign.hpp> + #include <boost/format.hpp> +-#include <boost/detail/endian.hpp> ++#include <boost/predef/other/endian.h> + #include <boost/algorithm/string.hpp> + + #include <stdexcept> +@@ -173,10 +173,10 @@ rtl_source_c::rtl_source_c (const std::s + + // create a lookup table for gr_complex values + for (unsigned int i = 0; i <= 0xffff; i++) { +-#ifdef BOOST_LITTLE_ENDIAN ++#ifdef BOOST_ENDIAN_LITTLE_BYTE + _lut.push_back( gr_complex( (float(i & 0xff) - 127.4f) * (1.0f/128.0f), + (float(i >> 8) - 127.4f) * (1.0f/128.0f) ) ); +-#else // BOOST_BIG_ENDIAN ++#else // BOOST_ENDIAN_BIG_BYTE + _lut.push_back( gr_complex( (float(i >> 8) - 127.4f) * (1.0f/128.0f), + (float(i & 0xff) - 127.4f) * (1.0f/128.0f) ) ); + #endif