This is an automated email from the git hooks/post-receive script. infinity0 pushed a commit to branch debian/sid in repository ocaml.
commit ad3fb76362877fc81857e3b7be87e69c3270f33d Author: Ximin Luo <infini...@debian.org> Date: Tue Oct 3 23:35:14 2017 +0200 Replace the ARM PIC patch with one from upstream --- debian/changelog | 1 + debian/patches/0010-XL-001-tests.asmcomp.patch | 18 +++++++++++++++ debian/patches/0010-arm-default-PIC.patch | 32 -------------------------- debian/patches/series | 2 +- 4 files changed, 20 insertions(+), 33 deletions(-) diff --git a/debian/changelog b/debian/changelog index fe20e39..5de5ca2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ ocaml (4.05.0-10) UNRELEASED; urgency=medium * Drop support for ocamlopt on armel as suggested by upstream. + * Replace the ARM PIC patch with one from upstream. -- Ximin Luo <infini...@debian.org> Tue, 03 Oct 2017 23:36:43 +0200 diff --git a/debian/patches/0010-XL-001-tests.asmcomp.patch b/debian/patches/0010-XL-001-tests.asmcomp.patch new file mode 100644 index 0000000..57cd6ca --- /dev/null +++ b/debian/patches/0010-XL-001-tests.asmcomp.patch @@ -0,0 +1,18 @@ +Description: Drop a test-suite experiment committed by mistake + This was failing on armhf because Debian GCC now enables PIE by default. +Author: Xavier Leroy <xavier.le...@inria.fr> +Bug: https://caml.inria.fr/mantis/view.php?id=7642 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=837359#80 +--- +diff --git a/testsuite/tests/asmcomp/main.ml b/testsuite/tests/asmcomp/main.ml +index 284f7fb..6457ad2 100644 +--- a/testsuite/tests/asmcomp/main.ml ++++ b/testsuite/tests/asmcomp/main.ml +@@ -6,7 +6,6 @@ let compile_file filename = + let out_name = Filename.chop_extension filename ^ ".s" in + Emitaux.output_channel := open_out out_name + end; (* otherwise, stdout *) +- Clflags.dlcode := false; + Compilenv.reset ~source_provenance:(Timings.File filename) "test"; + Emit.begin_assembly(); + let ic = open_in filename in diff --git a/debian/patches/0010-arm-default-PIC.patch b/debian/patches/0010-arm-default-PIC.patch deleted file mode 100644 index 98a60a0..0000000 --- a/debian/patches/0010-arm-default-PIC.patch +++ /dev/null @@ -1,32 +0,0 @@ -Description: Default to PIC on arm - Otherwise the armhf build fails now that PIE is enabled by default. - TODO: there might be a better way to do this. -Author: Ximin Luo <infini...@debian.org> -Forwarded: TODO ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/utils/clflags.ml -+++ b/utils/clflags.ml -@@ -147,6 +147,7 @@ - - let pic_code = ref (match Config.architecture with (* -fPIC *) - | "amd64" -> true -+ | "arm" -> true - | _ -> false) - - let runtime_variant = ref "";; (* -runtime-variant *) ---- a/man/ocamlopt.m -+++ b/man/ocamlopt.m -@@ -739,10 +739,10 @@ - Select the floating-point hardware - .TP - .B \-fPIC --Generate position-independent machine code. -+Generate position-independent machine code. This is the default. - .TP - .B \-fno\-PIC --Generate position-dependent machine code. This is the default. -+Generate position-dependent machine code. - .TP - .B \-fthumb - Enable Thumb/Thumb-2 code generation diff --git a/debian/patches/series b/debian/patches/series index 32174dc..1196040 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,7 +5,7 @@ 0005-Avoid-multiple-declarations-in-generated-.c-files-in.patch 0006-Embed-bytecode-in-C-object-when-using-custom.patch 0008-Native-backtraces-don-t-work-on-powerpc-and-sparc.patch -0010-arm-default-PIC.patch +0010-XL-001-tests.asmcomp.patch 0011-arm64-hide-symbols-for-stricter-binutils.patch 0013-Use-CCLINKFLAGS-for-linking-all-executables-and-shar.patch 0014-Compute-a-stable-name-for-preprocessed-files.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml.git _______________________________________________ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits