From patchwork Mon Jun 29 14:11:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gwenhael Goavec-Merou X-Patchwork-Id: 1318887 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=trabucayre.com Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49wTv267Fzz9sQt for ; Tue, 30 Jun 2020 00:11:42 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 0618E2272C; Mon, 29 Jun 2020 14:11:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5t6e0WWoXxRd; Mon, 29 Jun 2020 14:11:38 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 3564D20525; Mon, 29 Jun 2020 14:11:38 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 451DC1BF375 for ; Mon, 29 Jun 2020 14:11:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 41C5487620 for ; Mon, 29 Jun 2020 14:11:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TDrAkpU7ZxIe for ; Mon, 29 Jun 2020 14:11:35 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from smtp3-g21.free.fr (smtp3-g21.free.fr [212.27.42.3]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 9783E8761E for ; Mon, 29 Jun 2020 14:11:35 +0000 (UTC) Received: from localhost.localdomain (unknown [78.252.129.8]) by smtp3-g21.free.fr (Postfix) with ESMTP id 9A39513F8C0; Mon, 29 Jun 2020 16:11:32 +0200 (CEST) From: Gwenhael Goavec-Merou To: buildroot@buildroot.org Date: Mon, 29 Jun 2020 16:11:28 +0200 Message-Id: <20200629141128.853220-1-gwenj@trabucayre.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] package/gr-osmosdr: fix build with boost 1.7.3 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gwenhael Goavec-Merou Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Gwenhael Goavec-Merou boost/detail/endian.hpp has been marked as deprecated since boost 1.69.0. This file and boost/predef/detail/endian_compat.h are no more available. This patch suppress this header in some file, where not needed and move to correct header and new constants. It's retrocompatible for at least all boost release > 1.69.0 [Upstream status: http://lists.osmocom.org/pipermail/osmocom-sdr/2020-June/002080.html] Signed-off-by: Gwenhael Goavec-Merou --- .../0001-fix-build-with-boost-1.7.3.patch | 86 +++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 package/gr-osmosdr/0001-fix-build-with-boost-1.7.3.patch diff --git a/package/gr-osmosdr/0001-fix-build-with-boost-1.7.3.patch b/package/gr-osmosdr/0001-fix-build-with-boost-1.7.3.patch new file mode 100644 index 0000000000..fb10914531 --- /dev/null +++ b/package/gr-osmosdr/0001-fix-build-with-boost-1.7.3.patch @@ -0,0 +1,86 @@ +From 9d5a21f2900e3ffb07c1f163b6ba4e036f6c16a8 Mon Sep 17 00:00:00 2001 +From: Gwenhael Goavec-Merou +Date: Thu, 25 Jun 2020 16:46:34 +0200 +Subject: [PATCH] gr-osmosdr: fix build with boost > 1.73.0 + +boost/detail/endian.hpp has been marked as deprecated since boost 1.69.0. +This file and boost/predef/detail/endian_compat.h are no more available. + +This patch suppress this header in some file, where not needed and move +to correct header and new constants. It's retrocompatible for at least all boost release > 1.69.0 + +[Upstream status: http://lists.osmocom.org/pipermail/osmocom-sdr/2020-June/002080.html] + +Signed-off-by: Gwenhael Goavec-Merou +--- + lib/airspy/airspy_source_c.cc | 1 - + lib/airspyhf/airspyhf_source_c.cc | 1 - + lib/hackrf/hackrf_source_c.cc | 6 +++--- + lib/rtl/rtl_source_c.cc | 1 - + 4 files changed, 3 insertions(+), 6 deletions(-) + +diff --git a/lib/airspy/airspy_source_c.cc b/lib/airspy/airspy_source_c.cc +index 50150e5..f833588 100644 +--- a/lib/airspy/airspy_source_c.cc ++++ b/lib/airspy/airspy_source_c.cc +@@ -33,7 +33,6 @@ + + #include + #include +-#include + #include + #include + +diff --git a/lib/airspyhf/airspyhf_source_c.cc b/lib/airspyhf/airspyhf_source_c.cc +index 327fe19..b7494a8 100644 +--- a/lib/airspyhf/airspyhf_source_c.cc ++++ b/lib/airspyhf/airspyhf_source_c.cc +@@ -33,7 +33,6 @@ + + #include + #include +-#include + #include + #include + +diff --git a/lib/hackrf/hackrf_source_c.cc b/lib/hackrf/hackrf_source_c.cc +index eea5caa..fc48171 100644 +--- a/lib/hackrf/hackrf_source_c.cc ++++ b/lib/hackrf/hackrf_source_c.cc +@@ -31,7 +31,7 @@ + #include + #include + +-#include ++#include + + #include + +@@ -90,10 +90,10 @@ hackrf_source_c::hackrf_source_c (const std::string &args) + + // 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 --git a/lib/rtl/rtl_source_c.cc b/lib/rtl/rtl_source_c.cc +index a371464..7f2e648 100644 +--- a/lib/rtl/rtl_source_c.cc ++++ b/lib/rtl/rtl_source_c.cc +@@ -32,7 +32,6 @@ + + #include + #include +-#include + #include + + #include +-- +2.27.0 +