- rel 21; fix build with tcl/tk 8.6

diff --git a/ocaml-tcl86.patch b/ocaml-tcl86.patch
new file mode 100644 (file)
index 0000000..9dfa895
--- /dev/null
+++ b/ocaml-tcl86.patch
@@ -0,0 +1,19 @@
+--- 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

diff --git a/ocaml.spec b/ocaml.spec
index d5fda5ebc31dc9ff1c6f721265bf24721bf6ec10..280dc853a87ef3d109886298ee8d8499f7034e67 100644 (file)
--- a/ocaml.spec
+++ b/ocaml.spec
@@ -14,7 +14,7 @@ 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:       20
+Release:       21
 Epoch:         1
 License:       distributable
 Group:         Development/Languages
@@ -42,6 +42,7 @@ Patch0:               %{name}-db3.patch
 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}
@@ -320,6 +321,7 @@ cp %{SOURCE7} docs/camlp4-tutorial.ps.gz
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build 
 cp -f /usr/share/automake/config.sub config/gnu
@@ -333,8 +335,8 @@ cp -f /usr/share/automake/config.sub config/gnu
        -with-pthread \
        -x11lib %{_libdir}
 
-%{__make} -j1 world bootstrap opt.opt CFLAGS="%{rpmcflags} -Wall"
-%{__make} -C tools objinfo CFLAGS="%{rpmcflags} -Wall" -j1
+%{__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