Hello community, here is the log from the commit of package ocaml for openSUSE:Factory checked in at 2012-01-12 15:30:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ocaml (Old) and /work/SRC/openSUSE:Factory/.ocaml.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/ocaml/ocaml.changes 2011-11-09 14:15:39.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ocaml.new/ocaml.changes 2012-01-12 15:31:05.000000000 +0100 @@ -1,0 +2,10 @@ +Mon Dec 19 09:55:25 UTC 2011 - [email protected] + +- fix Source references to contain original upstream + +------------------------------------------------------------------- +Mon Nov 14 00:21:40 CET 2011 - [email protected] + +- add add .type directive for code symbols (needed on arm) + +------------------------------------------------------------------- Old: ---- ocaml-3.12-refman.html.tar.bz2 ocaml-3.12-refman.info.tar.bz2 ocaml-3.12-refman.ps.bz2 New: ---- arm-add-type-directive.patch ocaml-3.12-refman.html.tar.gz ocaml-3.12-refman.info.tar.gz ocaml-3.12-refman.ps.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocaml.spec ++++++ --- /var/tmp/diff_new_pack.HPLsBX/_old 2012-01-12 15:31:18.000000000 +0100 +++ /var/tmp/diff_new_pack.HPLsBX/_new 2012-01-12 15:31:18.000000000 +0100 @@ -17,24 +17,20 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: ocaml -License: QPL and (LGPLv2+ with Exceptions) -Group: Development/Languages/Other Version: 3.12.1 -Release: 5 +Release: 0 %define doc_version 3.12 %ifarch s390 s390x %define do_opt 0 %else %define do_opt 1 %endif -Source0: ftp://ftp.inria.fr/lang/caml-light/ocaml-%{version}.tar.bz2 -Source1: ftp://ftp.inria.fr/lang/caml-light/ocaml-%{doc_version}-refman.html.tar.bz2 -Source2: ftp://ftp.inria.fr/lang/caml-light/ocaml-%{doc_version}-refman.ps.bz2 -Source3: ftp://ftp.inria.fr/lang/caml-light/ocaml-%{doc_version}-refman.info.tar.bz2 +Source0: http://caml.inria.fr/pub/distrib/ocaml-%{doc_version}/ocaml-%{version}.tar.bz2 +Source1: http://caml.inria.fr/pub/distrib/ocaml-%{doc_version}/ocaml-%{doc_version}-refman.html.tar.gz +Source2: http://caml.inria.fr/pub/distrib/ocaml-%{doc_version}/ocaml-%{doc_version}-refman.ps.gz +Source3: http://caml.inria.fr/pub/distrib/ocaml-%{doc_version}/ocaml-%{doc_version}-refman.info.tar.gz Source4: rpmlintrc Patch0: ocaml-3.00-camldebug_el.patch Patch1: ocaml-3.04-info.patch @@ -45,8 +41,11 @@ Patch7: ocaml-3.09-emacs_localcompile.patch Patch8: ocaml-3.09-rpmoptflags.patch Patch9: ocaml-ppc64.patch +Patch10: arm-add-type-directive.patch Url: http://caml.inria.fr/ Summary: The Objective Caml Compiler and Programming Environment +License: QPL-1.0 and (LGPLv2+ with Exceptions) +Group: Development/Languages/Other BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %install_info_prereq @@ -79,8 +78,8 @@ %package runtime -License: QPL Summary: The Objective Caml Compiler and Programming Environment +License: QPL-1.0 Group: Development/Languages/Other Provides: ocaml(runtime) = %{version} @@ -93,9 +92,9 @@ %package source -License: QPL and (LGPLv2+ with Exceptions) -Group: Development/Languages/Other Summary: Source code for Objective Caml libraries +License: QPL-1.0 and (LGPLv2+ with Exceptions) +Group: Development/Languages/Other Requires: ocaml = %{version}-%{release} %description source @@ -103,9 +102,9 @@ %package x11 +Summary: X11 support for Objective Caml License: LGPLv2 with static linking exception Group: System/Libraries -Summary: X11 support for Objective Caml Requires: ocaml-runtime = %{version}-%{release} %description x11 @@ -114,9 +113,9 @@ %package labltk +Summary: The Objective Caml Compiler and Programming Environment License: LGPLv2 with static linking exception Group: System/Libraries -Summary: The Objective Caml Compiler and Programming Environment Requires: ocaml(runtime) = %{version}-%{release} Requires: ocaml = %{version}-%{release} @@ -129,9 +128,9 @@ %package labltk-devel +Summary: Development files for labltk License: LGPLv2 with static linking exception Group: Development/Libraries/Other -Summary: Development files for labltk Requires: ocaml = %{version}-%{release} Requires: %{name}-labltk = %{version}-%{release} Requires: xorg-x11-libX11-devel @@ -148,9 +147,9 @@ %package camlp4 +Summary: Pre-Processor-Pretty-Printer for Objective Caml License: LGPLv2 with static-linking exception Group: Development/Languages/Other -Summary: Pre-Processor-Pretty-Printer for Objective Caml Requires: ocaml-runtime = %{version}-%{release} %description camlp4 @@ -161,9 +160,9 @@ %package camlp4-devel +Summary: Pre-Processor-Pretty-Printer for Objective Caml License: LGPLv2 with static-linking exception Group: Development/Languages/Other -Summary: Pre-Processor-Pretty-Printer for Objective Caml Requires: ocaml = %{version}-%{release} Requires: %{name}-camlp4 = %{version}-%{release} Provides: camlp4 = %{version} @@ -177,9 +176,9 @@ %package ocamldoc -License: QPL -Group: Development/Languages/Other Summary: The Objective Caml Compiler and Programming Environment +License: QPL-1.0 +Group: Development/Languages/Other Requires: ocaml = %{version}-%{release} %description ocamldoc @@ -191,9 +190,9 @@ %package emacs -License: GPLv2+ -Group: Development/Languages/Other Summary: The Objective Caml Compiler and Programming Environment +License: GPL-2.0+ +Group: Development/Languages/Other Requires: ocaml = %{version}-%{release} Requires: emacs Provides: caml-mode @@ -207,9 +206,9 @@ %package docs -License: GPLv2+ ; QPL .. -Group: Development/Languages/Other Summary: The Objective Caml Compiler and Programming Environment +License: GPL-2.0+ ; QPL-1.0 +Group: Development/Languages/Other Requires: ocaml = %{version}-%{release} %description docs @@ -221,9 +220,9 @@ system, Lex&Yacc tools, a replay debugger, and a comprehensive library. %package compiler-libs -License: QPL -Group: Development/Libraries/Other Summary: Libraries used internal to the OCaml Compiler +License: QPL-1.0 +Group: Development/Libraries/Other Requires: ocaml = %{version}-%{release} %description compiler-libs @@ -235,9 +234,9 @@ be helpful in the development of certain applications. %package compiler-libs-devel -License: QPL -Group: Development/Libraries/Other Summary: Libraries used internal to the OCaml Compiler +License: QPL-1.0 +Group: Development/Libraries/Other Requires: ocaml-compiler-libs = %{version}-%{release} %description compiler-libs-devel @@ -259,6 +258,7 @@ %patch7 %patch8 %patch9 +%patch10 -p1 find -name ".cvsignore" | xargs -r rm -f @@ -330,7 +330,9 @@ %{_bindir}/* %{_mandir}/*/* %{_libdir}/ocaml/*.a +%ifnarch %arm %{_libdir}/ocaml/*.cmxs +%endif %{_libdir}/ocaml/*.cmxa %{_libdir}/ocaml/*.cmx %{_libdir}/ocaml/*.mli ++++++ arm-add-type-directive.patch ++++++ From: Stephane Glondu <[email protected]> Date: Fri, 12 Aug 2011 21:13:17 +0200 Subject: ocamlopt/arm: add .type directive for code symbols Bug-Ubuntu: https://bugs.launchpad.net/bugs/810402 Signed-off-by: Stephane Glondu <[email protected]> --- asmcomp/arm/emit.mlp | 1 + asmrun/arm.S | 12 ++++++++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/asmcomp/arm/emit.mlp b/asmcomp/arm/emit.mlp index 2003313..a4b2241 100644 --- a/asmcomp/arm/emit.mlp +++ b/asmcomp/arm/emit.mlp @@ -556,6 +556,7 @@ let fundecl fundecl = ` .text\n`; ` .align 2\n`; ` .global {emit_symbol fundecl.fun_name}\n`; + ` .type {emit_symbol fundecl.fun_name}, %function\n`; `{emit_symbol fundecl.fun_name}:\n`; let n = frame_size() in ignore(emit_stack_adjustment "sub" n); diff --git a/asmrun/arm.S b/asmrun/arm.S index 164f731..1313e9c 100644 --- a/asmrun/arm.S +++ b/asmrun/arm.S @@ -24,6 +24,7 @@ alloc_limit .req r10 /* Allocation functions and GC interface */ .globl caml_call_gc + .type caml_call_gc, %function caml_call_gc: /* Record return address and desired size */ /* Can use alloc_limit as a temporary since it will be reloaded by @@ -41,6 +42,7 @@ caml_call_gc: bx lr .globl caml_alloc1 + .type caml_alloc1, %function caml_alloc1: sub alloc_ptr, alloc_ptr, #8 cmp alloc_ptr, alloc_limit @@ -54,6 +56,7 @@ caml_alloc1: b caml_alloc1 .globl caml_alloc2 + .type caml_alloc2, %function caml_alloc2: sub alloc_ptr, alloc_ptr, #12 cmp alloc_ptr, alloc_limit @@ -67,6 +70,7 @@ caml_alloc2: b caml_alloc2 .globl caml_alloc3 + .type caml_alloc3, %function caml_alloc3: sub alloc_ptr, alloc_ptr, #16 cmp alloc_ptr, alloc_limit @@ -80,6 +84,7 @@ caml_alloc3: b caml_alloc3 .globl caml_allocN + .type caml_allocN, %function caml_allocN: sub alloc_ptr, alloc_ptr, r12 cmp alloc_ptr, alloc_limit @@ -134,6 +139,7 @@ caml_allocN: /* Function to call is in r12 */ .globl caml_c_call + .type caml_c_call, %function caml_c_call: /* Preserve return address in callee-save register r4 */ mov r4, lr @@ -160,6 +166,7 @@ caml_c_call: /* Start the Caml program */ .globl caml_start_program + .type caml_start_program, %function caml_start_program: ldr r12, .Lcaml_program @@ -235,6 +242,7 @@ caml_start_program: /* Raise an exception from C */ .globl caml_raise_exception + .type caml_raise_exception, %function caml_raise_exception: /* Reload Caml allocation pointers */ ldr r12, .Lcaml_young_ptr @@ -250,6 +258,7 @@ caml_raise_exception: /* Callback from C to Caml */ .globl caml_callback_exn + .type caml_callback_exn, %function caml_callback_exn: /* Initial shuffling of arguments (r0 = closure, r1 = first arg) */ mov r12, r0 @@ -259,6 +268,7 @@ caml_callback_exn: b .Ljump_to_caml .globl caml_callback2_exn + .type caml_callback2_exn, %function caml_callback2_exn: /* Initial shuffling of arguments (r0 = closure, r1 = arg1, r2 = arg2) */ mov r12, r0 @@ -269,6 +279,7 @@ caml_callback2_exn: b .Ljump_to_caml .globl caml_callback3_exn + .type caml_callback3_exn, %function caml_callback3_exn: /* Initial shuffling of arguments */ /* (r0 = closure, r1 = arg1, r2 = arg2, r3 = arg3) */ @@ -281,6 +292,7 @@ caml_callback3_exn: b .Ljump_to_caml .globl caml_ml_array_bound_error + .type caml_ml_array_bound_error, %function caml_ml_array_bound_error: /* Load address of [caml_array_bound_error] in r12 */ ldr r12, .Lcaml_array_bound_error -- -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
