Package: linuxcnc-uspace
Severity: wishlist

I have just uploaded the following non-maintainer upload to fix the
build errors on arm and hppa blocking migration to testing.

--- linuxcnc-2.9.0~pre0+git20221105.ffb6bda926/debian/changelog 2022-11-06 
03:48:00.000000000 +0100
+++ linuxcnc-2.9.0~pre0+git20221105.ffb6bda926-new/debian/changelog     
2022-11-08 10:23:04.376991851 +0100
@@ -1,3 +1,11 @@
+linuxcnc (2.9.0~pre0+git20221105.ffb6bda926-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Added 0010-arm-hppa.patch from upstream to fix build failures on armv8l
+    and hppa64 CPU build daemons.
+
+ -- Petter Reinholdtsen <p...@debian.org>  Tue, 08 Nov 2022 09:55:13 +0100
+
 linuxcnc (2.9.0~pre0+git20221105.ffb6bda926-1) unstable; urgency=medium
 
   * New upstream version 2.9.0~pre0+git20221105.ffb6bda926
--- /dev/null   2022-11-05 21:32:50.228001479 +0100
+++ linuxcnc-2.9.0~pre0+git20221105.ffb6bda926-new/debian/patches/series        
2022-11-08 10:23:10.981029985 +0100
@@ -0,0 +1 @@
+0010-arm-hppa.patch
--- /dev/null   2022-11-05 21:32:50.228001479 +0100
+++ 
linuxcnc-2.9.0~pre0+git20221105.ffb6bda926-new/debian/patches/0010-arm-hppa.patch
   2022-11-08 10:23:10.977029962 +0100
@@ -0,0 +1,39 @@
+commit 37cc349c296e04fe274574210dbafcc3ad755c18
+Author: Petter Reinholdtsen <p...@hungry.com>
+Date:   Mon Nov 7 14:53:44 2022 +0100
+
+    Fix boost python detection on arm and hppa in ax_boost_base.m4.
+    
+    This should fix the failing build on Debian.
+    
+    Also reintroduce a typo fix in the file header that was lost in a recent
+    upgrade of the file version.
+    
+    The change has been emailed Thomas Porschberg to get it upstream.  Not sure
+    if it is going to work, as a comment on
+    <URL: http://randspringer.de/boost/index.html > make it sound like he want
+    to no longer maintain the file.
+
+diff --git a/src/m4/ax_boost_base.m4 b/src/m4/ax_boost_base.m4
+index 6c944b160f..b7d22d6701 100644
+--- a/src/m4/ax_boost_base.m4
++++ b/src/m4/ax_boost_base.m4
+@@ -10,7 +10,7 @@
+ #
+ #   Test for the Boost C++ libraries of a particular version (or newer)
+ #
+-#   If no path to the installed boost library is given the macro searchs
++#   If no path to the installed boost library is given the macro searches
+ #   under /usr, /usr/local, /opt, /opt/local and /opt/homebrew and evaluates
+ #   the $BOOST_ROOT environment variable. Further documentation is available
+ #   at <http://randspringer.de/boost/index.html>.
+@@ -123,7 +123,8 @@ AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[
+     dnl are almost assuredly the ones desired.
+     AS_CASE([${host_cpu}],
+       [i?86],[multiarch_libsubdir="lib/i386-${host_os}"],
+-      [armv7l],[multiarch_libsubdir="lib/arm-${host_os}"],
++      [armv?l],[multiarch_libsubdir="lib/arm-${host_os}"],
++      [hppa64],[multiarch_libsubdir="lib/hppa-${host_os}"],
+       [multiarch_libsubdir="lib/${host_cpu}-${host_os}"]
+     )
+ 

-- 
Happy hacking
Petter Reinholdtsen

Reply via email to