[Pkg-ocaml-maint-commits] [SCM] OCaml packaging branch, master, updated. debian/3.12.1-3-3-g560bdc6
The following commit has been merged in the master branch: commit b3ebb2f24f8af804d4eedde62af5b296cd6808d0 Author: Stephane Glondu Date: Tue Jun 26 07:25:56 2012 +0200 Make the Debian-specific behaviour of -custom opt-in (Closes: #678577) diff --git a/debian/README.Debian b/debian/README.Debian index 872a07a..7a63ebc 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -6,9 +6,10 @@ be stripped (more precisely, the bytecode, which is not part of the ELF data, is removed by strip). This Debian version is patched (and the patch has been rejected by upstream [1], but is available separately in debian/patches) so that the bytecode is embedded in the -executable and can be stripped. The original behaviour is restored if -the OCAML_COMPAT environment variable contains the letter “c”. +executable and can be stripped. This new behaviour is optional, and +can be enabled by setting the OCAML_CUSTOM_EMBED environment variable +to “y”. [1] http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=49;bug=256900 - -- Stéphane Glondu , Tue, 24 May 2011 12:02:51 +0200 + -- Stéphane Glondu , Tue, 26 Jun 2012 07:27:05 +0200 diff --git a/debian/patches/0011-Embed-bytecode-in-C-object-when-using-custom.patch b/debian/patches/0011-Embed-bytecode-in-C-object-when-using-custom.patch index 3f17f1d..ccb5635 100644 --- a/debian/patches/0011-Embed-bytecode-in-C-object-when-using-custom.patch +++ b/debian/patches/0011-Embed-bytecode-in-C-object-when-using-custom.patch @@ -3,19 +3,20 @@ Date: Sun, 17 Aug 2008 17:10:03 +0200 Subject: Embed bytecode in C object when using -custom This patch fixes non-strippability of bytecode executables linked with -custom runtime. Having "c" in OCAML_COMPAT environment variable -restores the original behaviour. +custom runtime. The new behaviour is enabled when OCAML_CUSTOM_EMBED +is set to "y", or when DEB_HOST_ARCH is non-empty. Forwarded: not-needed Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=256900 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=627761 +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=678577 Signed-off-by: Stephane Glondu --- - bytecomp/bytelink.ml | 36 - 1 files changed, 32 insertions(+), 4 deletions(-) + bytecomp/bytelink.ml | 42 ++ + 1 file changed, 38 insertions(+), 4 deletions(-) diff --git a/bytecomp/bytelink.ml b/bytecomp/bytelink.ml -index 9d62fc6..a3aee28 100644 +index 9d62fc6..c6d558f 100644 --- a/bytecomp/bytelink.ml +++ b/bytecomp/bytelink.ml @@ -415,7 +415,7 @@ let mlvalues_primitives = [ @@ -57,23 +58,29 @@ index 9d62fc6..a3aee28 100644 \n#ifdef __cplusplus\ \n}\ \n#endif\n"; -@@ -501,6 +514,11 @@ let fix_exec_name name = +@@ -501,6 +514,17 @@ let fix_exec_name name = if String.contains name '.' then name else name ^ ".exe" | _ -> name -+(* Legacy custom behaviour (Debian-specific) *) ++(* Debian-specific -custom behaviour: ++ - if DEB_HOST_ARCH is non-empty, it is activated by default ++ - can be enabled/disabled by setting OCAML_CUSTOM_EMBED to y/n ++*) + -+let legacy_custom = -+ try String.contains (Sys.getenv "OCAML_COMPAT") 'c' with Not_found -> false ++let custom_embed = ++ try Sys.getenv "OCAML_CUSTOM_EMBED" = "y" ++ with Not_found -> ++try Sys.getenv "DEB_HOST_ARCH" <> "" ++with Not_found -> false + (* Main entry point (build a custom runtime if needed) *) let link objfiles output_name = -@@ -514,6 +532,16 @@ let link objfiles output_name = +@@ -514,6 +538,16 @@ let link objfiles output_name = Clflags.dllibs := !lib_dllibs @ !Clflags.dllibs; (* put user's DLLs first *) if not !Clflags.custom_runtime then link_bytecode tolink output_name true -+ else if not legacy_custom && not !Clflags.output_c_object && not !Clflags.make_runtime then ++ else if custom_embed && not !Clflags.output_c_object && not !Clflags.make_runtime then +let c_file = Filename.temp_file "camlobj" ".c" in +try + link_bytecode_as_c tolink c_file true; @@ -86,7 +93,7 @@ index 9d62fc6..a3aee28 100644 else if not !Clflags.output_c_object then begin let bytecode_name = Filename.temp_file "camlcode" "" in let prim_name = Filename.temp_file "camlprim" ".c" in -@@ -552,7 +580,7 @@ let link objfiles output_name = +@@ -552,7 +586,7 @@ let link objfiles output_name = if Sys.file_exists c_file then raise(Error(File_exists c_file)); let temps = ref [] in try -- OCaml packaging ___ 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
[Pkg-ocaml-maint-commits] [SCM] OCaml packaging branch, master, updated. debian/3.12.1-3-3-g560bdc6
The following commit has been merged in the master branch: commit 560bdc6a5d31582c4330f60a81be69b196c27b1a Author: Stephane Glondu Date: Tue Jun 26 07:34:23 2012 +0200 Update changelog and prepare upload to unstable diff --git a/debian/changelog b/debian/changelog index 43242fb..24fb792 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ocaml (3.12.1-4) unstable; urgency=low + + * Change the Debian-specific behaviour of -custom (Closes: #678577) + + -- Stéphane Glondu Tue, 26 Jun 2012 21:39:18 +0200 + ocaml (3.12.1-3) unstable; urgency=low [ Hendrik Tews ] -- OCaml packaging ___ 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
[Pkg-ocaml-maint-commits] [SCM] OCaml packaging branch, master, updated. debian/3.12.1-3-3-g560bdc6
The following commit has been merged in the master branch: commit 9c21b7b26679c2901a9ff3b5016e676221e49174 Author: Stephane Glondu Date: Tue Jun 26 07:25:32 2012 +0200 Refresh patches diff --git a/debian/patches/0001-Pass-no-relax-to-ld-on-alpha.patch b/debian/patches/0001-Pass-no-relax-to-ld-on-alpha.patch index 3d05dfc..2bdbc74 100644 --- a/debian/patches/0001-Pass-no-relax-to-ld-on-alpha.patch +++ b/debian/patches/0001-Pass-no-relax-to-ld-on-alpha.patch @@ -6,7 +6,7 @@ Pass the --no-relax option to ld to fix a segfault in initialization code (bug#338437) --- configure |4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) + 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 9be5199..236e016 100755 diff --git a/debian/patches/0002-Call-ld-with-proper-flags.patch b/debian/patches/0002-Call-ld-with-proper-flags.patch index e1b4754..b200887 100644 --- a/debian/patches/0002-Call-ld-with-proper-flags.patch +++ b/debian/patches/0002-Call-ld-with-proper-flags.patch @@ -7,7 +7,7 @@ to remove the "-Wl," parts, which are only used when ocamlopt calls gcc. --- configure |2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 236e016..d4287ed 100755 diff --git a/debian/patches/0003-Don-t-use-rpath.patch b/debian/patches/0003-Don-t-use-rpath.patch index 83a5f55..b293733 100644 --- a/debian/patches/0003-Don-t-use-rpath.patch +++ b/debian/patches/0003-Don-t-use-rpath.patch @@ -4,7 +4,7 @@ Subject: Don't use rpath --- tools/ocamlmklib.mlp |5 + - 1 files changed, 5 insertions(+), 0 deletions(-) + 1 file changed, 5 insertions(+) diff --git a/tools/ocamlmklib.mlp b/tools/ocamlmklib.mlp index 8374439..b8d9e33 100644 diff --git a/debian/patches/0004-Put-manpages-in-section-3o-instead-of-3.patch b/debian/patches/0004-Put-manpages-in-section-3o-instead-of-3.patch index 7231e22..b43738f 100644 --- a/debian/patches/0004-Put-manpages-in-section-3o-instead-of-3.patch +++ b/debian/patches/0004-Put-manpages-in-section-3o-instead-of-3.patch @@ -4,7 +4,7 @@ Subject: Put manpages in section 3o instead of 3 --- ocamldoc/Makefile |2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ocamldoc/Makefile b/ocamldoc/Makefile index 8f6e87c..ace934c 100644 diff --git a/debian/patches/0006-Install-ocamlbuild-as-a-link-on-either-.native-or-.b.patch b/debian/patches/0006-Install-ocamlbuild-as-a-link-on-either-.native-or-.b.patch index cac2084..a7d1559 100644 --- a/debian/patches/0006-Install-ocamlbuild-as-a-link-on-either-.native-or-.b.patch +++ b/debian/patches/0006-Install-ocamlbuild-as-a-link-on-either-.native-or-.b.patch @@ -4,7 +4,7 @@ Subject: Install ocamlbuild as a link on either .native or .byte --- build/partial-install.sh | 17 - - 1 files changed, 16 insertions(+), 1 deletions(-) + 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/build/partial-install.sh b/build/partial-install.sh index 8e4fbd2..ca66bc1 100755 diff --git a/debian/patches/0007-Natdynlink-works-on-powerpc-and-hurd-i386.patch b/debian/patches/0007-Natdynlink-works-on-powerpc-and-hurd-i386.patch index 739217d..d3f4d13 100644 --- a/debian/patches/0007-Natdynlink-works-on-powerpc-and-hurd-i386.patch +++ b/debian/patches/0007-Natdynlink-works-on-powerpc-and-hurd-i386.patch @@ -12,7 +12,7 @@ Bug: http://caml.inria.fr/mantis/view.php?id=5255 Signed-off-by: Stephane Glondu --- configure |3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure b/configure index d4287ed..d6ba2e3 100755 diff --git a/debian/patches/0008-Declare-primitive-name-table-as-const-char.patch b/debian/patches/0008-Declare-primitive-name-table-as-const-char.patch index c9a8ede..2099078 100644 --- a/debian/patches/0008-Declare-primitive-name-table-as-const-char.patch +++ b/debian/patches/0008-Declare-primitive-name-table-as-const-char.patch @@ -8,7 +8,7 @@ Bug: http://caml.inria.fr/mantis/view.php?id=5131 Signed-off-by: Stephane Glondu --- bytecomp/symtable.ml |2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bytecomp/symtable.ml b/bytecomp/symtable.ml index d6ecc94..37def29 100644 diff --git a/debian/patches/0010-Properly-initialize-executable-name-in-caml_startup_.patch b/debian/patches/0010-Properly-initialize-executable-name-in-caml_startup_.patch index fdfc3db..fdb9c0b 100644 --- a/debian/patches/0010-Properly-initialize-executable-name-in-caml_startup_.patch +++ b/debian/patches/0010-Properly-initialize-executable-name-in-caml_startup_.patch @@ -7,7 +7,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=627756 Signed-off-by: Stephane Glondu --- byterun/startup.c | 11 ++- - 1 files changed, 10 inserti
