Hello community, here is the log from the commit of package ocaml for openSUSE:Factory checked in at 2013-09-23 16:04:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ocaml (Old) and /work/SRC/openSUSE:Factory/.ocaml.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml" Changes: -------- --- /work/SRC/openSUSE:Factory/ocaml/ocaml.changes 2013-09-11 12:57:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ocaml.new/ocaml.changes 2013-09-23 16:04:59.000000000 +0200 @@ -1,0 +2,11 @@ +Thu Sep 19 12:01:09 CEST 2013 - [email protected] + +- update version 4.01.0 + * http://caml.inria.fr/pub/distrib/ocaml-4.01/notes/Changes + add ocaml-yacc-Use-mkstemp-instead-of-mktemp.patch + rename obsolete ocaml-rpmoptflags.patch to + ocaml-configure-Allow-user-defined-C-compiler-flags.patch + remove obsolete ocaml-tcl86.patch + remove obsolete ocaml-3.08.3.patch + +------------------------------------------------------------------- Old: ---- ocaml-3.08.3.patch ocaml-4.00-refman-html.tar.xz ocaml-4.00-refman.info.tar.xz ocaml-4.00-refman.ps.xz ocaml-4.00.1.tar.xz ocaml-rpmoptflags.patch ocaml-tcl86.patch New: ---- ocaml-4.01-refman-html.tar.xz ocaml-4.01-refman.info.tar.xz ocaml-4.01-refman.ps.xz ocaml-4.01.0.tar.xz ocaml-configure-Allow-user-defined-C-compiler-flags.patch ocaml-yacc-Use-mkstemp-instead-of-mktemp.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocaml.spec ++++++ --- /var/tmp/diff_new_pack.jjXTQv/_old 2013-09-23 16:04:59.000000000 +0200 +++ /var/tmp/diff_new_pack.jjXTQv/_new 2013-09-23 16:04:59.000000000 +0200 @@ -19,9 +19,9 @@ Name: ocaml -Version: 4.00.1 +Version: 4.01.0 Release: 0 -%define doc_version 4.00 +%define doc_version 4.01 %define do_opt 1 %ifarch s390 s390x ia64 %define do_opt 0 @@ -36,15 +36,14 @@ Patch2: ocaml-3.04-ocamltags--no-site-start.patch # FIX-UPSTREAM remove rpath from make file Patch3: ocaml-rpath.patch +# FIX-UPSTREAM pass RPM_OPT_FLAGS to build +Patch4: ocaml-configure-Allow-user-defined-C-compiler-flags.patch Patch5: ocaml-3.08.3-gcc4.patch -Patch6: ocaml-3.08.3.patch Patch7: ocaml-3.09-emacs_localcompile.patch -# FIX-UPSTREAM add %{RPM_OPT_FLAGS} to Makefile(s). -Patch8: ocaml-rpmoptflags.patch +# FIX-UPSTREAM use mkstemp to fix rpmlint warning +Patch8: ocaml-yacc-Use-mkstemp-instead-of-mktemp.patch # FIX-UPSTREAM enable build on PowerPC 64bit platform. Patch9: ocaml-ppc64.patch -# Fix build with Tcl/Tk 8.6 -Patch10: ocaml-tcl86.patch Url: http://caml.inria.fr/ Summary: The Objective Caml Compiler and Programming Environment License: QPL-1.0 and SUSE-LGPL-2.0-with-linking-exception @@ -253,12 +252,11 @@ %patch0 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %patch5 -%patch6 %patch7 %patch8 -p1 %patch9 -p1 -%patch10 -p1 find -name ".cvsignore" | xargs -r rm -f ++++++ ocaml-3.08.3-gcc4.patch ++++++ --- /var/tmp/diff_new_pack.jjXTQv/_old 2013-09-23 16:04:59.000000000 +0200 +++ /var/tmp/diff_new_pack.jjXTQv/_new 2013-09-23 16:04:59.000000000 +0200 @@ -1,3 +1,4 @@ ++- reduce register pressure in bng_ia32.c (thanks to matz) --- otherlibs/num/bng_ia32.c +++ otherlibs/num/bng_ia32.c @@ -121,7 +121,7 @@ ++++++ ocaml-4.00-refman-html.tar.xz -> ocaml-4.01-refman-html.tar.xz ++++++ ++++ 50330 lines of diff (skipped) ++++++ ocaml-4.00-refman.info.tar.xz -> ocaml-4.01-refman.info.tar.xz ++++++ Files old/infoman/ocaml.info.body-1.gz and new/infoman/ocaml.info.body-1.gz differ Files old/infoman/ocaml.info.body-10.gz and new/infoman/ocaml.info.body-10.gz differ Files old/infoman/ocaml.info.body-11.gz and new/infoman/ocaml.info.body-11.gz differ Files old/infoman/ocaml.info.body-12.gz and new/infoman/ocaml.info.body-12.gz differ Files old/infoman/ocaml.info.body-13.gz and new/infoman/ocaml.info.body-13.gz differ Files old/infoman/ocaml.info.body-14.gz and new/infoman/ocaml.info.body-14.gz differ Files old/infoman/ocaml.info.body-15.gz and new/infoman/ocaml.info.body-15.gz differ Files old/infoman/ocaml.info.body-16.gz and new/infoman/ocaml.info.body-16.gz differ Files old/infoman/ocaml.info.body-17.gz and new/infoman/ocaml.info.body-17.gz differ Files old/infoman/ocaml.info.body-18.gz and new/infoman/ocaml.info.body-18.gz differ Files old/infoman/ocaml.info.body-19.gz and new/infoman/ocaml.info.body-19.gz differ Files old/infoman/ocaml.info.body-2.gz and new/infoman/ocaml.info.body-2.gz differ Files old/infoman/ocaml.info.body-20.gz and new/infoman/ocaml.info.body-20.gz differ Files old/infoman/ocaml.info.body-21.gz and new/infoman/ocaml.info.body-21.gz differ Files old/infoman/ocaml.info.body-22.gz and new/infoman/ocaml.info.body-22.gz differ Files old/infoman/ocaml.info.body-23.gz and new/infoman/ocaml.info.body-23.gz differ Files old/infoman/ocaml.info.body-3.gz and new/infoman/ocaml.info.body-3.gz differ Files old/infoman/ocaml.info.body-4.gz and new/infoman/ocaml.info.body-4.gz differ Files old/infoman/ocaml.info.body-5.gz and new/infoman/ocaml.info.body-5.gz differ Files old/infoman/ocaml.info.body-6.gz and new/infoman/ocaml.info.body-6.gz differ Files old/infoman/ocaml.info.body-7.gz and new/infoman/ocaml.info.body-7.gz differ Files old/infoman/ocaml.info.body-8.gz and new/infoman/ocaml.info.body-8.gz differ Files old/infoman/ocaml.info.body-9.gz and new/infoman/ocaml.info.body-9.gz differ Files old/infoman/ocaml.info.body.gz and new/infoman/ocaml.info.body.gz differ Files old/infoman/ocaml.info.gz and new/infoman/ocaml.info.gz differ Files old/infoman/ocaml.info.haux.gz and new/infoman/ocaml.info.haux.gz differ Files old/infoman/ocaml.info.hocaml.info.hind.gz and new/infoman/ocaml.info.hocaml.info.hind.gz differ Files old/infoman/ocaml.info.hocaml.info.kwd.hind.gz and new/infoman/ocaml.info.hocaml.info.kwd.hind.gz differ ++++++ ocaml-4.00-refman.info.tar.xz -> ocaml-4.01.0.tar.xz ++++++ ++++ 464148 lines of diff (skipped) ++++++ ocaml-configure-Allow-user-defined-C-compiler-flags.patch ++++++ From: "Richard W.M. Jones" <[email protected]> Date: Tue, 29 May 2012 20:44:18 +0100 Subject: configure: Allow user defined C compiler flags. --- configure | 4 ++++ 1 file changed, 4 insertions(+) Index: ocaml-4.01.0/configure =================================================================== --- ocaml-4.01.0.orig/configure +++ ocaml-4.01.0/configure @@ -1612,6 +1612,10 @@ case "$buggycc" in nativecccompopts="$nativecccompopts -fomit-frame-pointer";; esac +# Allow user defined C Compiler flags +bytecccompopts="$bytecccompopts $CFLAGS" +nativecccompopts="$nativecccompopts $CFLAGS" + # Finish generated files cclibs="$cclibs $mathlib" ++++++ ocaml-ppc64.patch ++++++ --- /var/tmp/diff_new_pack.jjXTQv/_old 2013-09-23 16:05:01.000000000 +0200 +++ /var/tmp/diff_new_pack.jjXTQv/_new 2013-09-23 16:05:01.000000000 +0200 @@ -1,8 +1,48 @@ -Index: ocaml-4.00.1/asmcomp/power64/arch.ml +From: "Richard W.M. Jones" <[email protected]> +Date: Tue, 29 May 2012 20:47:07 +0100 +Subject: Add support for ppc64. + +Note (1): This patch was rejected upstream because they don't have +appropriate hardware for testing. + +Note (2): Upstream powerpc directory has some support for ppc64, but +only for Macs, and I couldn't get it to work at all with IBM hardware. + +This patch was collaborated on by several people, most notably +David Woodhouse. + +Includes fix for position of stack arguments to external C functions +when there are more than 8 parameters (RHBZ#829187). + +Includes fix for minor heap corruption because of unaligned minor heap +register (RHBZ#826649). + +Includes updates for OCaml 4.01.0. +--- + asmcomp/power64/arch.ml | 88 +++ + asmcomp/power64/emit.mlp | 988 ++++++++++++++++++++++++++++++++++++++++++ + asmcomp/power64/proc.ml | 240 ++++++++++ + asmcomp/power64/reload.ml | 18 + asmcomp/power64/scheduling.ml | 65 ++ + asmcomp/power64/selection.ml | 101 ++++ + asmrun/Makefile | 6 + asmrun/power64-elf.S | 486 ++++++++++++++++++++ + asmrun/stack.h | 9 + configure | 3 + 10 files changed, 2004 insertions(+) + create mode 100644 asmcomp/power64/arch.ml + create mode 100644 asmcomp/power64/emit.mlp + create mode 100644 asmcomp/power64/proc.ml + create mode 100644 asmcomp/power64/reload.ml + create mode 100644 asmcomp/power64/scheduling.ml + create mode 100644 asmcomp/power64/selection.ml + create mode 100644 asmrun/power64-elf.S + +Index: ocaml-4.01.0/asmcomp/power64/arch.ml =================================================================== --- /dev/null -+++ ocaml-4.00.1/asmcomp/power64/arch.ml -@@ -0,0 +1,87 @@ ++++ ocaml-4.01.0/asmcomp/power64/arch.ml +@@ -0,0 +1,88 @@ +(***********************************************************************) +(* *) +(* Objective Caml *) @@ -19,7 +59,6 @@ + +(* Specific operations for the PowerPC processor *) + -+open Misc +open Format + +(* Machine-specific command-line options *) @@ -48,6 +87,8 @@ +let size_int = size_addr +let size_float = 8 + ++let allow_unaligned_access = false ++ +(* Behavior of division *) + +let division_crashes_on_overflow = false @@ -90,11 +131,11 @@ + printreg arg.(0) printreg arg.(1) printreg arg.(2) + | Ialloc_far n -> + fprintf ppf "alloc_far %d" n -Index: ocaml-4.00.1/asmcomp/power64/emit.mlp +Index: ocaml-4.01.0/asmcomp/power64/emit.mlp =================================================================== --- /dev/null -+++ ocaml-4.00.1/asmcomp/power64/emit.mlp -@@ -0,0 +1,989 @@ ++++ ocaml-4.01.0/asmcomp/power64/emit.mlp +@@ -0,0 +1,988 @@ +(***********************************************************************) +(* *) +(* Objective Caml *) @@ -113,7 +154,6 @@ + +module StringSet = Set.Make(struct type t = string let compare = compare end) + -+open Location +open Misc +open Cmm +open Arch @@ -133,7 +173,7 @@ +(* We have a stack frame of our own if we call other functions (including + use of exceptions, or if we need more than the red zone *) +let has_stack_frame () = -+ if !contains_calls or (num_stack_slots.(0) + num_stack_slots.(1)) > (288-16)/8 then ++ if !contains_calls || (num_stack_slots.(0) + num_stack_slots.(1)) > (288-16)/8 then + true + else + false @@ -917,7 +957,7 @@ + match i with + {desc = Lend} -> () + | {next = {desc = (Lcondbranch(_, _) | Lcondbranch3(_, _, _))}} -+ when is_simple_instr i & no_interference i.res i.next.arg -> ++ when is_simple_instr i && no_interference i.res i.next.arg -> + emit_instr i.next (Some i); + emit_all i.next.next + | _ -> @@ -1084,11 +1124,11 @@ + ` .quad {emit_int (List.length !frame_descriptors)}\n`; + List.iter emit_frame !frame_descriptors; + frame_descriptors := [] -Index: ocaml-4.00.1/asmcomp/power64/proc.ml +Index: ocaml-4.01.0/asmcomp/power64/proc.ml =================================================================== --- /dev/null -+++ ocaml-4.00.1/asmcomp/power64/proc.ml -@@ -0,0 +1,241 @@ ++++ ocaml-4.01.0/asmcomp/power64/proc.ml +@@ -0,0 +1,240 @@ +(***********************************************************************) +(* *) +(* Objective Caml *) @@ -1328,12 +1368,11 @@ + Ccomp.command (Config.asm ^ " -o " ^ + Filename.quote outfile ^ " " ^ Filename.quote infile) + -+open Clflags;; -+open Config;; -Index: ocaml-4.00.1/asmcomp/power64/reload.ml ++let init () = () +Index: ocaml-4.01.0/asmcomp/power64/reload.ml =================================================================== --- /dev/null -+++ ocaml-4.00.1/asmcomp/power64/reload.ml ++++ ocaml-4.01.0/asmcomp/power64/reload.ml @@ -0,0 +1,18 @@ +(***********************************************************************) +(* *) @@ -1353,10 +1392,10 @@ + +let fundecl f = + (new Reloadgen.reload_generic)#fundecl f -Index: ocaml-4.00.1/asmcomp/power64/scheduling.ml +Index: ocaml-4.01.0/asmcomp/power64/scheduling.ml =================================================================== --- /dev/null -+++ ocaml-4.00.1/asmcomp/power64/scheduling.ml ++++ ocaml-4.01.0/asmcomp/power64/scheduling.ml @@ -0,0 +1,65 @@ +(***********************************************************************) +(* *) @@ -1423,11 +1462,11 @@ +end + +let fundecl f = (new scheduler)#schedule_fundecl f -Index: ocaml-4.00.1/asmcomp/power64/selection.ml +Index: ocaml-4.01.0/asmcomp/power64/selection.ml =================================================================== --- /dev/null -+++ ocaml-4.00.1/asmcomp/power64/selection.ml -@@ -0,0 +1,103 @@ ++++ ocaml-4.01.0/asmcomp/power64/selection.ml +@@ -0,0 +1,101 @@ +(***********************************************************************) +(* *) +(* Objective Caml *) @@ -1444,9 +1483,7 @@ + +(* Instruction selection for the Power PC processor *) + -+open Misc +open Cmm -+open Reg +open Arch +open Mach + @@ -1531,11 +1568,11 @@ +end + +let fundecl f = (new selector)#emit_fundecl f -Index: ocaml-4.00.1/asmrun/Makefile +Index: ocaml-4.01.0/asmrun/Makefile =================================================================== ---- ocaml-4.00.1.orig/asmrun/Makefile -+++ ocaml-4.00.1/asmrun/Makefile -@@ -89,6 +89,12 @@ power.o: power-$(SYSTEM).o +--- ocaml-4.01.0.orig/asmrun/Makefile ++++ ocaml-4.01.0/asmrun/Makefile +@@ -90,6 +90,12 @@ power.o: power-$(SYSTEM).o power.p.o: power-$(SYSTEM).o cp power-$(SYSTEM).o power.p.o @@ -1548,10 +1585,10 @@ main.c: ../byterun/main.c ln -s ../byterun/main.c main.c misc.c: ../byterun/misc.c -Index: ocaml-4.00.1/asmrun/power64-elf.S +Index: ocaml-4.01.0/asmrun/power64-elf.S =================================================================== --- /dev/null -+++ ocaml-4.00.1/asmrun/power64-elf.S ++++ ocaml-4.01.0/asmrun/power64-elf.S @@ -0,0 +1,486 @@ +/*********************************************************************/ +/* */ @@ -2039,11 +2076,11 @@ + .short 0 /* no roots here */ + .align 3 + -Index: ocaml-4.00.1/asmrun/stack.h +Index: ocaml-4.01.0/asmrun/stack.h =================================================================== ---- ocaml-4.00.1.orig/asmrun/stack.h -+++ ocaml-4.00.1/asmrun/stack.h -@@ -47,6 +47,15 @@ +--- ocaml-4.01.0.orig/asmrun/stack.h ++++ ocaml-4.01.0/asmrun/stack.h +@@ -46,6 +46,15 @@ #define Callback_link(sp) ((struct caml_context *)((sp) + Trap_frame_size)) #endif @@ -2059,33 +2096,24 @@ #ifdef TARGET_arm #define Saved_return_address(sp) *((intnat *)((sp) - 4)) #define Callback_link(sp) ((struct caml_context *)((sp) + 8)) -Index: ocaml-4.00.1/configure +Index: ocaml-4.01.0/configure =================================================================== ---- ocaml-4.00.1.orig/configure -+++ ocaml-4.00.1/configure -@@ -686,6 +686,7 @@ case "$host" in +--- ocaml-4.01.0.orig/configure ++++ ocaml-4.01.0/configure +@@ -694,6 +694,7 @@ case "$host" in arch=i386; system=macosx fi;; i[3456]86-*-gnu*) arch=i386; system=gnu;; + powerpc64-*-linux*) arch=power64; model=ppc64; system=elf;; powerpc*-*-linux*) arch=power; model=ppc; system=elf;; powerpc-*-netbsd*) arch=power; model=ppc; system=elf;; - powerpc-*-rhapsody*) arch=power; model=ppc; system=rhapsody;; -@@ -712,7 +713,7 @@ esac - - if $arch64; then - case "$arch,$model" in -- sparc,default|power,ppc) -+ sparc,default) - arch=none; model=default; system=unknown;; - esac - fi -@@ -755,6 +756,8 @@ case "$arch,$model,$system" in - aspp='/usr/ccs/bin/as -P';; - i386,*,*) as='as' + powerpc-*-openbsd*) arch=power; model=ppc; system=bsd_elf;; +@@ -776,6 +777,8 @@ case "$arch,$model,$system" in aspp='gcc -c';; -+ power64,*,elf) as='as -u -m ppc64' -+ aspp='gcc -c';; - power,*,elf) as='as -u -m ppc' + power,*,bsd*) as='as' aspp='gcc -c';; - power,*,bsd) as='as' ++ power64,*,elf) as='as -u -m ppc64' ++ aspp='gcc -c';; + power,*,rhapsody) as="as -arch $model" + aspp="$bytecc -c";; + sparc,*,solaris) as='as' ++++++ ocaml-yacc-Use-mkstemp-instead-of-mktemp.patch ++++++ From: "Richard W.M. Jones" <[email protected]> Date: Fri, 13 Sep 2013 21:29:58 +0100 Subject: yacc: Use mkstemp instead of mktemp. --- yacc/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: ocaml-4.01.0/yacc/main.c =================================================================== --- ocaml-4.01.0.orig/yacc/main.c +++ ocaml-4.01.0/yacc/main.c @@ -53,7 +53,7 @@ char *text_file_name; char *union_file_name; char *verbose_file_name; -#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || (__APPLE__) +#if defined(__linux__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || (__APPLE__) #define HAVE_MKSTEMP #endif -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
