From patchwork Mon Nov 22 13:57:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gwenhael Goavec-Merou X-Patchwork-Id: 1558086 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=buildroot.org (client-ip=2605:bc80:3010::133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HyTPc59XSz9sRR for ; Tue, 23 Nov 2021 00:58:12 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id E47884012A; Mon, 22 Nov 2021 13:58:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id LUoNKZzQGlwm; Mon, 22 Nov 2021 13:58:05 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id C8D0C40198; Mon, 22 Nov 2021 13:58:04 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 7A4EC1BF324 for ; Mon, 22 Nov 2021 13:58:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 75B6D40198 for ; Mon, 22 Nov 2021 13:58:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id enUPefTkjFQ0 for ; Mon, 22 Nov 2021 13:58:01 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from smtp6-g21.free.fr (smtp6-g21.free.fr [212.27.42.6]) by smtp2.osuosl.org (Postfix) with ESMTPS id D9CAB4012A for ; Mon, 22 Nov 2021 13:58:00 +0000 (UTC) Received: from localhost.localdomain (unknown [78.252.129.8]) by smtp6-g21.free.fr (Postfix) with ESMTP id 74730780316; Mon, 22 Nov 2021 14:57:57 +0100 (CET) From: Gwenhael Goavec-Merou To: buildroot@buildroot.org Date: Mon, 22 Nov 2021 14:57:37 +0100 Message-Id: <20211122135737.1784748-1-gwenj@trabucayre.com> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v3] package/uhd: fix usrp2 build with boost 1.77.0 X-BeenThere: buildroot@buildroot.org 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 , "Yann E . MORIN" Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" From: Gwenhael Goavec-Merou Fix build failure: uhd-3.15.0.0/host/lib/usrp/usrp2/usrp2_impl.cpp:847:29: error: 'boost::math' has not been declared for boost::math::sign and boost::math::iround Backport and adapt commits: - 3796175f32f0cc24c16809d8175d423bc7053de9 - d1c6290fe9c8b01068abfca6f272e2a1e031b9de Fixes: - http://autobuild.buildroot.net/results/aa2bd1fbe1b4880aa8de389238380a3d35f80b53/ - http://autobuild.buildroot.net/results/22b022f360d0f0f23161bc279b736e6a80f87c1a/ - http://autobuild.buildroot.net/results/f65ea915509a8669c624ddab85e76576c8522005/ Signed-off-by: Gwenhael Goavec-Merou --- Changes v2 -> v3: - fix patches Changes v1 -> v2: - backport the two commits in separate patches (Yann) - add SoB and backport info (Yann) --- ...ost-math-iround-math-sign-with-std-l.patch | 58 +++++++++++++++++++ ...explicit-template-type-for-std-min-T.patch | 28 +++++++++ 2 files changed, 86 insertions(+) create mode 100644 package/uhd/0006-usrp2-Replace-boost-math-iround-math-sign-with-std-l.patch create mode 100644 package/uhd/0007-usrp2-Use-explicit-template-type-for-std-min-T.patch diff --git a/package/uhd/0006-usrp2-Replace-boost-math-iround-math-sign-with-std-l.patch b/package/uhd/0006-usrp2-Replace-boost-math-iround-math-sign-with-std-l.patch new file mode 100644 index 0000000000..09869da61b --- /dev/null +++ b/package/uhd/0006-usrp2-Replace-boost-math-iround-math-sign-with-std-l.patch @@ -0,0 +1,58 @@ +From 3796175f32f0cc24c16809d8175d423bc7053de9 Mon Sep 17 00:00:00 2001 +From: StefanBruens +Date: Wed, 5 May 2021 18:24:58 +0200 +Subject: [PATCH 003/121] usrp2: Replace boost::math::iround/math::sign with +std::lround + +Instead of multiplying zone with the sign repeatedly just make +the zone a signed value. + +See #437, #438 + +Signed-off-by: Aaron Rossetto +[gwenhael.goavec-merou@trabucayre.com: backport from upstream] +Signed-off-by: Gwenhael Goavec-Merou +--- + host/lib/usrp/usrp2/usrp2_impl.cpp | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/host/lib/usrp/usrp2/usrp2_impl.cpp b/host/lib/usrp/usrp2/usrp2_impl.cpp +index 1be4c7339..c0719a316 100644 +--- a/host/lib/usrp/usrp2/usrp2_impl.cpp ++++ b/host/lib/usrp/usrp2/usrp2_impl.cpp +@@ -22,6 +22,7 @@ + #include + #include //used for htonl and ntohl + #include ++#include + + using namespace uhd; + using namespace uhd::usrp; +@@ -844,20 +845,19 @@ double usrp2_impl::set_tx_dsp_freq( + _tree->access("/mboards/"+mb+"/tick_rate").get(); + + //calculate the DAC shift (multiples of rate) +- const int sign = boost::math::sign(new_freq); +- const int zone = std::min(boost::math::iround(new_freq/tick_rate), 2); +- const double dac_shift = sign*zone*tick_rate; ++ const int zone = std::max(std::min(std::lround(new_freq / tick_rate), 2), -2); ++ const double dac_shift = zone * tick_rate; + new_freq -= dac_shift; //update FPGA DSP target freq + UHD_LOG_TRACE("USRP2", + "DSP Tuning: Requested " + std::to_string(freq_/1e6) + " MHz, Using " +- "Nyquist zone " + std::to_string(sign*zone) + ", leftover DSP tuning: " ++ "Nyquist zone " + std::to_string(zone) + ", leftover DSP tuning: " + + std::to_string(new_freq/1e6) + " MHz."); + + //set the DAC shift (modulation mode) + if (zone == 0) { + _mbc[mb].codec->set_tx_mod_mode(0); //no shift + } else { +- _mbc[mb].codec->set_tx_mod_mode(sign*4/zone); //DAC interp = 4 ++ _mbc[mb].codec->set_tx_mod_mode(4 / zone); // DAC interp = 4 + } + + return _mbc[mb].tx_dsp->set_freq(new_freq) + dac_shift; //actual freq +-- +2.32.0 + diff --git a/package/uhd/0007-usrp2-Use-explicit-template-type-for-std-min-T.patch b/package/uhd/0007-usrp2-Use-explicit-template-type-for-std-min-T.patch new file mode 100644 index 0000000000..3da8370153 --- /dev/null +++ b/package/uhd/0007-usrp2-Use-explicit-template-type-for-std-min-T.patch @@ -0,0 +1,28 @@ +From d1c6290fe9c8b01068abfca6f272e2a1e031b9de Mon Sep 17 00:00:00 2001 +From: StefanBruens +Date: Wed, 5 May 2021 18:49:40 +0200 +Subject: [PATCH 004/121] usrp2: Use explicit template type for std::min + +Signed-off-by: Aaron Rossetto +[gwenhael.goavec-merou@trabucayre.com: backport from upstream] +Signed-off-by: Gwenhael Goavec-Merou +--- + host/lib/usrp/usrp2/usrp2_impl.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/host/lib/usrp/usrp2/usrp2_impl.cpp b/host/lib/usrp/usrp2/usrp2_impl.cpp +index 59fd9849c..e82a9fa71 100644 +--- a/host/lib/usrp/usrp2/usrp2_impl.cpp ++++ b/host/lib/usrp/usrp2/usrp2_impl.cpp +@@ -845,7 +845,7 @@ double usrp2_impl::set_tx_dsp_freq( + _tree->access("/mboards/"+mb+"/tick_rate").get(); + + //calculate the DAC shift (multiples of rate) +- const int zone = std::max(std::min(std::lround(new_freq / tick_rate), 2), -2); ++ const int zone = std::max(std::min(std::lround(new_freq / tick_rate), 2), -2); + const double dac_shift = zone * tick_rate; + new_freq -= dac_shift; //update FPGA DSP target freq + UHD_LOG_TRACE("USRP2", +-- +2.32.0 +