[med-svn] [Git][med-team/tree-puzzle][master] 3 commits: Fix FTCBFS: uses mpicc Closes: #1106704

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Med / tree-puzzle


Commits:
1e314688 by Andreas Tille at 2025-12-07T20:54:50+01:00
Fix FTCBFS: uses mpicc Closes: #1106704

- - - - -
8e2d6032 by Andreas Tille at 2025-12-07T21:05:11+01:00
d/watch: version=5

- - - - -
ba1c101e by Andreas Tille at 2025-12-07T21:09:01+01:00
Make the build reproducible Closes: #1108273

- - - - -


5 changed files:

- debian/changelog
- + debian/patches/cross.patch
- debian/patches/series
- debian/rules
- debian/watch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,18 @@
+tree-puzzle (5.3~rc16+dfsg-13) UNRELEASED; urgency=medium
+
+  [ Helmut Grohne ]
+  * Fix FTCBFS: uses mpicc
+    Closes: #1106704
+
+  [ Chris Lamb ]
+  * Make the build reproducible
+    Closes: #1108273
+
+  [ Andreas Tille ]
+  * d/watch: version=5
+
+ -- Andreas Tille <tille at debian.org>  Sun, 07 Dec 2025 20:49:45 +0100
+
 tree-puzzle (5.3~rc16+dfsg-12) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/patches/cross.patch
=====================================
@@ -0,0 +1,40 @@
+Author: Helmut Grohne <helmut at subdivi.de>
+Bug-Debian: https://bugs.debian.org/1106704
+Description: Fix FTCBFS: uses mpicc
+Last-Update: 2025-05-28
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -91,6 +91,12 @@ dnl fi
+  fi
+  fi ])
+ 
++PKG_CHECK_MODULES([MPI_C],[mpi-c],[
++  MPICC="$CC"
++  MPILIBS="$MPI_C_LIBS"
++  PPUZZLE=ppuzzle
++],[
++
+ if test  "$MPICC" != ""  ; then
+   AC_PATH_PROG(MPICC0, $MPICC)
+ fi
+@@ -111,6 +117,8 @@ AC_TEST_MPICC($MPICC6)
+ 
+ ac_cv_prog_MPICC=$MPICC
+ 
++])
++
+ dnl  ---------------------------------------------------------------------
+ dnl   Test function to test whether the compiler handles quotes correctly
+ dnl  ---------------------------------------------------------------------
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -66,7 +66,7 @@ ppuzzle_LDADD = pgamma.$(OBJEXT) pml1.$(
+ 
+ PCC = @MPICC@
+ PDEFS = -DPARALLEL
+-PCFLAGS = 
++PCFLAGS = @MPI_C_CFLAGS@
+ PLDFLAGS = 
+ PLDLIBS = -lsprng @LIBS@ @MPILIBS@
+ 


=====================================
debian/patches/series
=====================================
@@ -8,3 +8,4 @@ reduce_decimals_for_testing.patch
 add-failsafe-for-ut-prottest.patch
 fix-conftest.patch
 preserve-artifacts.patch
+cross.patch


=====================================
debian/rules
=====================================
@@ -34,6 +34,7 @@ override_dh_install-arch:
 execute_before_dh_installexamples:
 	# Don't install output generated by tests, some of which is nodeterminstic
 	$(MAKE) -C tests clean
+	rm -f tests/test-suite.log
 
 override_dh_fixperms:
 	dh_fixperms


=====================================
debian/watch
=====================================
@@ -1,4 +1,7 @@
-version=4
+Version: 5
 
-opts="repacksuffix=+dfsg,dversionmangle=auto,repack,compression=xz" \
- http://www.tree-puzzle.de/tree-puzzle-([.0-9]*)\.tar\.gz
+Source: http://www.tree-puzzle.de/
+Matching-Pattern: @PACKAGE at -([.0-9rc]+)@ARCHIVE_EXT@
+Repack-Suffix: +dfsg
+Dversion-Mangle: auto
+Uversion-Mangle: s/\.rc/~rc/



View it on GitLab: https://salsa.debian.org/med-team/tree-puzzle/-/compare/fe3d984cc533005b649ea8deec44292af201157a...ba1c101e053da529e858c657d08a9aa569702146

-- 
View it on GitLab: https://salsa.debian.org/med-team/tree-puzzle/-/compare/fe3d984cc533005b649ea8deec44292af201157a...ba1c101e053da529e858c657d08a9aa569702146
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20251207/d7f00cc6/attachment-0001.htm>