0002-Fix-build-with-GCC-13-add-missing-cstdint-include.patch 3.9 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117
  1. From 3acf784e988608cbce34cd0be0a8703ba53ea515 Mon Sep 17 00:00:00 2001
  2. From: Sam James <sam@gentoo.org>
  3. Date: Tue, 3 Jan 2023 23:04:52 +0000
  4. Subject: [PATCH] Fix build with GCC 13 (add missing <cstdint> include)
  5. GCC 13 (as usual for new compiler releases) shuffles around some
  6. internal includes and so <cstdint> is no longer transitively included.
  7. Explicitly include <cstdint> for uint8_t.
  8. ```
  9. /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
  10. 43 | static const uint32_t DEFAULT_NOC_ID = 0xFFFFFFFF;
  11. | ^~~~~~~~
  12. /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 '<cstdint>'; did you forget to '#include <cstdint>'?
  13. +++ |+#include <cstdint>
  14. 1 | //
  15. ```
  16. Signed-off-by: Sam James <sam@gentoo.org>
  17. Upstream: https://github.com/EttusResearch/uhd/commit/3acf784e988608cbce34cd0be0a8703ba53ea515
  18. Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  19. ---
  20. host/include/uhd/cal/database.hpp | 1 +
  21. host/include/uhd/rfnoc/defaults.hpp | 1 +
  22. host/include/uhd/types/eeprom.hpp | 1 +
  23. host/include/uhd/usrp/zbx_tune_map_item.hpp | 1 +
  24. host/lib/usrp/dboard/magnesium/magnesium_constants.hpp | 1 +
  25. host/lib/usrp/dboard/rhodium/rhodium_constants.hpp | 1 +
  26. host/lib/utils/serial_number.cpp | 1 +
  27. 7 files changed, 7 insertions(+)
  28. diff --git a/host/include/uhd/cal/database.hpp b/host/include/uhd/cal/database.hpp
  29. index b6abbb6df7..9d47febedd 100644
  30. --- a/host/include/uhd/cal/database.hpp
  31. +++ b/host/include/uhd/cal/database.hpp
  32. @@ -8,6 +8,7 @@
  33. #include <uhd/config.hpp>
  34. #include <stddef.h>
  35. +#include <cstdint>
  36. #include <string>
  37. #include <vector>
  38. #include <functional>
  39. diff --git a/host/include/uhd/rfnoc/defaults.hpp b/host/include/uhd/rfnoc/defaults.hpp
  40. index aa7778aacf..6c878a8d70 100644
  41. --- a/host/include/uhd/rfnoc/defaults.hpp
  42. +++ b/host/include/uhd/rfnoc/defaults.hpp
  43. @@ -8,6 +8,7 @@
  44. #pragma once
  45. +#include <cstdint>
  46. #include <string>
  47. namespace uhd { namespace rfnoc {
  48. diff --git a/host/include/uhd/types/eeprom.hpp b/host/include/uhd/types/eeprom.hpp
  49. index 3a7605d3cb..420440aa64 100644
  50. --- a/host/include/uhd/types/eeprom.hpp
  51. +++ b/host/include/uhd/types/eeprom.hpp
  52. @@ -6,6 +6,7 @@
  53. #pragma once
  54. +#include <cstdint>
  55. #include <map>
  56. #include <string>
  57. #include <vector>
  58. diff --git a/host/include/uhd/usrp/zbx_tune_map_item.hpp b/host/include/uhd/usrp/zbx_tune_map_item.hpp
  59. index e49f49f785..ce95623de2 100644
  60. --- a/host/include/uhd/usrp/zbx_tune_map_item.hpp
  61. +++ b/host/include/uhd/usrp/zbx_tune_map_item.hpp
  62. @@ -6,6 +6,7 @@
  63. #pragma once
  64. #include <uhd/config.hpp>
  65. +#include <cstdint>
  66. #include <cstring>
  67. #include <string>
  68. #include <vector>
  69. diff --git a/host/lib/usrp/dboard/magnesium/magnesium_constants.hpp b/host/lib/usrp/dboard/magnesium/magnesium_constants.hpp
  70. index 99f2b910c6..99f5a4933f 100644
  71. --- a/host/lib/usrp/dboard/magnesium/magnesium_constants.hpp
  72. +++ b/host/lib/usrp/dboard/magnesium/magnesium_constants.hpp
  73. @@ -9,6 +9,7 @@
  74. #include <uhd/types/ranges.hpp>
  75. #include <cstddef>
  76. +#include <cstdint>
  77. #include <string>
  78. #include <vector>
  79. diff --git a/host/lib/usrp/dboard/rhodium/rhodium_constants.hpp b/host/lib/usrp/dboard/rhodium/rhodium_constants.hpp
  80. index 591d02d305..1577e02d9e 100644
  81. --- a/host/lib/usrp/dboard/rhodium/rhodium_constants.hpp
  82. +++ b/host/lib/usrp/dboard/rhodium/rhodium_constants.hpp
  83. @@ -9,6 +9,7 @@
  84. #include <array>
  85. #include <cstddef>
  86. +#include <cstdint>
  87. #include <string>
  88. #include <vector>
  89. diff --git a/host/lib/utils/serial_number.cpp b/host/lib/utils/serial_number.cpp
  90. index 61296a9139..c07730e24d 100644
  91. --- a/host/lib/utils/serial_number.cpp
  92. +++ b/host/lib/utils/serial_number.cpp
  93. @@ -5,6 +5,7 @@
  94. //
  95. #include <uhdlib/utils/serial_number.hpp>
  96. +#include <cstdint>
  97. #include <stdexcept>
  98. #include <string>