diff --git a/package/uhd/0002-Fix-build-with-GCC-13-add-missing-cstdint-include.patch b/package/uhd/0002-Fix-build-with-GCC-13-add-missing-cstdint-include.patch deleted file mode 100644 index acf720a15d..0000000000 --- a/package/uhd/0002-Fix-build-with-GCC-13-add-missing-cstdint-include.patch +++ /dev/null @@ -1,117 +0,0 @@ -From 3acf784e988608cbce34cd0be0a8703ba53ea515 Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Tue, 3 Jan 2023 23:04:52 +0000 -Subject: [PATCH] Fix build with GCC 13 (add missing include) - -GCC 13 (as usual for new compiler releases) shuffles around some -internal includes and so is no longer transitively included. - -Explicitly include for uint8_t. - -``` -/var/tmp/portage/net-wireless/uhd-4.3.0.0/work/uhd-4.3.0.0/host/include/uhd/rfnoc/defaults.hpp:43:14: error: 'uint32_t' does not name a type - 43 | static const uint32_t DEFAULT_NOC_ID = 0xFFFFFFFF; - | ^~~~~~~~ -/var/tmp/portage/net-wireless/uhd-4.3.0.0/work/uhd-4.3.0.0/host/include/uhd/rfnoc/defaults.hpp:1:1: note: 'uint32_t' is defined in header ''; did you forget to '#include '? - +++ |+#include - 1 | // -``` - -Signed-off-by: Sam James - -Upstream: https://github.com/EttusResearch/uhd/commit/3acf784e988608cbce34cd0be0a8703ba53ea515 -Signed-off-by: Fabrice Fontaine ---- - host/include/uhd/cal/database.hpp | 1 + - host/include/uhd/rfnoc/defaults.hpp | 1 + - host/include/uhd/types/eeprom.hpp | 1 + - host/include/uhd/usrp/zbx_tune_map_item.hpp | 1 + - host/lib/usrp/dboard/magnesium/magnesium_constants.hpp | 1 + - host/lib/usrp/dboard/rhodium/rhodium_constants.hpp | 1 + - host/lib/utils/serial_number.cpp | 1 + - 7 files changed, 7 insertions(+) - -diff --git a/host/include/uhd/cal/database.hpp b/host/include/uhd/cal/database.hpp -index b6abbb6df7..9d47febedd 100644 ---- a/host/include/uhd/cal/database.hpp -+++ b/host/include/uhd/cal/database.hpp -@@ -8,6 +8,7 @@ - - #include - #include -+#include - #include - #include - #include -diff --git a/host/include/uhd/rfnoc/defaults.hpp b/host/include/uhd/rfnoc/defaults.hpp -index aa7778aacf..6c878a8d70 100644 ---- a/host/include/uhd/rfnoc/defaults.hpp -+++ b/host/include/uhd/rfnoc/defaults.hpp -@@ -8,6 +8,7 @@ - - #pragma once - -+#include - #include - - namespace uhd { namespace rfnoc { -diff --git a/host/include/uhd/types/eeprom.hpp b/host/include/uhd/types/eeprom.hpp -index 3a7605d3cb..420440aa64 100644 ---- a/host/include/uhd/types/eeprom.hpp -+++ b/host/include/uhd/types/eeprom.hpp -@@ -6,6 +6,7 @@ - - #pragma once - -+#include - #include - #include - #include -diff --git a/host/include/uhd/usrp/zbx_tune_map_item.hpp b/host/include/uhd/usrp/zbx_tune_map_item.hpp -index e49f49f785..ce95623de2 100644 ---- a/host/include/uhd/usrp/zbx_tune_map_item.hpp -+++ b/host/include/uhd/usrp/zbx_tune_map_item.hpp -@@ -6,6 +6,7 @@ - - #pragma once - #include -+#include - #include - #include - #include -diff --git a/host/lib/usrp/dboard/magnesium/magnesium_constants.hpp b/host/lib/usrp/dboard/magnesium/magnesium_constants.hpp -index 99f2b910c6..99f5a4933f 100644 ---- a/host/lib/usrp/dboard/magnesium/magnesium_constants.hpp -+++ b/host/lib/usrp/dboard/magnesium/magnesium_constants.hpp -@@ -9,6 +9,7 @@ - - #include - #include -+#include - #include - #include - -diff --git a/host/lib/usrp/dboard/rhodium/rhodium_constants.hpp b/host/lib/usrp/dboard/rhodium/rhodium_constants.hpp -index 591d02d305..1577e02d9e 100644 ---- a/host/lib/usrp/dboard/rhodium/rhodium_constants.hpp -+++ b/host/lib/usrp/dboard/rhodium/rhodium_constants.hpp -@@ -9,6 +9,7 @@ - - #include - #include -+#include - #include - #include - -diff --git a/host/lib/utils/serial_number.cpp b/host/lib/utils/serial_number.cpp -index 61296a9139..c07730e24d 100644 ---- a/host/lib/utils/serial_number.cpp -+++ b/host/lib/utils/serial_number.cpp -@@ -5,6 +5,7 @@ - // - - #include -+#include - #include - #include - diff --git a/package/uhd/Config.in b/package/uhd/Config.in index 2ccfe3ccb8..58bf91c1df 100644 --- a/package/uhd/Config.in +++ b/package/uhd/Config.in @@ -1,9 +1,9 @@ -comment "uhd needs a toolchain w/ C++, NPTL, wchar, dynamic library, gcc >= 5" +comment "uhd needs a toolchain w/ C++, NPTL, wchar, dynamic library, gcc >= 7" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_5 + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 comment "uhd needs a toolchain not affected by GCC bug 64735" depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 @@ -17,7 +17,7 @@ config BR2_PACKAGE_UHD depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_USE_MMU # use fork() depends on BR2_USE_WCHAR # boost - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # boost-math + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 select BR2_PACKAGE_BOOST select BR2_PACKAGE_BOOST_ATOMIC select BR2_PACKAGE_BOOST_CHRONO @@ -37,24 +37,16 @@ if BR2_PACKAGE_UHD config BR2_PACKAGE_UHD_B100 bool "b100 support" - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_UHD_USB help enable B100 support -comment "B100 support needs a toolchain w/ gcc >= 4.9" - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 - config BR2_PACKAGE_UHD_B200 bool "b200 support" - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_UHD_USB help enable B200 support -comment "B200 support needs a toolchain w/ gcc >= 4.9" - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 - config BR2_PACKAGE_UHD_E300 bool "E300 support" select BR2_PACKAGE_UHD_MPMD @@ -115,24 +107,16 @@ config BR2_PACKAGE_UHD_PYTHON config BR2_PACKAGE_UHD_USB bool "USB support" - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_LIBUSB help enable UHD USB support -comment "USB support needs a toolchain w/ gcc >= 4.9" - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 - config BR2_PACKAGE_UHD_USRP1 bool "USRP1 support" - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb select BR2_PACKAGE_UHD_USB help enable USRP1 support -comment "USRP1 support needs a toolchain w/ gcc >= 4.9" - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 - config BR2_PACKAGE_UHD_USRP2 bool "USRP2 support" help diff --git a/package/uhd/uhd.hash b/package/uhd/uhd.hash index 3af1bc9251..3282da2ec7 100644 --- a/package/uhd/uhd.hash +++ b/package/uhd/uhd.hash @@ -1,5 +1,5 @@ # Locally calculated: -sha256 8695800d593c58b557cbf9905b02bbf65a74ca68674e8c8c8c28bb6e203635ad uhd-4.3.0.0.tar.gz +sha256 afe56842587ce72d6a57535a2b15c061905f0a039abcc9d79f0106f072a00d10 uhd-4.7.0.0.tar.gz sha256 94cc36ada2641d037980bf6c2418a750ac10a115ae11de5a5cda6177769dbd4c LICENSE.md sha256 70bf7e79c8cd73a81f97ce81745ea0719a617eebe299a61868165daeae71fff2 host/LICENSE sha256 206adc03412b6c5b71b9c9df9c1f2e60e11833e89393877d5031fd11d332b1d4 fpga/usrp3/LICENSE.md diff --git a/package/uhd/uhd.mk b/package/uhd/uhd.mk index a9d711acd4..52ea06a394 100644 --- a/package/uhd/uhd.mk +++ b/package/uhd/uhd.mk @@ -4,7 +4,7 @@ # ################################################################################ -UHD_VERSION = 4.3.0.0 +UHD_VERSION = 4.7.0.0 UHD_SITE = $(call github,EttusResearch,uhd,v$(UHD_VERSION)) UHD_LICENSE = GPL-3.0+, LGPL-3.0+ (fpga/usrp3) UHD_LICENSE_FILES = LICENSE.md host/LICENSE fpga/usrp3/LICENSE.md