Hello community, here is the log from the commit of package ocaml for openSUSE:Factory checked in at 2013-03-12 06:57:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2013-01-22 22:23:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ocaml.new/ocaml.changes 2013-03-12 06:57:08.000000000 +0100 @@ -1,0 +2,19 @@ +Thu Feb 21 17:53:47 CET 2013 - [email protected] + +- add hard requires ocaml-compiler-libs in ocaml-camlp4 in + versions before 12.1 due to lack of autorequires in old rpm + +------------------------------------------------------------------- +Thu Feb 21 15:07:04 CET 2013 - [email protected] + +- disable opt on ia64 + +------------------------------------------------------------------- +Fri Feb 15 12:10:35 UTC 2013 - [email protected] + +- update version 4.00.1 + * http://caml.inria.fr/pub/distrib/ocaml-4.00/notes/Changes +- remove ocaml-3.04-info.patch, upstream fixed. +- remove arm-add-type-directive.patch, upstream fixed. + +------------------------------------------------------------------- Old: ---- arm-add-type-directive.patch ocaml-3.04-info.patch ocaml-3.09-rpmoptflags.patch ocaml-3.12-refman.html.tar.gz ocaml-3.12-refman.info.tar.gz ocaml-3.12-refman.ps.gz ocaml-3.12.1.tar.bz2 New: ---- ocaml-4.00-refman-html.tar.gz ocaml-4.00-refman.info.tar.gz ocaml-4.00-refman.ps.gz ocaml-4.00.1.tar.bz2 ocaml-rpmoptflags.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocaml.spec ++++++ --- /var/tmp/diff_new_pack.Uyk0Si/_old 2013-03-12 06:57:10.000000000 +0100 +++ /var/tmp/diff_new_pack.Uyk0Si/_new 2013-03-12 06:57:10.000000000 +0100 @@ -19,28 +19,29 @@ Name: ocaml -Version: 3.12.1 +Version: 4.00.1 Release: 0 -%define doc_version 3.12 +%define doc_version 4.00 %define do_opt 1 -%ifarch s390 s390x +%ifarch s390 s390x ia64 %define do_opt 0 %endif 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 +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 Patch2: ocaml-3.04-ocamltags--no-site-start.patch +# FIX-UPSTREAM remove rpath from make file Patch3: ocaml-rpath.patch Patch5: ocaml-3.08.3-gcc4.patch Patch6: ocaml-3.08.3.patch Patch7: ocaml-3.09-emacs_localcompile.patch -Patch8: ocaml-3.09-rpmoptflags.patch +# FIX-UPSTREAM add %{RPM_OPT_FLAGS} to Makefile(s). +Patch8: ocaml-rpmoptflags.patch +# FIX-UPSTREAM enable build on PowerPC 64bit platform. 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 SUSE-LGPL-2.0-with-linking-exception @@ -145,6 +146,10 @@ License: SUSE-LGPL-2.0-with-linking-exception Group: Development/Languages/Other Requires: ocaml-runtime = %{version} +%if %suse_version < 1210 +# Due to lack of generated requires in old rpm, force this +Requires: ocaml-compiler-libs +%endif %description camlp4 Camlp4 is a Pre-Processor-Pretty-Printer for Objective Caml, parsing a @@ -243,16 +248,13 @@ %setup -q -T -D -a 1 %setup -q -T -D -a 3 %patch0 -p1 -gzip -d infoman/ocaml.info.gz -%patch1 -p1 %patch2 -p1 -%patch3 +%patch3 -p1 %patch5 %patch6 %patch7 -%patch8 +%patch8 -p1 %patch9 -p1 -%patch10 -p1 find -name ".cvsignore" | xargs -r rm -f @@ -344,6 +346,7 @@ %{_libdir}/ocaml/caml %{_libdir}/ocaml/ocamlbuild %{_libdir}/ocaml/Makefile.config +%{_libdir}/ocaml/VERSION %{_libdir}/ocaml/extract_crc %{_libdir}/ocaml/camlheader %{_libdir}/ocaml/camlheader_ur ++++++ ocaml-3.12-refman.info.tar.gz -> ocaml-4.00-refman.info.tar.gz ++++++ Files old/infoman/ocaml.info-1.gz and new/infoman/ocaml.info-1.gz differ Files old/infoman/ocaml.info-10.gz and new/infoman/ocaml.info-10.gz differ Files old/infoman/ocaml.info-11.gz and new/infoman/ocaml.info-11.gz differ Files old/infoman/ocaml.info-12.gz and new/infoman/ocaml.info-12.gz differ Files old/infoman/ocaml.info-13.gz and new/infoman/ocaml.info-13.gz differ Files old/infoman/ocaml.info-14.gz and new/infoman/ocaml.info-14.gz differ Files old/infoman/ocaml.info-15.gz and new/infoman/ocaml.info-15.gz differ Files old/infoman/ocaml.info-16.gz and new/infoman/ocaml.info-16.gz differ Files old/infoman/ocaml.info-17.gz and new/infoman/ocaml.info-17.gz differ Files old/infoman/ocaml.info-18.gz and new/infoman/ocaml.info-18.gz differ Files old/infoman/ocaml.info-19.gz and new/infoman/ocaml.info-19.gz differ Files old/infoman/ocaml.info-2.gz and new/infoman/ocaml.info-2.gz differ Files old/infoman/ocaml.info-20.gz and new/infoman/ocaml.info-20.gz differ Files old/infoman/ocaml.info-21.gz and new/infoman/ocaml.info-21.gz differ Files old/infoman/ocaml.info-3.gz and new/infoman/ocaml.info-3.gz differ Files old/infoman/ocaml.info-4.gz and new/infoman/ocaml.info-4.gz differ Files old/infoman/ocaml.info-5.gz and new/infoman/ocaml.info-5.gz differ Files old/infoman/ocaml.info-6.gz and new/infoman/ocaml.info-6.gz differ Files old/infoman/ocaml.info-7.gz and new/infoman/ocaml.info-7.gz differ Files old/infoman/ocaml.info-8.gz and new/infoman/ocaml.info-8.gz differ Files old/infoman/ocaml.info-9.gz and new/infoman/ocaml.info-9.gz differ 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-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-3.12.1.tar.bz2 -> ocaml-4.00.1.tar.bz2 ++++++ ++++ 211327 lines of diff (skipped) ++++++ ocaml-ppc64.patch ++++++ --- /var/tmp/diff_new_pack.Uyk0Si/_old 2013-03-12 06:57:11.000000000 +0100 +++ /var/tmp/diff_new_pack.Uyk0Si/_new 2013-03-12 06:57:11.000000000 +0100 @@ -1,47 +1,6 @@ -From b25707437651811a22acaab5a9461eb4ab742f6e Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" <[email protected]> -Date: Tue, 29 May 2012 20:47:07 +0100 -Subject: [PATCH 6/8] 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). ---- - asmcomp/power64/arch.ml | 83 ++++ - asmcomp/power64/emit.mlp | 989 +++++++++++++++++++++++++++++++++++++++++ - asmcomp/power64/proc.ml | 241 ++++++++++ - asmcomp/power64/reload.ml | 18 + - asmcomp/power64/scheduling.ml | 65 +++ - asmcomp/power64/selection.ml | 103 +++++ - asmrun/Makefile | 6 + - asmrun/power64-elf.S | 486 ++++++++++++++++++++ - asmrun/stack.h | 9 + - configure | 5 +- - 10 files changed, 2004 insertions(+), 1 deletion(-) - 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 - -diff --git a/asmcomp/power64/arch.ml b/asmcomp/power64/arch.ml -new file mode 100644 -index 0000000..55dd593 ---- /dev/null -+++ b/asmcomp/power64/arch.ml +diff -urN ocaml-4.00.1.orig/asmcomp/power64/arch.ml ocaml-4.00.1/asmcomp/power64/arch.ml +--- ocaml-4.00.1.orig/asmcomp/power64/arch.ml 1970-01-01 08:00:00.000000000 +0800 ++++ ocaml-4.00.1/asmcomp/power64/arch.ml 2013-02-16 22:10:06.156343344 +0800 @@ -0,0 +1,83 @@ +(***********************************************************************) +(* *) @@ -126,11 +85,9 @@ + printreg arg.(0) printreg arg.(1) printreg arg.(2) + | Ialloc_far n -> + fprintf ppf "alloc_far %d" n -diff --git a/asmcomp/power64/emit.mlp b/asmcomp/power64/emit.mlp -new file mode 100644 -index 0000000..42f585d ---- /dev/null -+++ b/asmcomp/power64/emit.mlp +diff -urN ocaml-4.00.1.orig/asmcomp/power64/emit.mlp ocaml-4.00.1/asmcomp/power64/emit.mlp +--- ocaml-4.00.1.orig/asmcomp/power64/emit.mlp 1970-01-01 08:00:00.000000000 +0800 ++++ ocaml-4.00.1/asmcomp/power64/emit.mlp 2013-02-16 22:10:06.163343380 +0800 @@ -0,0 +1,989 @@ +(***********************************************************************) +(* *) @@ -1121,11 +1078,9 @@ + ` .quad {emit_int (List.length !frame_descriptors)}\n`; + List.iter emit_frame !frame_descriptors; + frame_descriptors := [] -diff --git a/asmcomp/power64/proc.ml b/asmcomp/power64/proc.ml -new file mode 100644 -index 0000000..119ad93 ---- /dev/null -+++ b/asmcomp/power64/proc.ml +diff -urN ocaml-4.00.1.orig/asmcomp/power64/proc.ml ocaml-4.00.1/asmcomp/power64/proc.ml +--- ocaml-4.00.1.orig/asmcomp/power64/proc.ml 1970-01-01 08:00:00.000000000 +0800 ++++ ocaml-4.00.1/asmcomp/power64/proc.ml 2013-02-16 22:10:06.166343395 +0800 @@ -0,0 +1,241 @@ +(***********************************************************************) +(* *) @@ -1368,11 +1323,9 @@ + +open Clflags;; +open Config;; -diff --git a/asmcomp/power64/reload.ml b/asmcomp/power64/reload.ml -new file mode 100644 -index 0000000..abcac6c ---- /dev/null -+++ b/asmcomp/power64/reload.ml +diff -urN ocaml-4.00.1.orig/asmcomp/power64/reload.ml ocaml-4.00.1/asmcomp/power64/reload.ml +--- ocaml-4.00.1.orig/asmcomp/power64/reload.ml 1970-01-01 08:00:00.000000000 +0800 ++++ ocaml-4.00.1/asmcomp/power64/reload.ml 2013-02-16 22:10:06.166343395 +0800 @@ -0,0 +1,18 @@ +(***********************************************************************) +(* *) @@ -1392,11 +1345,9 @@ + +let fundecl f = + (new Reloadgen.reload_generic)#fundecl f -diff --git a/asmcomp/power64/scheduling.ml b/asmcomp/power64/scheduling.ml -new file mode 100644 -index 0000000..b7bba9b ---- /dev/null -+++ b/asmcomp/power64/scheduling.ml +diff -urN ocaml-4.00.1.orig/asmcomp/power64/scheduling.ml ocaml-4.00.1/asmcomp/power64/scheduling.ml +--- ocaml-4.00.1.orig/asmcomp/power64/scheduling.ml 1970-01-01 08:00:00.000000000 +0800 ++++ ocaml-4.00.1/asmcomp/power64/scheduling.ml 2013-02-16 22:10:06.167343401 +0800 @@ -0,0 +1,65 @@ +(***********************************************************************) +(* *) @@ -1463,11 +1414,9 @@ +end + +let fundecl f = (new scheduler)#schedule_fundecl f -diff --git a/asmcomp/power64/selection.ml b/asmcomp/power64/selection.ml -new file mode 100644 -index 0000000..7b8e2a4 ---- /dev/null -+++ b/asmcomp/power64/selection.ml +diff -urN ocaml-4.00.1.orig/asmcomp/power64/selection.ml ocaml-4.00.1/asmcomp/power64/selection.ml +--- ocaml-4.00.1.orig/asmcomp/power64/selection.ml 1970-01-01 08:00:00.000000000 +0800 ++++ ocaml-4.00.1/asmcomp/power64/selection.ml 2013-02-16 22:10:06.168343406 +0800 @@ -0,0 +1,103 @@ +(***********************************************************************) +(* *) @@ -1572,11 +1521,10 @@ +end + +let fundecl f = (new selector)#emit_fundecl f -diff --git a/asmrun/Makefile b/asmrun/Makefile -index efffa33..3525b82 100644 ---- a/asmrun/Makefile -+++ b/asmrun/Makefile -@@ -74,6 +74,12 @@ power.o: power-$(SYSTEM).o +diff -urN ocaml-4.00.1.orig/asmrun/Makefile ocaml-4.00.1/asmrun/Makefile +--- ocaml-4.00.1.orig/asmrun/Makefile 2013-02-16 21:54:39.472644964 +0800 ++++ ocaml-4.00.1/asmrun/Makefile 2013-02-16 22:06:21.397193652 +0800 +@@ -89,6 +89,12 @@ power.p.o: power-$(SYSTEM).o cp power-$(SYSTEM).o power.p.o @@ -1589,11 +1537,9 @@ main.c: ../byterun/main.c ln -s ../byterun/main.c main.c misc.c: ../byterun/misc.c -diff --git a/asmrun/power64-elf.S b/asmrun/power64-elf.S -new file mode 100644 -index 0000000..b2c24d6 ---- /dev/null -+++ b/asmrun/power64-elf.S +diff -urN ocaml-4.00.1.orig/asmrun/power64-elf.S ocaml-4.00.1/asmrun/power64-elf.S +--- ocaml-4.00.1.orig/asmrun/power64-elf.S 1970-01-01 08:00:00.000000000 +0800 ++++ ocaml-4.00.1/asmrun/power64-elf.S 2013-02-16 22:05:07.025814584 +0800 @@ -0,0 +1,486 @@ +/*********************************************************************/ +/* */ @@ -2081,11 +2027,10 @@ + .short 0 /* no roots here */ + .align 3 + -diff --git a/asmrun/stack.h b/asmrun/stack.h -index c778873..f1d2e6a 100644 ---- a/asmrun/stack.h -+++ b/asmrun/stack.h -@@ -65,6 +65,15 @@ +diff -urN ocaml-4.00.1.orig/asmrun/stack.h ocaml-4.00.1/asmrun/stack.h +--- ocaml-4.00.1.orig/asmrun/stack.h 2013-02-16 21:54:39.472644964 +0800 ++++ ocaml-4.00.1/asmrun/stack.h 2013-02-16 22:00:58.330552118 +0800 +@@ -47,6 +47,15 @@ #define Callback_link(sp) ((struct caml_context *)((sp) + Trap_frame_size)) #endif @@ -2098,38 +2043,35 @@ +#define Callback_link(sp) ((struct caml_context *)((sp) + Trap_frame_size)) +#endif + - #ifdef TARGET_m68k + #ifdef TARGET_arm #define Saved_return_address(sp) *((intnat *)((sp) - 4)) #define Callback_link(sp) ((struct caml_context *)((sp) + 8)) -diff --git a/configure b/configure -index d0a6b0f..6ed0a9c 100755 ---- a/configure -+++ b/configure -@@ -685,6 +685,7 @@ case "$host" in - hppa2.0*-*-hpux*) arch=hppa; system=hpux;; - hppa*-*-linux*) arch=hppa; system=linux;; - hppa*-*-gnu*) arch=hppa; system=gnu;; -+ powerpc64-*-linux*) arch=power64; model=ppc64; system=elf;; +diff -urN ocaml-4.00.1.orig/configure ocaml-4.00.1/configure +--- ocaml-4.00.1.orig/configure 2013-02-16 21:54:39.555645380 +0800 ++++ ocaml-4.00.1/configure 2013-02-16 22:00:06.350289275 +0800 +@@ -686,6 +686,7 @@ + arch=i386; system=macosx + fi;; + i[3456]86-*-gnu*) arch=i386; system=gnu;; ++ powerpc64-*-linux*) arch=power; model=ppc; 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;; -@@ -709,7 +710,7 @@ esac +@@ -712,7 +713,7 @@ if $arch64; then case "$arch,$model" in -- sparc,default|mips,default|hppa,default|power,ppc) -+ sparc,default|mips,default|hppa,default) +- sparc,default|power,ppc) ++ sparc,default) arch=none; model=default; system=unknown;; esac fi -@@ -772,6 +773,8 @@ case "$arch,$model,$system" in - aspp='as -n32 -O2';; - power,*,elf) as='as -u -m ppc' +@@ -755,6 +756,8 @@ + aspp='/usr/ccs/bin/as -P';; + i386,*,*) as='as' aspp='gcc -c';; + power64,*,elf) as='as -u -m ppc64' -+ aspp='gcc -c';; - power,*,bsd) as='as' ++ aspp='gcc -c';; + power,*,elf) as='as -u -m ppc' aspp='gcc -c';; - power,*,rhapsody) as="as -arch $model" --- -1.7.10.1 + power,*,bsd) as='as' ++++++ ocaml-rpath.patch ++++++ --- /var/tmp/diff_new_pack.Uyk0Si/_old 2013-03-12 06:57:11.000000000 +0100 +++ /var/tmp/diff_new_pack.Uyk0Si/_new 2013-03-12 06:57:11.000000000 +0100 @@ -1,8 +1,8 @@ -Index: tools/Makefile.shared +Index: ocaml-4.00.1/tools/Makefile.shared =================================================================== ---- tools/Makefile.shared.orig -+++ tools/Makefile.shared -@@ -108,9 +108,6 @@ ocamlmklib.ml: ocamlmklib.mlp ../config/ +--- ocaml-4.00.1.orig/tools/Makefile.shared ++++ ocaml-4.00.1/tools/Makefile.shared +@@ -114,9 +114,6 @@ ocamlmklib.ml: ocamlmklib.mlp ../config/ sed -e "s|%%BINDIR%%|$(BINDIR)|" \ -e "s|%%SUPPORTS_SHARED_LIBRARIES%%|$(SUPPORTS_SHARED_LIBRARIES)|" \ -e "s|%%MKSHAREDLIB%%|$(MKSHAREDLIB)|" \ ++++++ ocaml-rpmoptflags.patch ++++++ Index: ocaml-4.00.1/asmrun/Makefile =================================================================== --- ocaml-4.00.1.orig/asmrun/Makefile +++ ocaml-4.00.1/asmrun/Makefile @@ -18,9 +18,9 @@ include ../config/Makefile CC=$(NATIVECC) FLAGS=-I../byterun -DCAML_NAME_SPACE -DNATIVE_CODE \ -DTARGET_$(ARCH) -DSYS_$(SYSTEM) $(IFLEXDIR) -CFLAGS=$(FLAGS) -O $(NATIVECCCOMPOPTS) +CFLAGS=$(FLAGS) $(RPM_OPT_FLAGS) -O $(NATIVECCCOMPOPTS) DFLAGS=$(FLAGS) -g -DDEBUG $(NATIVECCCOMPOPTS) -PFLAGS=$(FLAGS) -pg -O -DPROFILING $(NATIVECCPROFOPTS) +PFLAGS=$(FLAGS) $(RPM_OPT_FLAGS) -pg -O -DPROFILING $(NATIVECCPROFOPTS) COBJS=startup.o main.o fail.o roots.o globroots.o signals.o signals_asm.o \ misc.o freelist.o major_gc.o minor_gc.o memory.o alloc.o compare.o ints.o \ Index: ocaml-4.00.1/configure =================================================================== --- ocaml-4.00.1.orig/configure +++ ocaml-4.00.1/configure @@ -347,7 +347,7 @@ esac # Configure compiler to use in further tests -cc="$bytecc -O $bytecclinkopts" +cc="$bytecc $RPM_OPT_FLAGS $bytecclinkopts" export cc cclibs verbose # Check C compiler Index: ocaml-4.00.1/otherlibs/Makefile =================================================================== --- ocaml-4.00.1.orig/otherlibs/Makefile +++ ocaml-4.00.1/otherlibs/Makefile @@ -17,7 +17,7 @@ CAMLC=$(ROOTDIR)/ocamlcomp.sh CAMLOPT=$(ROOTDIR)/ocamlcompopt.sh -CFLAGS=-I$(ROOTDIR)/byterun -O $(SHAREDCCCOMPOPTS) $(EXTRACFLAGS) +CFLAGS=$(RPM_OPT_FLAGS) -I$(ROOTDIR)/byterun -O $(SHAREDCCCOMPOPTS) $(EXTRACFLAGS) include ../Makefile.shared # Note .. is the current directory (this makefile is included from Index: ocaml-4.00.1/otherlibs/labltk/support/Makefile =================================================================== --- ocaml-4.00.1.orig/otherlibs/labltk/support/Makefile +++ ocaml-4.00.1/otherlibs/labltk/support/Makefile @@ -28,7 +28,7 @@ COBJS=cltkCaml.$(O) cltkUtf.$(O) cltkEva cltkFile.$(O) cltkMain.$(O) cltkMisc.$(O) cltkTimer.$(O) \ cltkVar.$(O) cltkWait.$(O) cltkImg.$(O) -CCFLAGS=-I../../../byterun $(TK_DEFS) $(SHAREDCCCOMPOPTS) +CCFLAGS=$(RPM_OPT_FLAGS) -I../../../byterun $(TK_DEFS) $(SHAREDCCCOMPOPTS) COMPFLAGS=-I $(OTHERS)/win32unix -I $(OTHERS)/unix THFLAGS=-I $(OTHERS)/systhreads -I $(OTHERS)/threads Index: ocaml-4.00.1/otherlibs/systhreads/Makefile =================================================================== --- ocaml-4.00.1.orig/otherlibs/systhreads/Makefile +++ ocaml-4.00.1/otherlibs/systhreads/Makefile @@ -33,7 +33,7 @@ libthreads.a: $(BYTECODE_C_OBJS) $(MKLIB) -o threads $(BYTECODE_C_OBJS) -lpthread st_stubs_b.o: st_stubs.c st_posix.h - $(BYTECC) -O -I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS) \ + $(BYTECC) $(RPM_OPT_FLAGS) -O -I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS) \ -c st_stubs.c mv st_stubs.o st_stubs_b.o @@ -43,7 +43,7 @@ libthreadsnat.a: $(NATIVECODE_C_OBJS) $(AR) rc libthreadsnat.a $(NATIVECODE_C_OBJS) st_stubs_n.o: st_stubs.c st_posix.h - $(NATIVECC) -O -I../../asmrun -I../../byterun $(NATIVECCCOMPOPTS) $(SHAREDCCCOMPOPTS) -DNATIVE_CODE -DTARGET_$(ARCH) -DSYS_$(SYSTEM) -c st_stubs.c + $(NATIVECC) $(RPM_OPT_FLAGS) -O -I../../asmrun -I../../byterun $(NATIVECCCOMPOPTS) $(SHAREDCCCOMPOPTS) -DNATIVE_CODE -DTARGET_$(ARCH) -DSYS_$(SYSTEM) -c st_stubs.c mv st_stubs.o st_stubs_n.o threads.cma: $(THREAD_OBJS) Index: ocaml-4.00.1/otherlibs/threads/Makefile =================================================================== --- ocaml-4.00.1.orig/otherlibs/threads/Makefile +++ ocaml-4.00.1/otherlibs/threads/Makefile @@ -16,7 +16,7 @@ include ../../config/Makefile CC=$(BYTECC) -CFLAGS=-I../../byterun -O $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS) -g +CFLAGS=-I../../byterun $(RPM_OPT_FLAGS) $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS) -g CAMLC=../../ocamlcomp.sh -I ../unix MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib COMPFLAGS=-warn-error A Index: ocaml-4.00.1/yacc/Makefile =================================================================== --- ocaml-4.00.1.orig/yacc/Makefile +++ ocaml-4.00.1/yacc/Makefile @@ -17,7 +17,7 @@ include ../config/Makefile CC=$(BYTECC) -CFLAGS=-O -DNDEBUG $(BYTECCCOMPOPTS) +CFLAGS=$(RPM_OPT_FLAGS) -DNDEBUG $(BYTECCCOMPOPTS) OBJS= closure.o error.o lalr.o lr0.o main.o mkpar.o output.o reader.o \ skeleton.o symtab.o verbose.o warshall.o -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
