Update to 6.12 final.
Also: - Drop debuginfo workaround; fixed upstream. - Richard W.M. Jones: Kill -warn-error everywhere hopefully. - Richard W.M. Jones: New source URL.
This commit is contained in:
parent
6429f84d26
commit
11ffac9d9d
|
@ -1 +1 @@
|
||||||
/camlp5-6.11.tgz
|
/camlp5-6.12.tgz
|
||||||
|
|
|
@ -0,0 +1,15 @@
|
||||||
|
--- camlp5-6.11/configure.old 2014-08-24 09:49:01.887731189 +0100
|
||||||
|
+++ camlp5-6.11/configure 2014-08-24 09:50:19.043742759 +0100
|
||||||
|
@@ -246,11 +246,7 @@
|
||||||
|
OCAMLC_W_Y=""
|
||||||
|
fi
|
||||||
|
|
||||||
|
-if [ "$($ocamlc -warn-error A 2>&1)" = "" ]; then
|
||||||
|
- WARNERR="-warn-error A"
|
||||||
|
-else
|
||||||
|
- WARNERR=""
|
||||||
|
-fi
|
||||||
|
+WARNERR=""
|
||||||
|
|
||||||
|
if make -f config/Makefile.check --no-print-directory >/dev/null 2>&1; then
|
||||||
|
NO_PR_DIR=--no-print-directory
|
|
@ -1,15 +1,20 @@
|
||||||
%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
|
%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
|
||||||
|
%if !%{opt}
|
||||||
|
%global debug_package %{nil}
|
||||||
|
%endif
|
||||||
|
|
||||||
Name: ocaml-camlp5
|
Name: ocaml-camlp5
|
||||||
Version: 6.11
|
Version: 6.12
|
||||||
Release: 5%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Classical version of camlp4 OCaml preprocessor
|
Summary: Classical version of camlp4 OCaml preprocessor
|
||||||
|
|
||||||
Group: Development/Libraries
|
|
||||||
License: BSD
|
License: BSD
|
||||||
URL: http://pauillac.inria.fr/~ddr/camlp5/
|
URL: http://camlp5.gforge.inria.fr/
|
||||||
|
|
||||||
Source0: http://pauillac.inria.fr/~ddr/camlp5/distrib/src/camlp5-%{version}.tgz
|
Source0: http://camlp5.gforge.inria.fr/distrib/src/camlp5-%{version}.tgz
|
||||||
|
|
||||||
|
# Kill -warn-error A
|
||||||
|
Patch0: camlp5-6.11-kill-warn-error.patch
|
||||||
|
|
||||||
BuildRequires: ocaml
|
BuildRequires: ocaml
|
||||||
BuildRequires: ocaml-ocamldoc
|
BuildRequires: ocaml-ocamldoc
|
||||||
|
@ -41,17 +46,15 @@ developing applications that use %{name}.
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n camlp5-%{version}
|
%setup -q -n camlp5-%{version}
|
||||||
|
|
||||||
|
%patch0 -p1
|
||||||
|
|
||||||
# Build with debug information
|
# Build with debug information
|
||||||
sed -i 's,WARNERR="-warn-error A",WARNERR="-g -warn-error A",' configure
|
sed -i 's,WARNERR="",WARNERR="-g",' configure
|
||||||
sed -i 's,-linkall,& -g,g' top/Makefile
|
sed -i 's,-linkall,& -g,g' top/Makefile
|
||||||
for fil in compile/compile.sh $(find . -name Makefile); do
|
for fil in compile/compile.sh $(find . -name Makefile); do
|
||||||
sed -i 's,\$(OCAMLN)c,& -g,;s,\$(OCAMLN)opt,& -g,;s,LINKFLAGS=,&-g ,' $fil
|
sed -i 's,\$[({]OCAMLN[})]c,& -g,;s,\$[({]OCAMLN[})]opt,& -g,;s,LINKFLAGS=,&-g ,' $fil
|
||||||
done
|
done
|
||||||
|
|
||||||
# But don't build pa_lisp with debug information because it triggers this:
|
|
||||||
# Fatal error: exception Assert_failure("asmcomp/emitaux.ml", 226, 4)
|
|
||||||
sed -i 's/$(WARNERR)/-warn-error A/' etc/Makefile.withnew
|
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
./configure
|
./configure
|
||||||
|
@ -109,6 +112,12 @@ rm -f doc/html/.cvsignore doc/htmlp/{.cvsignore,*.sh,Makefile,html2*}
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Nov 6 2014 Jerry James <loganjerry@gmail.com> - 6.12-1
|
||||||
|
- Update to 6.12 final
|
||||||
|
- Drop debuginfo workaround; fixed upstream
|
||||||
|
- Richard W.M. Jones: Kill -warn-error everywhere hopefully.
|
||||||
|
- Richard W.M. Jones: New source URL.
|
||||||
|
|
||||||
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.11-5
|
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.11-5
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue