[med-svn] [Git][med-team/pplacer][master] Fix Build issues with OCaml 5.2.0

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Med / pplacer


Commits:
89cf5fc2 by Andreas Tille at 2024-12-13T17:02:34+01:00
Fix Build issues with OCaml 5.2.0

* Fix Build issues with OCaml 5.2.0
   - Use -Wno-incompatible-pointer-types
   - Fix misleading indentation

- - - - -


4 changed files:

- debian/changelog
- + debian/patches/misleading-indentation.patch
- + debian/patches/no-incompatible-pointer-types.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+pplacer (1.1~alpha19-9) UNRELEASED; urgency=medium
+
+  * Fix Build issues with OCaml 5.2.0 
+     - Use -Wno-incompatible-pointer-types
+     - Fix misleading indentation
+
+ -- Andreas Tille <tille at debian.org>  Fri, 13 Dec 2024 16:59:47 +0100
+
 pplacer (1.1~alpha19-8) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/patches/misleading-indentation.patch
=====================================
@@ -0,0 +1,16 @@
+Description: Fix Build issues with OCaml 5.2.0: Fix misleading indentation
+Author: Andreas Tille <tille at debian.org>
+Bug-Debian: https://bugs.debian.org/1074546
+Last-Update: 2024-12-13
+
+--- a/cdd_src/cddlib.c
++++ b/cdd_src/cddlib.c
+@@ -114,7 +114,7 @@ void dd_DDMain(dd_ConePtr cone)
+     }
+     if (!cone->PreOrderedRun){
+       for (itemp=1; cone->OrderVector[itemp]!=hh; itemp++);
+-        otemp=cone->OrderVector[cone->Iteration];
++      otemp=cone->OrderVector[cone->Iteration];
+       cone->OrderVector[cone->Iteration]=hh;
+         /* store the dynamic ordering in ordervec */
+       cone->OrderVector[itemp]=otemp;


=====================================
debian/patches/no-incompatible-pointer-types.patch
=====================================
@@ -0,0 +1,15 @@
+Description: Fix Build issues with OCaml 5.2.0: Use -Wno-incompatible-pointer-types
+Author: Andreas Tille <tille at debian.org>
+Bug-Debian: https://bugs.debian.org/1074546
+Last-Update: 2024-12-13
+
+--- a/myocamlbuild.ml
++++ b/myocamlbuild.ml
+@@ -202,6 +202,7 @@ let _ = dispatch begin function
+         A"-ccopt"; A"-funroll-loops";
+         A"-ccopt"; A"-O3";
+         A"-ccopt"; A"-fPIC";
++        A"-ccopt"; A"-Wno-incompatible-pointer-types";
+       ]);
+ 
+     flag ["compile"; "c"; "debug"]


=====================================
debian/patches/series
=====================================
@@ -6,3 +6,5 @@ spelling.patch
 ocaml-batteries.patch
 PR-337.patch
 fix_ocaml_build_error_List.min.patch
+no-incompatible-pointer-types.patch
+misleading-indentation.patch



View it on GitLab: https://salsa.debian.org/med-team/pplacer/-/commit/89cf5fc25aeda7a4233719a2ddec0fa185fc6241

-- 
View it on GitLab: https://salsa.debian.org/med-team/pplacer/-/commit/89cf5fc25aeda7a4233719a2ddec0fa185fc6241
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/20241213/3584200e/attachment-0001.htm>