Stéphane Glondu pushed to branch debian/experimental at Debian OCaml Maintainers / ocaml
Commits: e1655a80 by Stéphane Glondu at 2026-06-29T20:31:54+02:00 Avoid static assertion failure on m68k - - - - - 685e2540 by Stéphane Glondu at 2026-07-02T07:25:03+02:00 Define PATH_MAX if undefined (e.g. on Hurd) - - - - - 465d5e93 by Stéphane Glondu at 2026-07-02T07:33:15+02:00 Update changelog and prepare upload to experimental - - - - - 4 changed files: - debian/changelog - + debian/patches/Avoid-static-assertion-failure-on-m68k.patch - + debian/patches/Define-PATH_MAX-if-undefined-e.g.-on-Hurd.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +ocaml (5.5.0-1~exp2) experimental; urgency=medium + + * Avoid static assertion failure on m68k + * Define PATH_MAX if undefined (e.g. on Hurd) + + -- Stéphane Glondu <[email protected]> Thu, 02 Jul 2026 07:33:10 +0200 + ocaml (5.5.0-1~exp1) experimental; urgency=medium * New upstream release ===================================== debian/patches/Avoid-static-assertion-failure-on-m68k.patch ===================================== @@ -0,0 +1,21 @@ +From: =?utf-8?q?St=C3=A9phane_Glondu?= <[email protected]> +Date: Mon, 29 Jun 2026 20:31:36 +0200 +Subject: Avoid static assertion failure on m68k + +--- + runtime/shared_heap.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/runtime/shared_heap.c b/runtime/shared_heap.c +index 69ccd24..0894441 100644 +--- a/runtime/shared_heap.c ++++ b/runtime/shared_heap.c +@@ -50,7 +50,7 @@ typedef struct pool { + struct pool* next; + value* next_obj; + caml_domain_state* owner; +- sizeclass sz; ++ union { sizeclass sz; value fill; }; + } pool; + static_assert(sizeof(pool) == Bsize_wsize(POOL_HEADER_WSIZE), ""); + #define POOL_SLAB_WOFFSET(sz) (POOL_HEADER_WSIZE + wastage_sizeclass[sz]) ===================================== debian/patches/Define-PATH_MAX-if-undefined-e.g.-on-Hurd.patch ===================================== @@ -0,0 +1,24 @@ +From: =?utf-8?q?St=C3=A9phane_Glondu?= <[email protected]> +Date: Thu, 2 Jul 2026 05:20:34 +0100 +Subject: Define PATH_MAX if undefined (e.g. on Hurd) + +--- + stdlib/header.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/stdlib/header.c b/stdlib/header.c +index e42f9f7..2e5ad4e 100644 +--- a/stdlib/header.c ++++ b/stdlib/header.c +@@ -155,6 +155,11 @@ NORETURN static void exit_with_error(const wchar_t *wstr1, + #include <sys/types.h> + #include <sys/stat.h> + ++/* hurd does not have PATH_MAX defined */ ++#if !defined(PATH_MAX) ++#define PATH_MAX 4096 ++#endif ++ + /* O_BINARY is defined in Gnulib, but is not POSIX */ + #ifndef O_BINARY + #define O_BINARY 0 ===================================== debian/patches/series ===================================== @@ -5,3 +5,5 @@ Use-CCLINKFLAGS-for-linking-all-executables-and-shar.patch Mark-test_compact_manydomains-as-multicore.patch Compile-utils-config.-cmi-cmx-with-opaque.patch Print-.cmi-flags-in-objinfo.patch +Avoid-static-assertion-failure-on-m68k.patch +Define-PATH_MAX-if-undefined-e.g.-on-Hurd.patch View it on GitLab: https://salsa.debian.org/ocaml-team/ocaml/-/compare/7d93643fa312ea382e5d2207f68550a2a7ed9bee...465d5e93099ce4240eb4360fe7f176dbf4a0a0c9 -- View it on GitLab: https://salsa.debian.org/ocaml-team/ocaml/-/compare/7d93643fa312ea382e5d2207f68550a2a7ed9bee...465d5e93099ce4240eb4360fe7f176dbf4a0a0c9 You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
