diff -Nru ocaml-4.08.1/debian/changelog ocaml-4.08.1/debian/changelog --- ocaml-4.08.1/debian/changelog 2020-01-30 12:11:32.000000000 +0000 +++ ocaml-4.08.1/debian/changelog 2020-07-30 12:45:47.000000000 +0000 @@ -1,3 +1,23 @@ +ocaml (4.08.1-10) unstable; urgency=medium + + * Disable DT_TEXTREL warnings on i386 + * Unconditionally disable testpreempt test + + -- Stéphane Glondu Thu, 30 Jul 2020 14:45:47 +0200 + +ocaml (4.08.1-9) unstable; urgency=medium + + [ Stéphane Glondu ] + * Fix FTBFS with gcc-10 (Closes: #957623) + * Bump debhelper compat level to 13 + * Bump Standards-Version to 4.5.0 + + [ Ralf Treinen ] + * Replace suggestion of tuareg-mode, which is now a transitional package, + by elpa-tuareg. + + -- Stéphane Glondu Fri, 24 Jul 2020 16:51:04 +0200 + ocaml (4.08.1-8) unstable; urgency=medium * read_main_debug_info: do not die in -custom executables diff -Nru ocaml-4.08.1/debian/control ocaml-4.08.1/debian/control --- ocaml-4.08.1/debian/control 2020-01-30 12:11:32.000000000 +0000 +++ ocaml-4.08.1/debian/control 2020-07-30 12:45:47.000000000 +0000 @@ -8,15 +8,15 @@ Mehdi Dogguy , Ximin Luo Build-Depends: - debhelper-compat (= 12), + debhelper-compat (= 13), pkg-config, binutils-dev, libiberty-dev, libncurses5-dev, libx11-dev, zlib1g-dev, - dh-ocaml (>= 1.0.0~) -Standards-Version: 4.4.1 + dh-ocaml +Standards-Version: 4.5.0 Rules-Requires-Root: no Vcs-Git: https://salsa.debian.org/ocaml-team/ocaml.git Vcs-Browser: https://salsa.debian.org/ocaml-team/ocaml @@ -84,7 +84,7 @@ ${F:NativeProvides} Suggests: ocaml-doc, - tuareg-mode + elpa-tuareg Recommends: ocaml-man, file diff -Nru ocaml-4.08.1/debian/ocaml-base-nox.lintian-overrides ocaml-4.08.1/debian/ocaml-base-nox.lintian-overrides --- ocaml-4.08.1/debian/ocaml-base-nox.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ ocaml-4.08.1/debian/ocaml-base-nox.lintian-overrides 2020-07-30 12:45:47.000000000 +0000 @@ -0,0 +1,2 @@ +ocaml-base-nox: no-manual-page usr/bin/ocamlrund +ocaml-base-nox: no-manual-page usr/bin/ocamlruni diff -Nru ocaml-4.08.1/debian/ocaml-man.lintian-overrides ocaml-4.08.1/debian/ocaml-man.lintian-overrides --- ocaml-4.08.1/debian/ocaml-man.lintian-overrides 2020-01-30 12:11:32.000000000 +0000 +++ ocaml-4.08.1/debian/ocaml-man.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -ocaml-man: spelling-error-in-manpage usr/share/man/man3/Asttypes.3o.gz Upto Up to diff -Nru ocaml-4.08.1/debian/ocaml-nox.lintian-overrides.in ocaml-4.08.1/debian/ocaml-nox.lintian-overrides.in --- ocaml-4.08.1/debian/ocaml-nox.lintian-overrides.in 2020-01-30 12:11:32.000000000 +0000 +++ ocaml-4.08.1/debian/ocaml-nox.lintian-overrides.in 2020-07-30 12:45:47.000000000 +0000 @@ -3,5 +3,6 @@ ocaml-nox: script-not-executable .@OCamlStdlibDir@/target_camlheaderi ocaml-nox: unusual-interpreter .@OCamlStdlibDir@/target_camlheaderd #!/usr/bin/ocamlrund ocaml-nox: unusual-interpreter .@OCamlStdlibDir@/target_camlheaderi #!/usr/bin/ocamlruni -ocaml-nox: binary-without-manpage usr/bin/ocaml*.byte -ocaml-nox: binary-without-manpage usr/bin/ocaml*.opt +ocaml-nox: no-manual-page usr/bin/ocaml*.byte +ocaml-nox: no-manual-page usr/bin/ocaml*.opt +ocaml-nox: ocaml-dangling-cmx .@OCamlStdlibDir@/ocamldoc/odoc*.cmx diff -Nru ocaml-4.08.1/debian/patches/0006-read_main_debug_info-do-not-die-in-custom-executable.patch ocaml-4.08.1/debian/patches/0006-read_main_debug_info-do-not-die-in-custom-executable.patch --- ocaml-4.08.1/debian/patches/0006-read_main_debug_info-do-not-die-in-custom-executable.patch 2020-01-30 12:11:32.000000000 +0000 +++ ocaml-4.08.1/debian/patches/0006-read_main_debug_info-do-not-die-in-custom-executable.patch 2020-07-30 12:45:47.000000000 +0000 @@ -5,7 +5,6 @@ This fatal error occurred with some executables linked with -custom (with the Debian-specific patch), notably ppx preprocessors during the build of ppxlib. - --- runtime/backtrace_byt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -Nru ocaml-4.08.1/debian/patches/0007-Avoid-duplicate-definitions-of-common-global-variabl.patch ocaml-4.08.1/debian/patches/0007-Avoid-duplicate-definitions-of-common-global-variabl.patch --- ocaml-4.08.1/debian/patches/0007-Avoid-duplicate-definitions-of-common-global-variabl.patch 1970-01-01 00:00:00.000000000 +0000 +++ ocaml-4.08.1/debian/patches/0007-Avoid-duplicate-definitions-of-common-global-variabl.patch 2020-07-30 12:45:47.000000000 +0000 @@ -0,0 +1,41 @@ +From: Xavier Leroy +Date: Thu, 12 Dec 2019 16:41:17 +0100 +Subject: Avoid duplicate definitions of "common" global variables + +The variables are caml_debug_info and caml_atom_table. +The multiple definitions look like a cut-and-paste error. +They cause problems with C compilers that don't follow the "common" model. + +Bug: https://github.com/ocaml/ocaml/issues/9144 +Bug-Debian: https://bugs.debian.org/957623 +--- + runtime/backtrace.c | 3 --- + runtime/startup_nat.c | 1 - + 2 files changed, 4 deletions(-) + +diff --git a/runtime/backtrace.c b/runtime/backtrace.c +index a3c2c08..ddf7af1 100644 +--- a/runtime/backtrace.c ++++ b/runtime/backtrace.c +@@ -27,9 +27,6 @@ + #include "caml/backtrace_prim.h" + #include "caml/fail.h" + +-/* The table of debug information fragments */ +-struct ext_table caml_debug_info; +- + CAMLexport int32_t caml_backtrace_active = 0; + CAMLexport int32_t caml_backtrace_pos = 0; + CAMLexport backtrace_slot * caml_backtrace_buffer = NULL; +diff --git a/runtime/startup_nat.c b/runtime/startup_nat.c +index 43b85e3..5b20036 100644 +--- a/runtime/startup_nat.c ++++ b/runtime/startup_nat.c +@@ -44,7 +44,6 @@ + #endif + + extern int caml_parser_trace; +-CAMLexport header_t caml_atom_table[256]; + char * caml_code_area_start, * caml_code_area_end; + struct ext_table caml_code_fragments_table; + diff -Nru ocaml-4.08.1/debian/patches/0008-Disable-DT_TEXTREL-warnings-on-Linux-i386.patch ocaml-4.08.1/debian/patches/0008-Disable-DT_TEXTREL-warnings-on-Linux-i386.patch --- ocaml-4.08.1/debian/patches/0008-Disable-DT_TEXTREL-warnings-on-Linux-i386.patch 1970-01-01 00:00:00.000000000 +0000 +++ ocaml-4.08.1/debian/patches/0008-Disable-DT_TEXTREL-warnings-on-Linux-i386.patch 2020-07-30 12:45:47.000000000 +0000 @@ -0,0 +1,30 @@ +From: Stephane Glondu +Date: Wed, 29 Jul 2020 16:22:39 +0200 +Subject: Disable DT_TEXTREL warnings on Linux i386 + +Bug: https://github.com/ocaml/ocaml/issues/9800 +--- + configure.ac | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 82172d7..0f22211 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -952,6 +952,16 @@ AS_CASE(["$arch,$system"], + [power,netbsd], [profiling=true], + [profiling=false]) + ++# Disable DT_TEXTREL warnings on Linux i386 ++# See https://github.com/ocaml/ocaml/issues/9800 ++ ++AS_CASE([$host], ++ [i?86-*-linux-*], ++ [common_cflags="-Wl,-z,notext $common_cflags" ++ mksharedlib="$mksharedlib -Wl,-z,notext" ++ mkmaindll="$mkmaindll -Wl,-z,notext"], ++ []) ++ + # Assembler + + AS_CASE([$host], diff -Nru ocaml-4.08.1/debian/patches/series ocaml-4.08.1/debian/patches/series --- ocaml-4.08.1/debian/patches/series 2020-01-30 12:11:32.000000000 +0000 +++ ocaml-4.08.1/debian/patches/series 2020-07-30 12:45:47.000000000 +0000 @@ -4,3 +4,5 @@ 0005-Check-for-definition-of-AT_SECURE-before-using-it.patch 0008-Reimplement-custom-without-hacks.patch 0006-read_main_debug_info-do-not-die-in-custom-executable.patch +0007-Avoid-duplicate-definitions-of-common-global-variabl.patch +0008-Disable-DT_TEXTREL-warnings-on-Linux-i386.patch diff -Nru ocaml-4.08.1/debian/rules ocaml-4.08.1/debian/rules --- ocaml-4.08.1/debian/rules 2020-01-30 12:11:32.000000000 +0000 +++ ocaml-4.08.1/debian/rules 2020-07-30 12:45:47.000000000 +0000 @@ -279,14 +279,10 @@ sed -i /almabench.ml/d testsuite/tests/misc-unsafe/ocamltests rm -f testsuite/tests/misc-unsafe/almabench.ml endif -ifeq ($(OCAMLMAJOR),4.08) -ifneq (,$(findstring kfreebsd,$(DEB_BUILD_ARCH))) -# We temporarily disable testpreempt test which should be fixed in 4.09 -# See https://github.com/ocaml/ocaml/pull/8849 +# testpreempt test is too unreliable. +# It failed at least once on kfreebsd and amd64. sed -i /testpreempt.ml/d testsuite/tests/lib-systhreads/ocamltests rm -f testsuite/tests/lib-systhreads/testpreempt.ml -endif -endif ifneq (,$(findstring hurd,$(DEB_BUILD_ARCH))) sed -i /beat.ml/d testsuite/tests/lib-threads/ocamltests rm -f testsuite/tests/lib-threads/beat.ml @@ -303,10 +299,6 @@ dh_installdocs --package=ocaml-base-nox --doc-main-package=ocaml dh_installdocs --remaining-packages -.PHONY: override_dh_missing -override_dh_missing: - dh_missing --fail-missing - override_dh_autoreconf: ./autogen