Package: uhd
Version: 4.1.0.4-3
Followup-For: Bug #1000790
User: [email protected]
Usertags: origin-ubuntu jammy ubuntu-patch
Control: tags -1 patch
Hi Maitland,
It seems uhd 4.1.0.4-3 included a change that was intended to fix this
specific build failure, but the fix was incomplete.
Please find attached a debdiff which fixes the remaining references to
-march=native. It has been uploaded to Ubuntu, where it's confirmed to fix
the build failure on ppc64el:
https://launchpad.net/ubuntu/+source/uhd/4.1.0.4-3ubuntu1/+build/22596389
Thanks for considering,
--
Steve Langasek Give me a lever long enough and a Free OS
Debian Developer to set it on, and I can move the world.
Ubuntu Developer https://www.debian.org/
[email protected] [email protected]
diff -Nru uhd-4.1.0.4/debian/patches/cmake-check-march
uhd-4.1.0.4/debian/patches/cmake-check-march
--- uhd-4.1.0.4/debian/patches/cmake-check-march 2021-12-05
13:07:56.000000000 -0800
+++ uhd-4.1.0.4/debian/patches/cmake-check-march 2021-12-06
18:14:37.000000000 -0800
@@ -9,10 +9,10 @@
host/lib/transport/uhd-dpdk/CMakeLists.txt | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
-diff --git a/host/lib/transport/uhd-dpdk/CMakeLists.txt
b/host/lib/transport/uhd-dpdk/CMakeLists.txt
-index c19fcae78..a709f0761 100644
---- a/host/lib/transport/uhd-dpdk/CMakeLists.txt
-+++ b/host/lib/transport/uhd-dpdk/CMakeLists.txt
+Index: uhd-4.1.0.4/host/lib/transport/uhd-dpdk/CMakeLists.txt
+===================================================================
+--- uhd-4.1.0.4.orig/host/lib/transport/uhd-dpdk/CMakeLists.txt
++++ uhd-4.1.0.4/host/lib/transport/uhd-dpdk/CMakeLists.txt
@@ -10,8 +10,12 @@
if(ENABLE_DPDK)
if(NOT DEFINED UHD_DPDK_CFLAGS)
@@ -27,6 +27,16 @@
message(STATUS "DPDK: Using default UHD_DPDK_CFLAGS="
${UHD_DPDK_CFLAGS})
endif(NOT DEFINED UHD_DPDK_CFLAGS)
---
-2.30.2
-
+Index: uhd-4.1.0.4/host/tests/CMakeLists.txt
+===================================================================
+--- uhd-4.1.0.4.orig/host/tests/CMakeLists.txt
++++ uhd-4.1.0.4/host/tests/CMakeLists.txt
+@@ -196,7 +196,7 @@
+ ${CMAKE_SOURCE_DIR}/lib/transport/uhd-dpdk/dpdk_common.cpp
+ ${CMAKE_SOURCE_DIR}/lib/transport/uhd-dpdk/dpdk_io_service.cpp
+ ${CMAKE_SOURCE_DIR}/lib/transport/udp_dpdk_link.cpp
+- PROPERTIES COMPILE_FLAGS "-march=native -D_GNU_SOURCE"
++ PROPERTIES COMPILE_FLAGS "${UHD_DPDK_CFLAGS} -D_GNU_SOURCE"
+ )
+ ENDIF(ENABLE_DPDK)
+
