I updated the NMU to handle an extra HPPA CPU string found on a build
daemon.  This is the updated patch.

--- linuxcnc-2.9.0~pre0+git20221105.ffb6bda926/debian/changelog 2022-11-06 
03:48:00.000000000 +0100
+++ linuxcnc-2.9.0~pre0+git20221105.ffb6bda926-nmu/debian/changelog     
2022-11-08 22:39:48.431085361 +0100
@@ -1,3 +1,19 @@
+linuxcnc (2.9.0~pre0+git20221105.ffb6bda926-1.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Updated 0010-arm-hppa.patch from upstream to handle hppa1.1 cpu and to
+    exit build earlier if libboost-python is not found.
+
+ -- Petter Reinholdtsen <p...@debian.org>  Tue, 08 Nov 2022 22:38:32 +0100
+
+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-nmu/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-nmu/debian/patches/0010-arm-hppa.patch
   2022-11-08 22:38:05.358652658 +0100
@@ -0,0 +1,85 @@
+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.
+
+Index: linuxcnc-2.9.0~pre0+git20221105.ffb6bda926-nmu/src/m4/ax_boost_base.m4
+===================================================================
+--- 
linuxcnc-2.9.0~pre0+git20221105.ffb6bda926-nmu.orig/src/m4/ax_boost_base.m4     
   2022-11-08 22:36:16.390194781 +0100
++++ linuxcnc-2.9.0~pre0+git20221105.ffb6bda926-nmu/src/m4/ax_boost_base.m4     
2022-11-08 22:37:58.154622401 +0100
+@@ -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 @@
+     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}"],
++      [hppa1.1|hppa64],[multiarch_libsubdir="lib/hppa-${host_os}"],
+       [multiarch_libsubdir="lib/${host_cpu}-${host_os}"]
+     )
+ 
+Index: linuxcnc-2.9.0~pre0+git20221105.ffb6bda926-nmu/src/configure.ac
+===================================================================
+--- linuxcnc-2.9.0~pre0+git20221105.ffb6bda926-nmu.orig/src/configure.ac       
2022-10-23 18:28:59.000000000 +0200
++++ linuxcnc-2.9.0~pre0+git20221105.ffb6bda926-nmu/src/configure.ac    
2022-11-08 22:37:58.154622401 +0100
+@@ -112,6 +112,7 @@
+   ])
+ ])
+ 
++DEPFOUND=true
+ 
+ ##############################################################################
+ # Section 2                                                                  #
+@@ -1001,7 +1002,11 @@
+ AX_PYTHON
+ AC_PATH_PROG(PYTHON,[$PYTHON_BIN])
+ AX_PYTHON_DEVEL(,,AC_MSG_ERROR([python-dev not found]))
+-AX_BOOST_PYTHON(,,AC_MSG_ERROR([libboost-python not found]))
++AX_BOOST_PYTHON()
++if test "x" = "x$BOOST_PYTHON_LIB"; then
++    AC_MSG_NOTICE([error: libboost-python not found])
++    DEPFOUND=false
++fi
+ 
+ AC_MSG_CHECKING([whether to build documentation])
+ AC_ARG_ENABLE(build-documentation,
+@@ -1744,8 +1749,12 @@
+ echo "#   GPL.  Check out http://www.linuxcnc.org/ for more details.       #"
+ echo "#                                                                    #"
+ echo "#                                                                    #"
+-echo "#   It seems that ./configure completed successfully.                #"
+-echo "#   This means that RT is properly installed                         #"
++if $DEPFOUND ; then
++  echo "#   It seems that ./configure completed successfully.                
#"
++  echo "#   This means that RT is properly installed                         
#"
++else
++  echo "#   It seems that ./configure detected a problem.                    
#"
++fi
+ echo "#   If things don't work check config.log for errors & warnings      #"
+ echo "#                                                                    #"
+ 
+@@ -1780,3 +1789,5 @@
+ echo "######################################################################"
+ echo ""
+ echo ""
++
++$DEPFOUND

Reply via email to