From a7c8ef858d3841f1f7bb9649980855347a683c9c Mon Sep 17 00:00:00 2001 From: Christian Neukirchen Date: Sat, 30 Aug 2014 14:11:37 +0200 Subject: [PATCH] ocaml: update to 4.02.0. ocaml-compiler-libs is gone, since it was essential for use of ocamldebug and for building toplevels. We now let "make install" install the relevant parts of the compiler-libs. --- srcpkgs/ocaml/template | 31 +++++++------------------------ 1 file changed, 7 insertions(+), 24 deletions(-) diff --git a/srcpkgs/ocaml/template b/srcpkgs/ocaml/template index 73fd611225d..5e4cabe30cb 100644 --- a/srcpkgs/ocaml/template +++ b/srcpkgs/ocaml/template @@ -1,17 +1,16 @@ # Template file for 'ocaml' pkgname=ocaml -_majorver=4.00 +_majorver=4.02 version=${_majorver}.0 -revision=5 -makedepends="gdbm-devel ncurses-devel libX11-devel" +revision=1 +makedepends="ncurses-devel libX11-devel" short_desc="The main implementation of the Caml language" maintainer="Juan RP " homepage="http://caml.inria.fr" license="QPL-1,LGPL-2" -distfiles="${homepage}/pub/distrib/${pkgname}-${_majorver}/${pkgname}-${version}.tar.bz2" -checksum=ec886d7bc587ce472fcbdf294feb4b1fa2d8e7ef78ab6a4e66551699435d5cd7 - -disable_parallel_build=yes +distfiles="${homepage}/pub/distrib/${pkgname}-${_majorver}/${pkgname}-${version}.tar.xz" +checksum=87d7a59e90659bea57ae25659bbd25d56fe09e93465f2a11b610f3f537ca85d6 +nocross=yes do_configure() { ./configure -prefix /usr -mandir /usr/share/man @@ -26,21 +25,5 @@ do_install() { make PREFIX=${DESTDIR}/usr MANDIR=${DESTDIR}/usr/share/man install - vinstall LICENSE 644 usr/share/licenses/${pkgname} - - mkdir -pv "${compiler_libs}"/{parsing,typing,utils} - cp -v parsing/*.{cmi,cmo,cmx,ml,mli,mll,o} "${compiler_libs}"/parsing - cp -v typing/*.{cmi,cmo,cmx,ml,mli,o} "${compiler_libs}"/typing - cp -v utils/*.{cmi,cmo,cmx,ml,mli,o} "${compiler_libs}"/utils -} - - -ocaml-compiler-libs_package() { - depends="ocaml>=${version}_${revision}" - short_desc+=" -- shared libraries" - pkg_install() { - vmove usr/lib/ocaml/compiler-libs - vinstall ${wrksrc}/LICENSE 644 usr/share/licenses/${pkgname} - rm -f ${PKGDESTDIR}/usr/lib/ocaml/compiler-libs/typing/outcometree.{cmi,mli} - } + vlicense LICENSE }