Mailinglist Archive: opensuse-commit (1003 mails)
| < Previous | Next > |
commit ocaml
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Tue, 05 Jun 2007 16:30:48 +0200
- Message-id: <20070605143048.6D8526780D3@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package ocaml
checked in at Tue Jun 5 16:30:48 CEST 2007.
--------
--- ocaml/ocaml.changes 2007-03-29 12:19:32.000000000 +0200
+++ /mounts/work_users/ro/STABLE/ocaml/ocaml.changes 2007-05-16 16:19:35.629194000 +0200
@@ -1,0 +2,30 @@
+Wed May 16 16:17:21 CEST 2007 - ro@xxxxxxx
+
+- split up package similar to f-e
+- update to 3.09.3
+ * featurelist
+ - ocamldoc: name resolution in cross-referencing {!name}: if name is not
+ found, then it is searched in the parent module/class, and in the parent
+ of the parent, and so on until it is found.
+ - ocamldoc: new option -short-functors to use a short form to display
+ functors in html generator PR#4017
+ - ocamlprof: added "-version" option
+ - ported to MacOS X on Intel PR#3985
+ - configure: added support for GNU Hurd PR#3991
+ - otherlibs/labltk: browser uses menu bars instead of menu buttons
+ - Introduction of private row types, for abstracting the row in object
+ and variant types.
+ - configure: find X11 config in some 64-bit Linux distribs
+ - ocamldoc: (**/**) can be canceled with another (**/**) PR#3665
+ - graphics: added resize_window
+ - graphics: check for invalid arguments to drawing primitives PR#3595
+ - ocamlbrowser: use windows subsystem on mingw
+ * disruptive changes
+ * Revised implementation of the -pack option (packing of several compilation
+ units into one). The .cmx files that are to be packed with
+ "ocamlopt -pack -o P.cmx" must be compiled with "ocamlopt -for-pack P".
+ In exchange for this additional constraint, ocamlopt -pack is now
+ available on all platforms (no need for binutils).
+ * Fixed wrong evaluation order for arguments to certain inlined functions.
+
+-------------------------------------------------------------------
Old:
----
ocaml-3.04-ia64.dif
ocaml-3.08.3.tar.bz2
ocaml-3.08-refman.html.tar.bz2
ocaml-3.08-refman.info.tar.bz2
ocaml-3.08-refman.ps.bz2
New:
----
ocaml-3.09.3.tar.bz2
ocaml-3.09-emacs_localcompile.patch
ocaml-3.09-refman.html.tar.bz2
ocaml-3.09-refman.info.tar.bz2
ocaml-3.09-refman.ps.bz2
ocaml-rpath.patch
rpmlintrc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ocaml.spec ++++++
--- /var/tmp/diff_new_pack.Z21498/_old 2007-06-05 16:30:05.000000000 +0200
+++ /var/tmp/diff_new_pack.Z21498/_new 2007-06-05 16:30:05.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package ocaml (Version 3.08.3)
+# spec file for package ocaml (Version 3.09.3)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,24 +11,26 @@
# norootforbuild
Name: ocaml
-BuildRequires: gdbm-devel gtk-devel ncurses-devel
+BuildRequires: emacs-nox gdbm-devel gtk-devel ncurses-devel tk-devel
License: GNU General Public License (GPL), THE Q PUBLIC LICENSE (QPL)
Group: Development/Languages/Other
Autoreqprov: on
-Version: 3.08.3
-Release: 51
-%define doc_version 3.08
+Version: 3.09.3
+Release: 1
+%define doc_version 3.09
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
+Source4: rpmlintrc
Patch0: ocaml-3.00-camldebug_el.patch
Patch1: ocaml-3.04-info.patch
Patch2: ocaml-3.04-ocamltags--no-site-start.patch
-Patch3: ocaml-3.04-ia64.dif
+Patch3: ocaml-rpath.patch
Patch4: ocaml-3.08.1-type_punning.patch
Patch5: ocaml-3.08.3-gcc4.patch
Patch6: ocaml-3.08.3.patch
+Patch7: ocaml-3.09-emacs_localcompile.patch
URL: http://caml.inria.fr/
Summary: The Objective Caml Compiler and Programming Environment
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -48,6 +50,123 @@
--------
Pierre Weis <Pierre.Weis@xxxxxxxx>
+%package devel
+Summary: The Objective Caml Compiler and Programming Environment
+Group: Development/Languages/Other
+Provides: libz:/usr/include/zlib.h
+Requires: zlib = %{version}
+Autoreqprov: on
+
+%description devel
+Objective Caml is a high-level, strongly-typed, functional and
+object-oriented programming language from the ML family of languages.
+
+This package comprises two batch compilers (a fast bytecode compiler
+and an optimizing native-code compiler), an interactive top level
+system, Lex&Yacc tools, a replay debugger, and a comprehensive library.
+
+
+
+Authors:
+--------
+ Pierre Weis <Pierre.Weis@xxxxxxxx>
+
+%package -n labltk
+Group: Development/Languages/Other
+Summary: The Objective Caml Compiler and Programming Environment
+Requires: ocaml = %{version}-%{release}
+
+%description -n labltk
+Objective Caml is a high-level, strongly-typed, functional and
+object-oriented programming language from the ML family of languages.
+
+This package comprises two batch compilers (a fast bytecode compiler
+and an optimizing native-code compiler), an interactive top level
+system, Lex&Yacc tools, a replay debugger, and a comprehensive library.
+
+
+
+Authors:
+--------
+ Pierre Weis <Pierre.Weis@xxxxxxxx>
+
+%package -n camlp4
+Group: Development/Languages/Other
+Summary: The Objective Caml compiler and programming environment
+Requires: ocaml = %{version}-%{release}
+
+%description -n camlp4
+Objective Caml is a high-level, strongly-typed, functional and
+object-oriented programming language from the ML family of languages.
+
+This package comprises two batch compilers (a fast bytecode compiler
+and an optimizing native-code compiler), an interactive toplevel
+system, Lex&Yacc tools, a replay debugger, and a comprehensive library.
+
+
+
+Authors:
+--------
+ Pierre Weis <Pierre.Weis@xxxxxxxx>
+
+%package ocamldoc
+Group: Development/Languages/Other
+Summary: The Objective Caml Compiler and Programming Environment
+Requires: ocaml = %{version}-%{release}
+
+%description ocamldoc
+Objective Caml is a high-level, strongly-typed, functional and
+object-oriented programming language from the ML family of languages.
+
+This package comprises two batch compilers (a fast bytecode compiler
+and an optimizing native-code compiler), an interactive top level
+system, Lex&Yacc tools, a replay debugger, and a comprehensive library.
+
+
+
+Authors:
+--------
+ Pierre Weis <Pierre.Weis@xxxxxxxx>
+
+%package emacs
+Group: Development/Languages/Other
+Summary: The Objective Caml Compiler and Programming Environment
+Requires: ocaml = %{version}-%{release}
+Requires: emacs
+
+%description emacs
+Objective Caml is a high-level, strongly-typed, functional and
+object-oriented programming language from the ML family of languages.
+
+This package comprises two batch compilers (a fast bytecode compiler
+and an optimizing native-code compiler), an interactive top level
+system, Lex&Yacc tools, a replay debugger, and a comprehensive library.
+
+
+
+Authors:
+--------
+ Pierre Weis <Pierre.Weis@xxxxxxxx>
+
+%package docs
+Group: Development/Languages/Other
+Summary: The Objective Caml Compiler and Programming Environment
+Requires: ocaml = %{version}-%{release}
+
+%description docs
+Objective Caml is a high-level, strongly-typed, functional and
+object-oriented programming language from the ML family of languages.
+
+This package comprises two batch compilers (a fast bytecode compiler
+and an optimizing native-code compiler), an interactive top level
+system, Lex&Yacc tools, a replay debugger, and a comprehensive library.
+
+
+
+Authors:
+--------
+ Pierre Weis <Pierre.Weis@xxxxxxxx>
+
%prep
%setup -q -T -b 0
%setup -q -T -D -a 1
@@ -56,10 +175,12 @@
gzip -d infoman/ocaml.info.gz
%patch1 -p1
%patch2 -p1
-%patch3
+%patch3 -p1
%patch4
%patch5
%patch6
+%patch7
+find -name ".cvsignore" | xargs -r rm -f
%build
cp -f /usr/share/libtool/config.guess config/gnu/
@@ -70,8 +191,8 @@
./configure -bindir %{_bindir} \
-libdir %{_libdir}/ocaml \
-mandir %{_mandir} \
- -x11include %{_includedir}/X11 \
- -x11lib %{_libdir}/X11
+ -x11include %{_includedir} \
+ -x11lib %{_libdir}
flag=$(echo %{optflags} | sed 's/-fomit-frame-pointer//')
%ifarch s390 s390x ppc64
make BYTECCCOMPOPTS="$flag -fno-defer-pop -fno-strict-aliasing" \
@@ -97,7 +218,10 @@
%endif
install -d $RPM_BUILD_ROOT%{_infodir} \
$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
-(cd emacs; make install install-ocamltags EMACSDIR=$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp)
+(cd emacs
+make install BINDIR=$RPM_BUILD_ROOT/%{_bindir} EMACSDIR=$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
+make install-ocamltags BINDIR=$RPM_BUILD_ROOT/%{_bindir}
+)
(cd infoman; cp -f ocaml* $RPM_BUILD_ROOT%{_infodir})
install -d $RPM_BUILD_ROOT%{_sysconfdir}/emacs/site-start.d
cat <<EOF >$RPM_BUILD_ROOT%{_sysconfdir}/emacs/site-start.d/%{name}.el
@@ -108,6 +232,7 @@
export EXCLUDE_FROM_STRIP="ocamldebug ocamlbrowser"
sed s,$RPM_BUILD_ROOT,,g < $RPM_BUILD_ROOT%{_libdir}/ocaml/ld.conf >/tmp/buildroot_sucks_ass
mv /tmp/buildroot_sucks_ass $RPM_BUILD_ROOT%{_libdir}/ocaml/ld.conf
+sed -i -e "s@$RPM_BUILD_ROOT@@" $RPM_BUILD_ROOT/%{_libdir}/ocaml/Makefile.config
%post
%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
@@ -120,18 +245,93 @@
%files
%defattr(-,root,root)
-%config(noreplace) %{_sysconfdir}/emacs/site-start.d
-%dir %{_sysconfdir}/emacs
-%dir %{_datadir}/emacs
-%dir %{_datadir}/emacs/site-lisp
-%doc Changes LICENSE README htmlman/*
-%{_mandir}/*/*
+%doc Changes LICENSE README
%{_bindir}/*
+%{_mandir}/*/*
%{_libdir}/ocaml
%{_infodir}/*
+%exclude %{_bindir}/camlp4*
+%exclude %{_bindir}/mkcamlp4
+%exclude %{_bindir}/ocpp
+%exclude %{_bindir}/labltk
+%exclude %{_bindir}/ocamltags
+%exclude %{_bindir}/ocamlbrowser
+%exclude %{_bindir}/ocamldoc*
+%exclude %{_libdir}/ocaml/camlp4
+%exclude %{_libdir}/ocaml/labltk
+%exclude %{_libdir}/ocaml/ocamldoc
+%exclude %{_mandir}/man1/camlp4*
+%exclude %{_mandir}/man1/mkcamlp4*
+%exclude %{_libdir}/ocaml/stublibs/dlllabltk.so
+%exclude %{_libdir}/ocaml/stublibs/dlltkanim.so
+
+%files -n labltk
+%defattr(-,root,root,-)
+%{_bindir}/labltk
+%{_bindir}/ocamlbrowser
+%{_libdir}/ocaml/labltk
+%{_libdir}/ocaml/stublibs/dlllabltk.so
+%{_libdir}/ocaml/stublibs/dlltkanim.so
+%doc otherlibs/labltk/examples_labltk
+%doc otherlibs/labltk/examples_camltk
+
+%files -n camlp4
+%defattr(-,root,root,-)
+%{_bindir}/camlp4*
+%{_bindir}/mkcamlp4
+%{_bindir}/ocpp
+%{_libdir}/ocaml/camlp4
+%{_mandir}/man1/camlp4*
+%{_mandir}/man1/mkcamlp4*
+
+%files ocamldoc
+%defattr(-,root,root,-)
+%{_bindir}/ocamldoc*
+%{_libdir}/ocaml/ocamldoc
+%doc ocamldoc/Changes.txt
+
+%files docs
+%defattr(-,root,root,-)
+%doc htmlman
+
+%files emacs
+%defattr(-,root,root,-)
+%doc emacs/README
+%dir %{_sysconfdir}/emacs
+%config(noreplace) %{_sysconfdir}/emacs/site-start.d
+%dir %{_datadir}/emacs
+%dir %{_datadir}/emacs/site-lisp
%{_datadir}/emacs/site-lisp/*
+%{_bindir}/ocamltags
%changelog
+* Wed May 16 2007 - ro@xxxxxxx
+- split up package similar to f-e
+- update to 3.09.3
+ * featurelist
+ - ocamldoc: name resolution in cross-referencing {!name}: if name is not
+ found, then it is searched in the parent module/class, and in the parent
+ of the parent, and so on until it is found.
+ - ocamldoc: new option -short-functors to use a short form to display
+ functors in html generator PR#4017
+ - ocamlprof: added "-version" option
+ - ported to MacOS X on Intel PR#3985
+ - configure: added support for GNU Hurd PR#3991
+ - otherlibs/labltk: browser uses menu bars instead of menu buttons
+ - Introduction of private row types, for abstracting the row in object
+ and variant types.
+ - configure: find X11 config in some 64-bit Linux distribs
+ - ocamldoc: (**/**) can be canceled with another (**/**) PR#3665
+ - graphics: added resize_window
+ - graphics: check for invalid arguments to drawing primitives PR#3595
+ - ocamlbrowser: use windows subsystem on mingw
+ * disruptive changes
+ * Revised implementation of the -pack option (packing of several compilation
+ units into one). The .cmx files that are to be packed with
+ "ocamlopt -pack -o P.cmx" must be compiled with "ocamlopt -for-pack P".
+ In exchange for this additional constraint, ocamlopt -pack is now
+ available on all platforms (no need for binutils).
+ * Fixed wrong evaluation order for arguments to certain inlined functions.
* Thu Mar 29 2007 - rguenther@xxxxxxx
- add emacs site-lisp directories
* Fri Mar 23 2007 - rguenther@xxxxxxx
++++++ ocaml-3.08.1-type_punning.patch ++++++
--- /var/tmp/diff_new_pack.Z21498/_old 2007-06-05 16:30:05.000000000 +0200
+++ /var/tmp/diff_new_pack.Z21498/_new 2007-06-05 16:30:05.000000000 +0200
@@ -6,7 +6,7 @@
int i, new_level;
+ union { struct global_root_list *grl; struct global_root *gr; }pun;
- Assert (((long) r & 3) == 0); /* compact.c demands this (for now) */
+ Assert (((intnat) r & 3) == 0); /* compact.c demands this (for now) */
+ pun.grl = &caml_global_roots;
/* Init "cursor" to list head */
++++++ ocaml-3.08.3-gcc4.patch ++++++
--- /var/tmp/diff_new_pack.Z21498/_old 2007-06-05 16:30:05.000000000 +0200
+++ /var/tmp/diff_new_pack.Z21498/_new 2007-06-05 16:30:05.000000000 +0200
@@ -1,23 +1,21 @@
--- otherlibs/num/bng_ia32.c
+++ otherlibs/num/bng_ia32.c
-@@ -121,8 +121,8 @@
+@@ -121,7 +121,7 @@
"leal 4(%1), %1 \n\t"
"decl %2 \n\t"
"jnz 1b"
-- : "+&r" (a), "+&r" (b), "+&rm" (blen), "+&r" (out)
-- : "rm" (d)
+- : "+&r" (a), "+&r" (b), "+&r" (blen), "=m" (out)
+ : "+r" (a), "+r" (b), "+m" (blen), "+r" (out)
-+ : "m" (d)
+ : "m" (d)
: "eax", "edx");
}
- if (alen == 0) return out;
@@ -164,7 +164,7 @@
"leal 4(%1), %1 \n\t"
"decl %2 \n\t"
"jnz 1b"
-- : "+&r" (a), "+&r" (b), "+&rm" (blen), "+&rm" (out), "=&r" (tmp)
+- : "+&r" (a), "+&r" (b), "=m" (blen), "=m" (out), "=&r" (tmp)
+ : "+r" (a), "+r" (b), "+m" (blen), "+m" (out), "=&r" (tmp)
- : "rm" (d)
+ : "m" (d)
: "eax", "edx");
}
@@ -210,7 +210,7 @@
++++++ ocaml-3.08.3.tar.bz2 -> ocaml-3.09.3.tar.bz2 ++++++
++++ 61826 lines of diff (skipped)
++++++ ocaml-3.09-emacs_localcompile.patch ++++++
--- emacs/Makefile
+++ emacs/Makefile
@@ -19,6 +19,10 @@
inf-caml.el caml-compat.el caml-help.el caml-types.el \
caml-xemacs.el caml-emacs.el
+FILES_COMP= caml-xemacs.elc caml-emacs.elc caml.elc \
+ inf-caml.elc caml-help.elc caml-types.elc \
+ camldebug.elc
+
# Where to install. If empty, automatically determined.
#EMACSDIR=
@@ -60,10 +64,10 @@
simple-install:
@echo "Installing in $(EMACSDIR)..."
if test -d $(EMACSDIR); then : ; else mkdir -p $(EMACSDIR); fi
- cp $(FILES) $(EMACSDIR)
if [ -z "$(NOCOMPILE)" ]; then \
- cd $(EMACSDIR); $(EMACS) --batch --eval '$(COMPILECMD)'; \
+ $(EMACS) --batch --eval '$(COMPILECMD)'; \
fi
+ cp $(FILES) $(FILES_COMP) $(EMACSDIR)
ocamltags: ocamltags.in
sed -e 's:@EMACS@:$(EMACS):' ocamltags.in >ocamltags
++++++ ocaml-3.08-refman.html.tar.bz2 -> ocaml-3.09-refman.html.tar.bz2 ++++++
++++ 27577 lines of diff (skipped)
++++++ ocaml-3.08-refman.info.tar.bz2 -> ocaml-3.09-refman.info.tar.bz2 ++++++
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-1.gz and new/infoman/ocaml.info-1.gz differ
Files old/infoman/ocaml.info-2.gz and new/infoman/ocaml.info-2.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.gz and new/infoman/ocaml.info.gz differ
++++++ ocaml-rpath.patch ++++++
--- ocaml-3.08.2/tools/Makefile.rpath 2005-02-12 11:38:17.000000000 +0100
+++ ocaml-3.08.2/tools/Makefile 2005-02-12 11:38:41.000000000 +0100
@@ -101,9 +101,6 @@
sed -e "s|%%BINDIR%%|$(BINDIR)|" \
-e "s|%%SUPPORTS_SHARED_LIBRARIES%%|$(SUPPORTS_SHARED_LIBRARIES)|" \
-e "s|%%MKSHAREDLIB%%|$(MKSHAREDLIB)|" \
- -e "s|%%BYTECCRPATH%%|$(BYTECCRPATH)|" \
- -e "s|%%NATIVECCRPATH%%|$(NATIVECCRPATH)|" \
- -e "s|%%MKSHAREDLIBRPATH%%|$(MKSHAREDLIBRPATH)|" \
-e "s|%%RANLIB%%|$(RANLIB)|" \
ocamlmklib.mlp >> ocamlmklib.ml
--- ocaml-3.08.2/tools/ocamlmklib.mlp.rpath 2005-02-12 11:46:55.646162346 +0100
+++ ocaml-3.08.2/tools/ocamlmklib.mlp 2005-02-12 11:49:11.411467461 +0100
@@ -17,9 +17,9 @@
let bindir = "%%BINDIR%%"
and supports_shared_libraries = %%SUPPORTS_SHARED_LIBRARIES%%
and mksharedlib = "%%MKSHAREDLIB%%"
-and bytecc_rpath = "%%BYTECCRPATH%%"
-and nativecc_rpath = "%%NATIVECCRPATH%%"
-and mksharedlib_rpath = "%%MKSHAREDLIBRPATH%%"
+and bytecc_rpath = ""
+and nativecc_rpath = ""
+and mksharedlib_rpath = ""
and ranlib = "%%RANLIB%%"
let bytecode_objs = ref [] (* .cmo,.cma,.ml,.mli files to pass to ocamlc *)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |