[packages/ocaml] - updated to 4.02.1 (ocaml 3.x left on ocaml-3 branch) - updated CFLAGS,as_needed patches - removed

qboosh qboosh at pld-linux.org
Fri Nov 7 21:57:45 CET 2014 

commit e091ab7c85bb4535c9907b06e3f27781b59e70f9
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Nov 7 21:58:06 2014 +0100

    - updated to 4.02.1 (ocaml 3.x left on ocaml-3 branch)
    - updated CFLAGS,as_needed patches
    - removed outdated db3,gas,tcl86 patches
    - DBM module, labltk and camlp4 removed upstream; now they can be found in
      ocaml-dbm, ocaml-labltk, ocaml-camlp4 specs respectively

 ocaml-CFLAGS.patch    | 110 +++++++-----------------
 ocaml-as_needed.patch |  10 +--
 ocaml-db3.patch       |  71 ----------------
 ocaml-gas.patch       |  12 ---
 ocaml-tcl86.patch     |  19 -----
 ocaml.spec            | 228 +++++++++++---------------------------------------
 6 files changed, 84 insertions(+), 366 deletions(-)
---
diff --git a/ocaml.spec b/ocaml.spec
index 815b461..1aca392 100644
--- a/ocaml.spec
+++ b/ocaml.spec
@@ -2,51 +2,33 @@
 # Conditional build:
 %bcond_without	emacs	# without emacs subpackage
 %bcond_without	x	# without X11 support 
-%bcond_without	tk	# without Tcl/Tk support
-#
-# --without x11 implies --without tk
-%{!?with_x:%undefine	with_tk}
 
-%define		p4ver	3.06
-%define		sver	3.12
+%define		sver	4.02
 
 Summary:	The Objective Caml compiler and programming environment
 Summary(pl.UTF-8):	Kompilator OCamla (Objective Caml) oraz środowisko programistyczne
 Name:		ocaml
-Version:	3.12.1
-Release:	21
+Version:	4.02.1
+Release:	1
 Epoch:		1
-License:	distributable
+License:	QPL v1.0 with linking exception (compiler), LGPL v2 with linking exception (library)
 Group:		Development/Languages
-Source0:	http://caml.inria.fr/distrib/%{name}-%{sver}/%{name}-%{version}.tar.bz2
-# Source0-md5:	227a3daaedb150bf5037a3db01f5bf42
-Source1:	http://caml.inria.fr/distrib/%{name}-%{sver}/%{name}-%{sver}-refman.html.tar.gz
-# Source1-md5:	93cd91f525441eb7e94cc49b9b64bab0
+Source0:	http://caml.inria.fr/distrib/%{name}-%{sver}/%{name}-%{version}.tar.xz
+# Source0-md5:	d74ac1b1179af362491e14349dd1958b
+Source1:	http://caml.inria.fr/distrib/%{name}-%{sver}/%{name}-%{sver}-refman-html.tar.gz
+# Source1-md5:	915a1949f7af7186e16354e9682dc1e5
 Source2:	http://caml.inria.fr/distrib/%{name}-%{sver}/%{name}-%{sver}-refman.ps.gz
-# Source2-md5:	a9c17db6ffd400c5ea00c6d51cbf56bf
+# Source2-md5:	e85016fa23b6525d1d10da06010fd90a
 Source3:	http://caml.inria.fr/distrib/%{name}-%{sver}/%{name}-%{sver}-refman.info.tar.gz
-# Source3-md5:	8cf24c4f69c6f9c9f9cc1edb9b18f6cb
-# following 4 URLs are dead, some version now available at http://pauillac.inria.fr/camlp4/
-Source4:	ftp://ftp.inria.fr/INRIA/Projects/cristal/camlp4/camlp4-%{p4ver}-manual.html.tar.gz
-# Source4-md5:	21370bae4e7f6435b38aeb21db7ce8bb
-Source5:	ftp://ftp.inria.fr/INRIA/Projects/cristal/camlp4/camlp4-%{p4ver}-manual.dvi.gz
-# Source5-md5:	035915d1a530aa7ec9b194d9a7d258eb
-Source6:	ftp://ftp.inria.fr/INRIA/Projects/cristal/camlp4/camlp4-%{p4ver}-tutorial.html.tar.gz
-# Source6-md5:	96d8eb4ca5abd58c9a280ba59f73b192
-Source7:	ftp://ftp.inria.fr/INRIA/Projects/cristal/camlp4/camlp4-%{p4ver}-tutorial.dvi.gz
-# Source7-md5:	fcd87c235109364242a0c9ccf176dff8
-Source8:	http://www.ocaml.info/ocaml_sources/pure-fun-1.0.6.tar.bz2
-# Source8-md5:	94eac3fa1ac51b8ada344b04839cb43c
-Source9:	http://www.ocaml.info/ocaml_sources/ds-contrib.tar.gz
-# Source9-md5:	77fa1da7375dea1393cc0b6cd802d7e1
-Patch0:		%{name}-db3.patch
+# Source3-md5:	265b7db123e925e8b7b70ca2266b4206
+Source4:	https://github.com/mmottl/pure-fun/archive/v1.0.13/pure-fun-1.0.13.tar.gz
+# Source4-md5:	0a6ff033df78d0880fe4883ace025ebe
+# note: dead URL
+Source5:	http://www.ocaml.info/ocaml_sources/ds-contrib.tar.gz
+# Source5-md5:	77fa1da7375dea1393cc0b6cd802d7e1
 Patch1:		%{name}-CFLAGS.patch
 Patch2:		%{name}-as_needed.patch
-Patch3:		%{name}-gas.patch
-Patch4:		%{name}-tcl86.patch
 URL:		http://caml.inria.fr/
-BuildRequires:	db-devel >= 4.1
-%{?with_tk:BuildRequires:	tk-devel}
 %{?with_x:BuildRequires:	xorg-lib-libX11-devel}
 %if %{with emacs}
 BuildRequires:	sed >= 4.0
@@ -70,13 +52,15 @@ system, Lex&Yacc tools, a replay debugger, and a comprehensive
 library.
 
 %description -l pl.UTF-8
-OCaml (Objective Caml) jest funkcyjnym, obiektowo zorientowanym językiem
-wysokiego poziomu z silnym typowaniem. Należy do rodziny języków ML.
+OCaml (Objective Caml) jest funkcyjnym, obiektowo zorientowanym
+językiem wysokiego poziomu z silnym typowaniem. Należy do rodziny
+języków ML.
 
 Ten pakiet zawiera dwa kompilatory (szybki kompilator do bajtkodu
-oraz optymalizujący kompilator do kodu natywnego), interaktywne środowisko
-pracy, narzędzia do tworzenia analizatorów leksykalnych oraz składniowych
-(ocamllex, ocamlyacc), odpluskwiacz (ocamldebug) i biblioteki.
+oraz optymalizujący kompilator do kodu natywnego), interaktywne
+środowisko pracy, narzędzia do tworzenia analizatorów leksykalnych
+oraz składniowych (ocamllex, ocamlyacc), odpluskwiacz (ocamldebug) i
+biblioteki.
 
 %package runtime
 Summary:	Runtime system for OCaml
@@ -89,8 +73,8 @@ ocamlrun bytecode interpreter, and basic dynamic link libraries.
 
 %description runtime -l pl.UTF-8
 Pakiet ten zawiera binaria potrzebne do uruchamiania programów w
-OCamlu skompilowanych do bajtkodu: interpreter bajtkodu (ocamlrun) oraz
-podstawowe biblioteki linkowane dynamicznie.
+OCamlu skompilowanych do bajtkodu: interpreter bajtkodu (ocamlrun)
+oraz podstawowe biblioteki linkowane dynamicznie.
 
 %package lib-source
 Summary:	Sources of OCaml standard library
@@ -99,7 +83,8 @@ Group:		Development/Languages
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description lib-source
-This sources come helpful during debugging of user programs with ocamldebug.
+This sources come helpful during debugging of user programs with
+ocamldebug.
 
 %description lib-source -l pl.UTF-8
 Źródła te są przydatne przy odpluskwianiu programów użytkownika
@@ -150,36 +135,6 @@ Emacs mode files for Objective Caml language.
 %description emacs -l pl.UTF-8
 Pliki trybu OCamla dla Emacsa.
 
-%package labltk
-Summary:	Runtime for LablTk library
-Summary(pl.UTF-8):	Środowisko uruchomieniowe dla biblioteki LablTk
-Group:		Libraries
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-
-%description labltk
-LablTk gives OCaml program access to Tcl/Tk GUI widgets. This package
-contains files needed to run bytecode OCaml programs using LablTk.
-
-%description labltk -l pl.UTF-8
-Biblioteka LablTk daje programom napisanym w OCamlu dostęp do widgetów
-Tcl/Tk. Pakiet ten zawiera binaria potrzebne do uruchamiania programów
-używających LablTk.
-
-%package labltk-devel
-Summary:	LablTk library for OCaml
-Summary(pl.UTF-8):	Biblioteka LablTk dla OCamla
-Group:		Development/Libraries
-Requires:	%{name}-labltk = %{epoch}:%{version}-%{release}
-
-%description labltk-devel
-LablTk gives OCaml program access to Tcl/Tk GUI widgets. This package
-contains files needed to develop OCaml programs using LablTk.
-
-%description labltk-devel -l pl.UTF-8
-Biblioteka LablTk daje programom napisanym w OCamlu dostęp do widgetów
-Tcl/Tk. Pakiet ten zawiera pliki niezbędne do tworzenia programów
-używających LablTk.
-
 %package x11graphics
 Summary:	X11 graphic output for OCaml
 Summary(pl.UTF-8):	Dostęp do X11 dla OCamla
@@ -212,54 +167,6 @@ Moduł x11graphics daje programom napisanym w OCamlu możliwość
 korzystania z interfejsu graficznego X11. Pakiet ten zawiera pliki
 niezbędne do tworzenia programów używających x11graphics.
 
-%package camlp4
-Summary:	Objective Caml Preprocessor
-Summary(pl.UTF-8):	Preprocesor OCamla
-Group:		Development/Languages
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-Provides:	camlp4 = %{epoch}:%{version}-%{release}
-Obsoletes:	camlp4
-
-%description camlp4
-Camlp4 is a Pre-Processor-Pretty-Printer for Objective Caml. It offers
-tools for syntax (grammars) and the ability to modify the concrete
-syntax of the language (quotations, syntax extensions).
-
-Camlp4 can parse normal Ocaml concrete syntax or any other
-user-definable syntax. As an example, an alternative syntax is
-provided, named revised, because it tries to fix some small problems
-of the normal syntax.
-
-Camlp4 can pretty print the normal Ocaml concrete syntax or the
-revised one. It is therefore always possible to have a version of your
-sources compilable by the Objective Caml compiler without
-preprocessing.
-
-%description camlp4 -l pl.UTF-8
-Camlp4 jest preprocesorem OCamla. Oferuje narzędzia do manipulowania
-składnią (gramatyki) oraz możliwość modyfikowania oryginalnej składni
-języka (cytowania, rozszerzenia).
-
-Camlp4 może sparsować oryginalną składnię Ocamla lub dowolną inną
-definiowalną przez użytkownika. Jako przykład podana jest alternatywna
-składnia (revised syntax), która próbuje poprawić drobne problemy
-występujące w składni oryginalnej.
-
-Camlp4 umie ładnie formatować źródła zarówno w oryginalnej jak i
-poprawionej składni OCamla. Potrafi także tłumaczyć programy z jednej
-składni na drugą.
-
-%package camlp4-doc-html
-Summary:	Objective Caml Preprocessor - HTML documentation 
-Summary(pl.UTF-8):	Preprocesor OCamla - dokumentacja HTML 
-Group:		Development/Languages
-
-%description camlp4-doc-html
-Objective Caml Preprocessor - HTML documentation.
-
-%description camlp4-doc-html -l pl.UTF-8
-Preprocesor OCamla - dokumentacja HTML.
-
 %package compiler-objects
 Summary:	Compiled parts of OCaml compiler
 Summary(pl.UTF-8):	Skompilowane części kompilatora OCamla
@@ -306,23 +213,16 @@ Pakiet ten zawiera źródła Czysto Funkcyjnych Struktur Danych
 autorstwa Okasaki'ego, napisane w OCamlu, wraz z dodatkami.
 
 %prep
-%setup -q -a1 -a3 -a4 -a6
+%setup -q -a1 -a3
 mkdir examples
-tar xjf %{SOURCE8} -C examples
-tar xzf %{SOURCE9} -C examples
+tar xzf %{SOURCE4} -C examples
+tar xzf %{SOURCE5} -C examples
 # order mess with docs somewhat
 mkdir -p docs/html
 mv htmlman docs/html/ocaml
 cp %{SOURCE2} docs/ocaml.ps.gz
-mv camlp4-%{p4ver}-manual.html docs/html/camlp4
-cp %{SOURCE5} docs/camlp4.ps.gz
-mv camlp4-%{p4ver}-tutorial.html docs/html/camlp4-tutorial
-cp %{SOURCE7} docs/camlp4-tutorial.ps.gz
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 %build 
 cp -f /usr/share/automake/config.sub config/gnu
@@ -332,19 +232,15 @@ cp -f /usr/share/automake/config.sub config/gnu
 	-libdir %{_libdir}/%{name} \
 	-mandir %{_mandir}/man1 \
 	-host %{_host} \
-	%{!?with_tk:-no-tk} \
 	-with-pthread \
 	-x11lib %{_libdir}
 
 %{__make} -j1 world bootstrap opt.opt CFLAGS="%{rpmcflags} -Wall -DUSE_INTERP_RESULT"
 %{__make} -C tools objinfo CFLAGS="%{rpmcflags} -Wall -DUSE_INTERP_RESULT" -j1
 
-# broken build system
-sed -e 's,LIBDIR,%{_libdir},' camlp4/man/camlp4.1.tpl > camlp4/man/camlp4.1
-
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_includedir},%{_infodir},%{_examplesdir}/%{name}-{labltk-,}%{version}}
+install -d $RPM_BUILD_ROOT{%{_includedir},%{_infodir},%{_examplesdir}/%{name}-%{version}}
 install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/site-lib
 
 %{__make} install \
@@ -365,7 +261,6 @@ EOF
 %endif
 
 # symlink .opt versions of compilers (if present)
-# warning: don't do that with camlp4 (can't load extensions then)
 for f in ocamlc ocamlopt ocamldoc ocamllex; do
 	if test -f $RPM_BUILD_ROOT%{_bindir}/$f.opt; then
 		mv -f $RPM_BUILD_ROOT%{_bindir}/$f \
@@ -388,22 +283,14 @@ done
 # this isn't installed by default, but is useful
 install tools/objinfo $RPM_BUILD_ROOT%{_bindir}/ocamlobjinfo
 cp -r examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-cp -r otherlibs/labltk/examples* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-labltk-%{version}
 ln -sf %{_libdir}/%{name}/{scrape,add}labels $RPM_BUILD_ROOT%{_bindir}
 
 # shutup checkfiles
 %{__rm} -r $RPM_BUILD_ROOT%{_mandir}/man3
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/labltk/{labltktop,pp}
 
 # install info pages
 cp -f infoman/*.gz $RPM_BUILD_ROOT%{_infodir}
 
-# broken build system
-install camlp4/man/camlp4.1 $RPM_BUILD_ROOT%{_mandir}/man1
-for f in camlp4o.1 camlp4r.1 mkcamlp4.1 camlp4o.opt.1 camlp4r.opt.1 ; do
-	echo '.so camlp4.1' >$RPM_BUILD_ROOT%{_mandir}/man1/$f
-done
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -415,14 +302,29 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc LICENSE Changes README Upgrading
+%doc Changes LICENSE README
 %attr(755,root,root) %{_bindir}/addlabels
-%attr(755,root,root) %{_bindir}/ocaml*
+%attr(755,root,root) %{_bindir}/ocaml
+%attr(755,root,root) %{_bindir}/ocamlbuild*
+%attr(755,root,root) %{_bindir}/ocamlc
+%attr(755,root,root) %{_bindir}/ocamlc.*
+%attr(755,root,root) %{_bindir}/ocamlcp
+%attr(755,root,root) %{_bindir}/ocamldebug
+%attr(755,root,root) %{_bindir}/ocamldep*
+%attr(755,root,root) %{_bindir}/ocamldoc*
+%attr(755,root,root) %{_bindir}/ocamllex*
+%attr(755,root,root) %{_bindir}/ocamlmklib
+%attr(755,root,root) %{_bindir}/ocamlmktop
+%attr(755,root,root) %{_bindir}/ocamlobjinfo
+%attr(755,root,root) %{_bindir}/ocamlopt
+%attr(755,root,root) %{_bindir}/ocamlopt.*
+%attr(755,root,root) %{_bindir}/ocamloptp
+%attr(755,root,root) %{_bindir}/ocamlprof
+%attr(755,root,root) %{_bindir}/ocamlyacc
 %attr(755,root,root) %{_bindir}/scrapelabels
-%{?with_tk:%exclude %{_bindir}/ocamlbrowser}
-%exclude %{_bindir}/ocamlrun
 %{_includedir}/caml
 %{_libdir}/%{name}/caml
+%{_libdir}/%{name}/compiler-libs
 %{_libdir}/%{name}/threads
 %dir %{_libdir}/%{name}/vmthreads
 %dir %{_libdir}/%{name}/vmthreads/*.cm*
@@ -453,9 +355,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/%{name}/stublibs/dll*.so
 %exclude %{_libdir}/%{name}/stublibs/dllgraphics.so
 %attr(755,root,root) %{_libdir}/%{name}/libcamlrun_shared.so
-%if %{with tk}
-%exclude %{_libdir}/%{name}/stublibs/dlllabltk.so
-%endif
 %{_mandir}/man1/ocamlrun.1*
 
 %files lib-source
@@ -486,23 +385,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/emacs/site-lisp/*.el*
 %endif
 
-%if %{with tk}
-%files labltk
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/%{name}/stublibs/dlllabltk.so
-
-%files labltk-devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/labltk
-%attr(755,root,root) %{_bindir}/ocamlbrowser
-%dir %{_libdir}/%{name}/labltk
-%{_libdir}/%{name}/labltk/*.cm*
-%{_libdir}/%{name}/labltk/*.a
-%{_libdir}/%{name}/labltk/*.o
-%attr(755,root,root) %{_libdir}/%{name}/labltk/tkcompiler
-%{_examplesdir}/%{name}-labltk-%{version}
-%endif
-
 %if %{with x}
 %files x11graphics
 %defattr(644,root,root,755)
@@ -515,18 +397,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}/libgraphics.a
 %endif
 
-%files camlp4
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/camlp4*
-%attr(755,root,root) %{_bindir}/mkcamlp4
-%{_libdir}/%{name}/camlp4
-%{_mandir}/man1/camlp4*.1*
-%{_mandir}/man1/mkcamlp4.1*
-
-%files camlp4-doc-html
-%defattr(644,root,root,755)
-%doc docs/html/camlp4*
-
 %files compiler-objects
 %defattr(644,root,root,755)
 %{_libdir}/%{name}/compiler
diff --git a/ocaml-CFLAGS.patch b/ocaml-CFLAGS.patch
index 5c7e90c..1201538 100644
--- a/ocaml-CFLAGS.patch
+++ b/ocaml-CFLAGS.patch
@@ -21,18 +21,17 @@ diff -ur ocaml-3.11.0/asmrun/Makefile ocaml-3.11.0.CFLAGS/asmrun/Makefile
  
  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 \
-diff -ur ocaml-3.11.0/asmrun/Makefile.nt ocaml-3.11.0.CFLAGS/asmrun/Makefile.nt
---- ocaml-3.11.0/asmrun/Makefile.nt	2007-11-15 14:21:15.000000000 +0100
-+++ ocaml-3.11.0.CFLAGS/asmrun/Makefile.nt	2009-02-16 12:18:01.212550815 +0100
-@@ -16,7 +16,7 @@
+--- ocaml-4.02.1/asmrun/Makefile.nt.orig	2014-11-06 21:32:19.358167666 +0100
++++ ocaml-4.02.1/asmrun/Makefile.nt	2014-11-07 16:19:43.681995569 +0100
+@@ -14,7 +14,7 @@
  include ../config/Makefile
  
  CC=$(NATIVECC)
--CFLAGS=-I../byterun -DNATIVE_CODE -DTARGET_$(ARCH) -DSYS_$(SYSTEM) $(NATIVECCCOMPOPTS)
-+override CFLAGS += -I../byterun -DNATIVE_CODE -DTARGET_$(ARCH) -DSYS_$(SYSTEM) $(NATIVECCCOMPOPTS)
+-CFLAGS=-I../byterun -DNATIVE_CODE -DTARGET_$(ARCH) -DSYS_$(SYSTEM) \
++override CFLAGS += -I../byterun -DNATIVE_CODE -DTARGET_$(ARCH) -DSYS_$(SYSTEM) \
+        $(NATIVECCCOMPOPTS)
  
- COBJS=startup.$(O) main.$(O) fail.$(O) roots.$(O) signals.$(O) signals_asm.$(O) \
-   misc.$(O) freelist.$(O) major_gc.$(O) minor_gc.$(O) memory.$(O) alloc.$(O) \
+ COBJS=startup.$(O) main.$(O) fail.$(O) roots.$(O) signals.$(O) signals_asm.$(O)\
 --- ocaml-3.12.0/byterun/Makefile	2008-11-08 17:29:02.000000000 +0100
 +++ ocaml-3.12.0.CFLAGS/byterun/Makefile	2009-02-16 12:18:01.212550815 +0100
 @@ -15,7 +15,7 @@
@@ -56,57 +55,21 @@ diff -ur ocaml-3.11.0/byterun/Makefile.nt ocaml-3.11.0.CFLAGS/byterun/Makefile.n
  
  DBGO=d.$(O)
  OBJS=$(COMMONOBJS:.o=.$(O)) win32.$(O) main.$(O)
-diff -ur ocaml-3.11.0/otherlibs/Makefile ocaml-3.11.0.CFLAGS/otherlibs/Makefile
---- ocaml-3.11.0/otherlibs/Makefile	2007-11-08 10:17:47.000000000 +0100
-+++ ocaml-3.11.0.CFLAGS/otherlibs/Makefile	2009-02-16 12:18:01.282552384 +0100
-@@ -17,7 +17,7 @@
- 
- CAMLC=$(ROOTDIR)/ocamlcomp.sh
- CAMLOPT=$(ROOTDIR)/ocamlcompopt.sh
+--- ocaml-4.02.1/otherlibs/Makefile.orig	2014-11-06 21:32:19.361500999 +0100
++++ ocaml-4.02.1/otherlibs/Makefile	2014-11-07 16:20:23.921993882 +0100
+@@ -16,7 +16,7 @@
+ CAMLC=$(ROOTDIR)/boot/ocamlrun $(ROOTDIR)/ocamlc -nostdlib -I $(ROOTDIR)/stdlib
+ CAMLOPT=$(ROOTDIR)/boot/ocamlrun $(ROOTDIR)/ocamlopt -nostdlib \
+         -I $(ROOTDIR)/stdlib
 -CFLAGS=-I$(ROOTDIR)/byterun -O $(SHAREDCCCOMPOPTS) $(EXTRACFLAGS)
-+override CFLAGS += -I$(ROOTDIR)/byterun $(SHAREDCCCOMPOPTS) $(EXTRACFLAGS)
- 
- include ../Makefile.shared
- # Note .. is the current directory (this makefile is included from
-diff -ur ocaml-3.11.0/otherlibs/Makefile.nt ocaml-3.11.0.CFLAGS/otherlibs/Makefile.nt
---- ocaml-3.11.0/otherlibs/Makefile.nt	2007-11-08 10:17:48.000000000 +0100
-+++ ocaml-3.11.0.CFLAGS/otherlibs/Makefile.nt	2009-02-16 12:18:01.282552384 +0100
-@@ -17,7 +17,7 @@
- 
- CAMLC=$(CAMLRUN) $(ROOTDIR)/ocamlc -nostdlib -I $(ROOTDIR)/stdlib -w s
- CAMLOPT=$(CAMLRUN) $(ROOTDIR)/ocamlopt -nostdlib -I $(ROOTDIR)/stdlib -w s
--CFLAGS=-I$(ROOTDIR)/byterun $(SHAREDCCCOMPOPTS) $(EXTRACFLAGS)
-+override CFLAGS += -I$(ROOTDIR)/byterun $(SHAREDCCCOMPOPTS) $(EXTRACFLAGS)
++override CFLAGS += -I$(ROOTDIR)/byterun -O $(SHAREDCCCOMPOPTS) $(EXTRACFLAGS)
  
  include ../Makefile.shared
  # Note .. is the current directory (this makefile is included from
-diff -ur ocaml-3.11.0/otherlibs/labltk/browser/Makefile.nt ocaml-3.11.0.CFLAGS/otherlibs/labltk/browser/Makefile.nt
---- ocaml-3.11.0/otherlibs/labltk/browser/Makefile.nt	2008-12-03 14:03:18.000000000 +0100
-+++ ocaml-3.11.0.CFLAGS/otherlibs/labltk/browser/Makefile.nt	2009-02-16 12:18:01.272552219 +0100
-@@ -1,6 +1,6 @@
- OTHERSLIB=-I $(OTHERS)/win32unix -I $(OTHERS)/str -I $(OTHERS)/systhreads
- 
--CCFLAGS=-I../../../byterun $(TK_DEFS)
-+override CCFLAGS += -I../../../byterun $(TK_DEFS) $(CFLAGS)
- 
- include ../support/Makefile.common
- 
-diff -ur ocaml-3.11.0/otherlibs/labltk/support/Makefile ocaml-3.11.0.CFLAGS/otherlibs/labltk/support/Makefile
---- ocaml-3.11.0/otherlibs/labltk/support/Makefile	2008-04-22 09:38:07.000000000 +0200
-+++ ocaml-3.11.0.CFLAGS/otherlibs/labltk/support/Makefile	2009-02-16 12:18:01.282552384 +0100
-@@ -12,7 +12,7 @@
-       cltkFile.$(O) cltkMain.$(O) cltkMisc.$(O) cltkTimer.$(O) \
-       cltkVar.$(O) cltkWait.$(O) cltkImg.$(O)
- 
--CCFLAGS=-I../../../byterun $(TK_DEFS) $(SHAREDCCCOMPOPTS)
-+override CCFLAGS += -I../../../byterun $(TK_DEFS) $(SHAREDCCCOMPOPTS) $(CFLAGS)
- 
- COMPFLAGS=-I $(OTHERS)/win32unix -I $(OTHERS)/unix
- THFLAGS=-I $(OTHERS)/systhreads -I $(OTHERS)/threads
---- ocaml-3.12.0/otherlibs/systhreads/Makefile.orig	2010-04-27 09:55:08.000000000 +0200
-+++ ocaml-3.12.0/otherlibs/systhreads/Makefile	2011-03-12 10:40:54.827415456 +0100
-@@ -33,7 +33,7 @@
- 	$(MKLIB) -o threads $(BYTECODE_C_OBJS)
+--- ocaml-4.02.1/otherlibs/systhreads/Makefile.orig	2014-10-03 14:25:00.000000000 +0200
++++ ocaml-4.02.1/otherlibs/systhreads/Makefile	2014-11-07 16:21:22.471991426 +0100
+@@ -34,7 +34,7 @@
+ 	$(MKLIB) -o threads $(BYTECODE_C_OBJS) $(PTHREAD_LINK)
  
  st_stubs_b.o: st_stubs.c st_posix.h
 -	$(BYTECC) -O -I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS) \
@@ -114,15 +77,15 @@ diff -ur ocaml-3.11.0/otherlibs/labltk/support/Makefile ocaml-3.11.0.CFLAGS/othe
  	   -c st_stubs.c
  	mv st_stubs.o st_stubs_b.o
  
-@@ -43,7 +43,7 @@
+@@ -44,7 +44,7 @@
  	$(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) $(CFLAGS) -I../../asmrun -I../../byterun $(NATIVECCCOMPOPTS) $(SHAREDCCCOMPOPTS) -DNATIVE_CODE -DTARGET_$(ARCH) -DSYS_$(SYSTEM) -c st_stubs.c
+-	$(NATIVECC) -O -I../../asmrun -I../../byterun $(NATIVECCCOMPOPTS) \
++	$(NATIVECC) $(CFLAGS) -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)
 diff -ur ocaml-3.11.0/otherlibs/systhreads/Makefile.nt ocaml-3.11.0.CFLAGS/otherlibs/systhreads/Makefile.nt
 --- ocaml-3.11.0/otherlibs/systhreads/Makefile.nt	2007-11-06 16:16:56.000000000 +0100
 +++ ocaml-3.11.0.CFLAGS/otherlibs/systhreads/Makefile.nt	2009-02-16 12:18:01.285892127 +0100
@@ -135,30 +98,17 @@ diff -ur ocaml-3.11.0/otherlibs/systhreads/Makefile.nt ocaml-3.11.0.CFLAGS/other
  
  CAMLOBJS=thread.cmo mutex.cmo condition.cmo event.cmo threadUnix.cmo
  CMIFILES=$(CAMLOBJS:.cmo=.cmi)
-diff -ur ocaml-3.11.0/otherlibs/threads/Makefile ocaml-3.11.0.CFLAGS/otherlibs/threads/Makefile
---- ocaml-3.11.0/otherlibs/threads/Makefile	2008-10-08 15:07:13.000000000 +0200
-+++ ocaml-3.11.0.CFLAGS/otherlibs/threads/Makefile	2009-02-16 12:18:01.285892127 +0100
-@@ -16,7 +16,7 @@
+--- ocaml-4.02.1/otherlibs/threads/Makefile.orig	2014-11-06 21:32:19.381500998 +0100
++++ ocaml-4.02.1/otherlibs/threads/Makefile	2014-11-07 16:21:47.581990371 +0100
+@@ -14,7 +14,7 @@
  include ../../config/Makefile
  
  CC=$(BYTECC)
 -CFLAGS=-I../../byterun -O $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS) -g
-+override CFLAGS += -I../../byterun $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS) -g
- CAMLC=../../ocamlcomp.sh -I ../unix
- MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib
- COMPFLAGS=-warn-error A
-diff -ur ocaml-3.11.0/win32caml/Makefile ocaml-3.11.0.CFLAGS/win32caml/Makefile
---- ocaml-3.11.0/win32caml/Makefile	2007-11-15 14:21:15.000000000 +0100
-+++ ocaml-3.11.0.CFLAGS/win32caml/Makefile	2009-02-16 12:18:01.289259949 +0100
-@@ -16,7 +16,7 @@
- include ../config/Makefile
- 
- CC=$(BYTECC)
--CFLAGS=$(BYTECCCOMPOPTS)
-+override CFLAGS += $(BYTECCCOMPOPTS)
- 
- OBJS=startocaml.$(O) ocamlres.$(O) ocaml.$(O) menu.$(O) \
-   history.$(O) editbuffer.$(O)
++override CFLAGS += -I../../byterun -O $(BYTECCCOMPOPTS) $(SHAREDCCCOMPOPTS) -g
+ ROOTDIR=../..
+ CAMLC=$(ROOTDIR)/boot/ocamlrun $(ROOTDIR)/ocamlc -nostdlib \
+       -I $(ROOTDIR)/stdlib -I $(ROOTDIR)/otherlibs/unix
 diff -ur ocaml-3.11.0/yacc/Makefile ocaml-3.11.0.CFLAGS/yacc/Makefile
 --- ocaml-3.11.0/yacc/Makefile	2007-02-07 15:49:42.000000000 +0100
 +++ ocaml-3.11.0.CFLAGS/yacc/Makefile	2009-02-16 12:18:01.289259949 +0100
diff --git a/ocaml-as_needed.patch b/ocaml-as_needed.patch
index 53f2c8f..12da4ab 100644
--- a/ocaml-as_needed.patch
+++ b/ocaml-as_needed.patch
@@ -1,11 +1,11 @@
---- ocaml-3.09.2/configure.orig	2006-11-23 03:30:41.000000000 +0000
-+++ ocaml-3.09.2/configure	2006-11-23 03:31:14.000000000 +0000
-@@ -751,7 +751,7 @@
+--- ocaml-4.02.1/configure.orig	2014-11-07 16:23:50.668651870 +0100
++++ ocaml-4.02.1/configure	2014-11-07 16:33:21.335294590 +0100
+@@ -1022,7 +1022,7 @@
  # For the terminfo module
  
- if test "$withcurses" = "yes"; then
+ if test "$with_curses" = "yes"; then
 -  for libs in "" "-lcurses" "-ltermcap" "-lcurses -ltermcap" "-lncurses"; do
 +  for libs in "" "-ltinfo" "-lcurses" "-ltermcap" "-lcurses -ltermcap" "-lncurses"; do
      if sh ./hasgot $libs tgetent tgetstr tgetnum tputs; then
-       echo "termcap functions found (with libraries '$libs')"
+       inf "termcap functions found (with libraries '$libs')"
        echo "#define HAS_TERMCAP" >> s.h
diff --git a/ocaml-db3.patch b/ocaml-db3.patch
deleted file mode 100644
index 30dc6df..0000000
--- a/ocaml-db3.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -urN ocaml-3.10.0.org/configure ocaml-3.10.0/configure
---- ocaml-3.10.0.org/configure	2007-05-03 14:49:56.000000000 +0200
-+++ ocaml-3.10.0/configure	2007-07-15 20:20:19.325848428 +0200
-@@ -1252,51 +1252,13 @@
- 
- # See if we can compile the dbm library
- 
--dbm_include="not found"
--dbm_link="not found"
- use_gdbm_ndbm=no
- 
--for dir in /usr/include /usr/include/db1 /usr/include/gdbm; do
--  if test -f $dir/ndbm.h; then
--    dbm_include=$dir
--    if sh ./hasgot dbm_open; then
--      dbm_link=""
--    elif sh ./hasgot -lndbm dbm_open; then
--      dbm_link="-lndbm"
--    elif sh ./hasgot -ldb1 dbm_open; then
--      dbm_link="-ldb1"
--    elif sh ./hasgot -lgdbm dbm_open; then
--      dbm_link="-lgdbm"
--    elif sh ./hasgot -lgdbm_compat -lgdbm dbm_open; then
--      dbm_link="-lgdbm_compat -lgdbm"
--    fi
--    break
--  fi
--  if test -f $dir/gdbm-ndbm.h; then
--    dbm_include=$dir
--    use_gdbm_ndbm=yes
--    if sh ./hasgot -lgdbm_compat -lgdbm dbm_open; then
--      dbm_link="-lgdbm_compat -lgdbm"
--    fi
--    break
--  fi
--done
--if test "$dbm_include" = "not found" || test "$dbm_link" = "not found"; then
--  echo "NDBM not found, the \"dbm\" library will not be supported."
--else
--  echo "NDBM found (in $dbm_include)"
--  if test "$dbm_include" = "/usr/include"; then
--    dbm_include=""
--  else
--    dbm_include="-I$dbm_include"
--  fi
--  if test "$use_gdbm_ndbm" = "yes"; then
--    echo "#define DBM_USES_GDBM_NDBM" >> s.h
--  fi
--  otherlibraries="$otherlibraries dbm"
--fi
-+dbm_include=""
-+dbm_link="-ldb"
- echo "DBM_INCLUDES=$dbm_include" >> Makefile
- echo "DBM_LINK=$dbm_link" >> Makefile
-+otherlibraries="$otherlibraries dbm"
- 
- # Look for tcl/tk
- 
-diff -ur ocaml-3.07beta2/otherlibs/dbm/cldbm.c ocaml-3.07beta2-/otherlibs/dbm/cldbm.c
---- ocaml-3.07beta2/otherlibs/dbm/cldbm.c	2003-07-08 15:50:31.000000000 +0200
-+++ ocaml-3.07beta2-/otherlibs/dbm/cldbm.c	2003-08-26 11:11:19.000000000 +0200
-@@ -24,7 +24,8 @@
- #ifdef DBM_USES_GDBM_NDBM
- #include <gdbm-ndbm.h>
- #else
--#include <ndbm.h>
-+#define DB_DBM_HSEARCH 1
-+#include <db.h>
- #endif
- 
- /* Quite close to sys_open_flags, but we need RDWR */
diff --git a/ocaml-gas.patch b/ocaml-gas.patch
deleted file mode 100644
index f1d5938..0000000
--- a/ocaml-gas.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Recent binutils checks for .size validity - and relative .size needs to
-be placed in the same section that referred symbols.
---- ocaml-3.12.0/asmcomp/i386/emit.mlp.orig	2010-01-20 17:26:46.000000000 +0100
-+++ ocaml-3.12.0/asmcomp/i386/emit.mlp	2011-03-12 12:01:23.803419646 +0100
-@@ -906,6 +906,7 @@
-   emit_all true fundecl.fun_body;
-   List.iter emit_call_gc !call_gc_sites;
-   emit_call_bound_errors ();
-+  `	.text\n`;
-   begin match Config.system with
-     "linux_elf" | "bsd_elf" | "gnu" ->
-       `	.type	{emit_symbol fundecl.fun_name}, at function\n`;
diff --git a/ocaml-tcl86.patch b/ocaml-tcl86.patch
deleted file mode 100644
index 9dfa895..0000000
--- a/ocaml-tcl86.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- ocaml-3.12.1/configure~	2014-06-03 11:26:08.000000000 +0200
-+++ ocaml-3.12.1/configure	2014-06-03 11:27:37.713580505 +0200
-@@ -1429,6 +1429,8 @@
-   for tk_incs in \
-     "-I/usr/local/include" \
-     "-I/usr/include" \
-+    "-I/usr/local/include/tcl8.6 -I/usr/local/include/tk8.6" \
-+    "-I/usr/include/tcl8.6 -I/usr/include/tk8.6" \
-     "-I/usr/local/include/tcl8.5 -I/usr/local/include/tk8.5" \
-     "-I/usr/include/tcl8.5 -I/usr/include/tk8.5" \
-     "-I/usr/local/include/tcl8.4 -I/usr/local/include/tk8.4" \
-@@ -1454,6 +1456,7 @@
-     8.3) tclmaj=8 tclmin=3 tkmaj=8 tkmin=3 ;;
-     8.4) tclmaj=8 tclmin=4 tkmaj=8 tkmin=4 ;;
-     8.5) tclmaj=8 tclmin=5 tkmaj=8 tkmin=5 ;;
-+    8.6) tclmaj=8 tclmin=6 tkmaj=8 tkmin=6 ;;
-     *) echo "This version is not known."; has_tk=false ;;
-     esac
-   else
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ocaml.git/commitdiff/e091ab7c85bb4535c9907b06e3f27781b59e70f9

More information about the pld-cvs-commit mailing list